packages: enable seccomp in containerd

Fixes: #2259 See: #2259
scality · Apr 6, 2020 · 63fb6aa · 63fb6aa
1 parent 49ca5d2
commit 63fb6aa
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/buildchain/buildchain/versions.py b/buildchain/buildchain/versions.py
@@ -21,6 +21,7 @@
 K8S_VERSION        : str = '1.17.4'
 SALT_VERSION       : str = '2018.3.4'
 CONTAINERD_VERSION : str = '1.2.13'
+CONTAINERD_RELEASE : str = '2.el7'
 
 def load_version_information() -> None:
     """Load version information from `VERSION`."""
@@ -333,7 +334,7 @@ def deb_full_name(self) -> str:
         PackageVersion(
             name='containerd',
             version=CONTAINERD_VERSION,
-            release='1.el7',
+            release=CONTAINERD_RELEASE,
         ),
         PackageVersion(name='container-selinux'),  # TODO #1710
         PackageVersion(

diff --git a/packages/redhat/Dockerfile b/packages/redhat/Dockerfile
@@ -23,6 +23,7 @@ RUN yum install -y \
         golang \
         btrfs-progs-devel \
         go-md2man \
+        libseccomp-devel \
         systemd \
         && \
     yum clean all

diff --git a/packages/redhat/containerd.spec b/packages/redhat/containerd.spec
@@ -23,16 +23,16 @@ export GOPATH=$GO_BUILD_PATH:%{gopath}
 %define gobuild(o:) %{expand:
 %global _dwz_low_mem_die_limit 0
 %ifnarch ppc64
-go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags %{?__golang_extldflags}'" -a -v -x %{?**};
+go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-seccomp}" -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags %{?__golang_extldflags}'" -a -v -x %{?**};
 %else
-go build -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags %{?__golang_extldflags}'" -a -v -x %{?**};
+go build -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-seccomp}" -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags %{?__golang_extldflags}'" -a -v -x %{?**};
 %endif
 }
 %endif
 
 
 Name:           containerd
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        An industry-standard container runtime
 License:        ASL 2.0
 URL:            https://containerd.io
@@ -43,6 +43,7 @@ Source2:        containerd.toml
 BuildRequires:  golang >= 1.10
 BuildRequires:  btrfs-progs-devel
 BuildRequires:  go-md2man
+BuildRequires:  libseccomp-devel
 BuildRequires:  systemd
 %{?systemd_requires}
 Requires:       runc
@@ -209,6 +210,9 @@ install -D -p -m 0644 %{S:2} %{buildroot}%{_sysconfdir}/containerd/config.toml
 
 
 %changelog
+* Mon Apr 6 2020 Nicolas Trangez <[email protected]> - 1.2.13-2
+- Enable seccomp support
+
 * Mon Apr 6 2020 Nicolas Trangez <[email protected]> - 1.2.13-1
 - Latest upstream