merge branch 'pr-3222'

Kir Kolyshkin (5):
  ci/gha: test criu-dev with latest go
  ci/gha: remove debug info
  CI/GHA: switch to OBS criu repo
  Dockerfile: fix apt-key warning
  Dockerfile: use Debian_11 repo for criu

LGTMs: mrunalp cyphar

.github/workflows/test.yml

@@ -27,7 +27,7 @@ jobs:
         criu: [""]
         include:
           # Also test against latest criu-dev
-          - go-version: 1.16.x
+          - go-version: 1.17.x
             rootless: ""
             race: ""
             criu: "criu-dev"
@@ -37,18 +37,16 @@ jobs:
     - name: checkout
       uses: actions/checkout@v2
 
-    - name: Dump matrix context
-      env:
-        MATRIX_CONTEXT: ${{ toJSON(matrix) }}
-      run: echo "$MATRIX_CONTEXT"
-
     - name: install deps
       if: matrix.criu == ''
+      env:
+        REPO: https://download.opensuse.org/repositories/devel:/tools:/criu/xUbuntu_20.04
       run: |
         # criu repo
-        sudo add-apt-repository -y ppa:criu/ppa
-        # apt-add-repository runs apt update so we don't have to
-        sudo apt -q install libseccomp-dev criu
+        curl -fSsl $REPO/Release.key | sudo apt-key add -
+        echo "deb $REPO/ /" | sudo tee /etc/apt/sources.list.d/criu.list
+        sudo apt update
+        sudo apt install libseccomp-dev criu
 
     - name: install deps (criu ${{ matrix.criu }})
       if: matrix.criu != ''

Dockerfile

@@ -4,9 +4,11 @@ ARG LIBSECCOMP_VERSION=2.5.2
 
 FROM golang:${GO_VERSION}-bullseye
 ARG DEBIAN_FRONTEND=noninteractive
+ARG CRIU_REPO=https://download.opensuse.org/repositories/devel:/tools:/criu/Debian_11
 
-RUN echo 'deb https://download.opensuse.org/repositories/devel:/tools:/criu/Debian_10/ /' > /etc/apt/sources.list.d/criu.list \
-    && wget -nv https://download.opensuse.org/repositories/devel:/tools:/criu/Debian_10/Release.key -O- | apt-key add - \
+RUN KEYFILE=/usr/share/keyrings/criu-repo-keyring.gpg; \
+    wget -nv $CRIU_REPO/Release.key -O- | gpg --dearmor > "$KEYFILE" \
+    && 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 \