Merge pull request #693 from thaJeztah/remove_old_buildtags

thaJeztah · web-flow · commit 0beb78cd5dde · 2022-05-13T18:11:54.000+02:00
[master] remove obsolete "selinux, apparmor, seccomp" build-tags from DOCKER_BUILDTAGS
diff --git a/deb/debian-bullseye/Dockerfile b/deb/debian-bullseye/Dockerfile
@@ -14,7 +14,6 @@ ENV GOPROXY=direct
 ENV GO111MODULE=off
 ENV GOPATH /go
 ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin
-ENV DOCKER_BUILDTAGS apparmor seccomp selinux
 
 ARG COMMON_FILES
 COPY ${COMMON_FILES} /root/build-deb/debian
diff --git a/deb/debian-buster/Dockerfile b/deb/debian-buster/Dockerfile
@@ -14,7 +14,6 @@ ENV GOPROXY=direct
 ENV GO111MODULE=off
 ENV GOPATH /go
 ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin
-ENV DOCKER_BUILDTAGS apparmor seccomp selinux
 
 ARG COMMON_FILES
 COPY ${COMMON_FILES} /root/build-deb/debian
diff --git a/deb/raspbian-bullseye/Dockerfile b/deb/raspbian-bullseye/Dockerfile
@@ -14,7 +14,6 @@ ENV GOPROXY=direct
 ENV GO111MODULE=off
 ENV GOPATH /go
 ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin
-ENV DOCKER_BUILDTAGS apparmor seccomp selinux
 
 ARG COMMON_FILES
 COPY ${COMMON_FILES} /root/build-deb/debian
diff --git a/deb/raspbian-buster/Dockerfile b/deb/raspbian-buster/Dockerfile
@@ -14,7 +14,6 @@ ENV GOPROXY=direct
 ENV GO111MODULE=off
 ENV GOPATH /go
 ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin
-ENV DOCKER_BUILDTAGS apparmor seccomp selinux
 
 ARG COMMON_FILES
 COPY ${COMMON_FILES} /root/build-deb/debian
diff --git a/deb/ubuntu-bionic/Dockerfile b/deb/ubuntu-bionic/Dockerfile
@@ -14,7 +14,6 @@ ENV GOPROXY=direct
 ENV GO111MODULE=off
 ENV GOPATH /go
 ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin
-ENV DOCKER_BUILDTAGS apparmor seccomp selinux
 
 ARG COMMON_FILES
 COPY ${COMMON_FILES} /root/build-deb/debian
diff --git a/deb/ubuntu-focal/Dockerfile b/deb/ubuntu-focal/Dockerfile
@@ -20,7 +20,6 @@ ENV GOPROXY=direct
 ENV GO111MODULE=off
 ENV GOPATH /go
 ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin
-ENV DOCKER_BUILDTAGS apparmor seccomp selinux
 
 ARG COMMON_FILES
 COPY ${COMMON_FILES} /root/build-deb/debian
diff --git a/deb/ubuntu-impish/Dockerfile b/deb/ubuntu-impish/Dockerfile
@@ -20,7 +20,6 @@ ENV GOPROXY=direct
 ENV GO111MODULE=off
 ENV GOPATH /go
 ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin
-ENV DOCKER_BUILDTAGS apparmor seccomp selinux
 
 ARG COMMON_FILES
 COPY ${COMMON_FILES} /root/build-deb/debian
diff --git a/deb/ubuntu-jammy/Dockerfile b/deb/ubuntu-jammy/Dockerfile
@@ -20,7 +20,6 @@ ENV GOPROXY=direct
 ENV GO111MODULE=off
 ENV GOPATH /go
 ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin
-ENV DOCKER_BUILDTAGS apparmor seccomp selinux
 
 ARG COMMON_FILES
 COPY ${COMMON_FILES} /root/build-deb/debian
diff --git a/rpm/centos-7/Dockerfile b/rpm/centos-7/Dockerfile
@@ -16,7 +16,6 @@ ENV GO111MODULE=off
 ENV GOPATH=/go
 ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin
 ENV AUTO_GOPATH 1
-ENV DOCKER_BUILDTAGS seccomp selinux
 ARG DISTRO
 ARG SUITE
 ENV DISTRO=${DISTRO}
diff --git a/rpm/centos-8/Dockerfile b/rpm/centos-8/Dockerfile
@@ -11,7 +11,7 @@ ENV GO111MODULE=off
 ENV GOPATH=/go
 ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin
 ENV AUTO_GOPATH 1
-ENV DOCKER_BUILDTAGS exclude_graphdriver_btrfs seccomp selinux
+ENV DOCKER_BUILDTAGS exclude_graphdriver_btrfs
 ARG DISTRO
 ARG SUITE
 ENV DISTRO=${DISTRO}
diff --git a/rpm/centos-9/Dockerfile b/rpm/centos-9/Dockerfile
@@ -11,7 +11,7 @@ ENV GO111MODULE=off
 ENV GOPATH=/go
 ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin
 ENV AUTO_GOPATH 1
-ENV DOCKER_BUILDTAGS exclude_graphdriver_btrfs seccomp selinux
+ENV DOCKER_BUILDTAGS exclude_graphdriver_btrfs
 ARG DISTRO
 ARG SUITE
 ENV DISTRO=${DISTRO}
diff --git a/rpm/fedora-34/Dockerfile b/rpm/fedora-34/Dockerfile
@@ -11,7 +11,6 @@ ENV GO111MODULE=off
 ENV GOPATH /go
 ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin
 ENV AUTO_GOPATH 1
-ENV DOCKER_BUILDTAGS seccomp selinux
 ARG DISTRO
 ARG SUITE
 ENV DISTRO=${DISTRO}
diff --git a/rpm/fedora-35/Dockerfile b/rpm/fedora-35/Dockerfile
@@ -11,7 +11,6 @@ ENV GO111MODULE=off
 ENV GOPATH /go
 ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin
 ENV AUTO_GOPATH 1
-ENV DOCKER_BUILDTAGS seccomp selinux
 ARG DISTRO
 ARG SUITE
 ENV DISTRO=${DISTRO}
diff --git a/rpm/fedora-36/Dockerfile b/rpm/fedora-36/Dockerfile
@@ -11,7 +11,6 @@ ENV GO111MODULE=off
 ENV GOPATH /go
 ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin
 ENV AUTO_GOPATH 1
-ENV DOCKER_BUILDTAGS seccomp selinux
 ARG DISTRO
 ARG SUITE
 ENV DISTRO=${DISTRO}
diff --git a/rpm/rhel-7/Dockerfile b/rpm/rhel-7/Dockerfile
@@ -11,7 +11,6 @@ ENV GO111MODULE=off
 ENV GOPATH=/go
 ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin
 ENV AUTO_GOPATH 1
-ENV DOCKER_BUILDTAGS seccomp selinux
 ARG DISTRO
 ARG SUITE
 ENV DISTRO=${DISTRO}
