diff --git a/components/packaging/deb/debian-buster/Dockerfile b/components/packaging/deb/debian-buster/Dockerfile index add29f72b2..d47001a8a2 100644 --- a/components/packaging/deb/debian-buster/Dockerfile +++ b/components/packaging/deb/debian-buster/Dockerfile @@ -11,7 +11,7 @@ RUN apt-get update && apt-get install -y curl devscripts equivs git ARG GO_VERSION ENV GOPATH /go ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin -ENV DOCKER_BUILDTAGS apparmor pkcs11 seccomp selinux +ENV DOCKER_BUILDTAGS apparmor seccomp selinux ENV RUNC_BUILDTAGS apparmor seccomp selinux ARG COMMON_FILES diff --git a/components/packaging/deb/debian-stretch/Dockerfile b/components/packaging/deb/debian-stretch/Dockerfile index 003f26a4ba..ce63586d2c 100644 --- a/components/packaging/deb/debian-stretch/Dockerfile +++ b/components/packaging/deb/debian-stretch/Dockerfile @@ -11,7 +11,7 @@ RUN apt-get update && apt-get install -y curl devscripts equivs git ARG GO_VERSION ENV GOPATH /go ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin -ENV DOCKER_BUILDTAGS apparmor pkcs11 seccomp selinux +ENV DOCKER_BUILDTAGS apparmor seccomp selinux ENV RUNC_BUILDTAGS apparmor seccomp selinux ARG COMMON_FILES diff --git a/components/packaging/deb/raspbian-stretch/Dockerfile b/components/packaging/deb/raspbian-stretch/Dockerfile index 83bab8c651..186788444b 100644 --- a/components/packaging/deb/raspbian-stretch/Dockerfile +++ b/components/packaging/deb/raspbian-stretch/Dockerfile @@ -11,7 +11,7 @@ RUN apt-get update && apt-get install -y curl devscripts equivs git ARG GO_VERSION ENV GOPATH /go ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin -ENV DOCKER_BUILDTAGS apparmor pkcs11 seccomp selinux +ENV DOCKER_BUILDTAGS apparmor seccomp selinux ENV RUNC_BUILDTAGS apparmor seccomp selinux ARG COMMON_FILES diff --git a/components/packaging/deb/ubuntu-bionic/Dockerfile b/components/packaging/deb/ubuntu-bionic/Dockerfile index 6ee9eae18f..b3cdc9ea1c 100644 --- a/components/packaging/deb/ubuntu-bionic/Dockerfile +++ b/components/packaging/deb/ubuntu-bionic/Dockerfile @@ -11,7 +11,7 @@ RUN apt-get update && apt-get install -y curl devscripts equivs git ARG GO_VERSION ENV GOPATH /go ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin -ENV DOCKER_BUILDTAGS apparmor pkcs11 seccomp selinux +ENV DOCKER_BUILDTAGS apparmor seccomp selinux ENV RUNC_BUILDTAGS apparmor seccomp selinux ARG COMMON_FILES diff --git a/components/packaging/deb/ubuntu-cosmic/Dockerfile b/components/packaging/deb/ubuntu-cosmic/Dockerfile index 9b6d078676..6b0e9043a5 100644 --- a/components/packaging/deb/ubuntu-cosmic/Dockerfile +++ b/components/packaging/deb/ubuntu-cosmic/Dockerfile @@ -11,7 +11,7 @@ RUN apt-get update && apt-get install -y curl devscripts equivs git ARG GO_VERSION ENV GOPATH /go ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin -ENV DOCKER_BUILDTAGS apparmor pkcs11 seccomp selinux +ENV DOCKER_BUILDTAGS apparmor seccomp selinux ENV RUNC_BUILDTAGS apparmor seccomp selinux ARG COMMON_FILES diff --git a/components/packaging/deb/ubuntu-xenial/Dockerfile b/components/packaging/deb/ubuntu-xenial/Dockerfile index 68ef9ff942..ad366ffcae 100644 --- a/components/packaging/deb/ubuntu-xenial/Dockerfile +++ b/components/packaging/deb/ubuntu-xenial/Dockerfile @@ -11,7 +11,7 @@ RUN apt-get update && apt-get install -y curl devscripts equivs git ARG GO_VERSION ENV GOPATH /go ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin -ENV DOCKER_BUILDTAGS apparmor pkcs11 seccomp selinux +ENV DOCKER_BUILDTAGS apparmor seccomp selinux ENV RUNC_BUILDTAGS apparmor seccomp selinux ARG COMMON_FILES diff --git a/components/packaging/rpm/centos-7/Dockerfile b/components/packaging/rpm/centos-7/Dockerfile index c2485ef53b..1a03c9ab0f 100644 --- a/components/packaging/rpm/centos-7/Dockerfile +++ b/components/packaging/rpm/centos-7/Dockerfile @@ -10,7 +10,7 @@ ENV SUITE 7 ENV GOPATH=/go ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin ENV AUTO_GOPATH 1 -ENV DOCKER_BUILDTAGS pkcs11 seccomp selinux +ENV DOCKER_BUILDTAGS seccomp selinux ENV RUNC_BUILDTAGS seccomp selinux RUN yum install -y rpm-build rpmlint COPY SPECS /root/rpmbuild/SPECS diff --git a/components/packaging/rpm/fedora-27/Dockerfile b/components/packaging/rpm/fedora-27/Dockerfile index c4311f3dc4..20e8d59fb2 100644 --- a/components/packaging/rpm/fedora-27/Dockerfile +++ b/components/packaging/rpm/fedora-27/Dockerfile @@ -10,7 +10,7 @@ ENV SUITE 27 ENV GOPATH /go ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin ENV AUTO_GOPATH 1 -ENV DOCKER_BUILDTAGS pkcs11 seccomp selinux +ENV DOCKER_BUILDTAGS seccomp selinux ENV RUNC_BUILDTAGS seccomp selinux RUN dnf install -y rpm-build rpmlint dnf-plugins-core COPY SPECS /root/rpmbuild/SPECS diff --git a/components/packaging/rpm/fedora-28/Dockerfile b/components/packaging/rpm/fedora-28/Dockerfile index 39cd834696..abdf1710c8 100644 --- a/components/packaging/rpm/fedora-28/Dockerfile +++ b/components/packaging/rpm/fedora-28/Dockerfile @@ -10,7 +10,7 @@ ENV SUITE 28 ENV GOPATH /go ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin ENV AUTO_GOPATH 1 -ENV DOCKER_BUILDTAGS pkcs11 seccomp selinux +ENV DOCKER_BUILDTAGS seccomp selinux ENV RUNC_BUILDTAGS seccomp selinux RUN dnf install -y rpm-build rpmlint dnf-plugins-core COPY SPECS /root/rpmbuild/SPECS diff --git a/components/packaging/rpm/fedora-29/Dockerfile b/components/packaging/rpm/fedora-29/Dockerfile index 79e1604d08..48a0f05fbf 100644 --- a/components/packaging/rpm/fedora-29/Dockerfile +++ b/components/packaging/rpm/fedora-29/Dockerfile @@ -10,7 +10,7 @@ ENV SUITE 29 ENV GOPATH /go ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin ENV AUTO_GOPATH 1 -ENV DOCKER_BUILDTAGS pkcs11 seccomp selinux +ENV DOCKER_BUILDTAGS seccomp selinux ENV RUNC_BUILDTAGS seccomp selinux RUN dnf install -y rpm-build rpmlint dnf-plugins-core COPY SPECS /root/rpmbuild/SPECS