From 712157f66317dccaab60d28be40aef31671763ac Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Fri, 12 Nov 2021 13:27:03 -0800 Subject: [PATCH] Revert "ci: temporarily disable criu repo gpg check" This was a temporary kludge, which is no longer required. This reverts commit c5ca778fa835aa7c4c0700e824f1b54fa52222c6. Signed-off-by: Kir Kolyshkin --- .github/workflows/test.yml | 2 +- Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3eaeb3aeb..c5c29356c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -44,7 +44,7 @@ jobs: run: | # criu repo curl -fSsl $REPO/Release.key | sudo apt-key add - - echo "deb [allow-insecure=yes trusted=yes] $REPO/ /" | sudo tee /etc/apt/sources.list.d/criu.list + echo "deb $REPO/ /" | sudo tee /etc/apt/sources.list.d/criu.list sudo apt update sudo apt install libseccomp-dev criu diff --git a/Dockerfile b/Dockerfile index f313de267..03475b8b3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ ARG CRIU_REPO=https://download.opensuse.org/repositories/devel:/tools:/criu/Debi RUN KEYFILE=/usr/share/keyrings/criu-repo-keyring.gpg; \ wget -nv $CRIU_REPO/Release.key -O- | gpg --dearmor > "$KEYFILE" \ - && echo "deb [allow-insecure=yes trusted=yes signed-by=$KEYFILE] $CRIU_REPO/ /" > /etc/apt/sources.list.d/criu.list \ + && echo "deb [signed-by=$KEYFILE] $CRIU_REPO/ /" > /etc/apt/sources.list.d/criu.list \ && dpkg --add-architecture armel \ && dpkg --add-architecture armhf \ && dpkg --add-architecture arm64 \