Merge pull request #5763 from thaJeztah/1.5_backport_install_apparmor…

…_parser_for_arm64_env [release/1.5 backport] install apparmor parser for arm64, and update seccomp to 2.5.1
containerd · Aug 16, 2021 · 25ad944 · 25ad944
2 parents 84cfadf + eb4ba99
commit 25ad944
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -368,6 +368,7 @@ jobs:
         env:
           RUNC_FLAVOR: ${{ matrix.runc }}
         run: |
+          sudo apt-get install -y gperf
           sudo -E PATH=$PATH script/setup/install-seccomp
           sudo -E PATH=$PATH script/setup/install-runc
           sudo -E PATH=$PATH script/setup/install-cni

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -132,6 +132,8 @@ jobs:
           RUNC_FLAVOR: runc
         run: |
           if [[ "${OS}" == "linux" ]]; then
+            sudo apt-get update
+            sudo apt-get install -y gperf
             sudo -E PATH=$PATH script/setup/install-seccomp
           fi
           make cri-cni-release

diff --git a/.zuul/playbooks/containerd-build/integration-test.yaml b/.zuul/playbooks/containerd-build/integration-test.yaml
@@ -11,7 +11,7 @@
         set -xe
         set -o pipefail
         apt-get update
-        apt-get install -y btrfs-tools libseccomp-dev git pkg-config lsof
+        apt-get install -y btrfs-tools libseccomp-dev git pkg-config lsof gperf apparmor
 
         go version
       chdir: '{{ zuul.project.src_dir }}'

diff --git a/script/setup/install-seccomp b/script/setup/install-seccomp
@@ -22,7 +22,7 @@ set -eu -o pipefail
 
 set -x
 
-export SECCOMP_VERSION=2.3.3
+export SECCOMP_VERSION=2.5.1
 export SECCOMP_PATH=$(mktemp -d)
 curl -fsSL "https://github.com/seccomp/libseccomp/releases/download/v${SECCOMP_VERSION}/libseccomp-${SECCOMP_VERSION}.tar.gz" | tar -xzC "$SECCOMP_PATH" --strip-components=1
 (