toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #22015 from endophage/pkcs11_debs

Browse Source 
add pkcs11 build tag to deb and rpm builds
Upstream-commit: 4377a58c1235c1f207a28f8ffb0599d7b3adeedf
Component: engine
This commit is contained in:
Tibor Vass
2016-04-22 13:29:44 -04:00
parent 3e3ec58c45 1b58e69a36
commit 09985717bc
15 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/contrib/builder/deb/amd64/debian-jessie/Dockerfile
+1 -1
View File
@@ -12,5 +12,5 @@ ENV PATH $PATH:/usr/local/go/bin
ENV AUTO_GOPATH 1
ENV DOCKER_BUILDTAGS apparmor selinux
ENV DOCKER_BUILDTAGS apparmor pkcs11 selinux
ENV RUNC_BUILDTAGS apparmor selinux
components/engine/contrib/builder/deb/amd64/debian-stretch/Dockerfile
+1 -1
View File
@@ -12,5 +12,5 @@ ENV PATH $PATH:/usr/local/go/bin
ENV AUTO_GOPATH 1
ENV DOCKER_BUILDTAGS apparmor seccomp selinux
ENV DOCKER_BUILDTAGS apparmor pkcs11 seccomp selinux
ENV RUNC_BUILDTAGS apparmor seccomp selinux
components/engine/contrib/builder/deb/amd64/debian-wheezy/Dockerfile
+1 -1
View File
@@ -13,5 +13,5 @@ ENV PATH $PATH:/usr/local/go/bin
ENV AUTO_GOPATH 1
ENV DOCKER_BUILDTAGS apparmor selinux
ENV DOCKER_BUILDTAGS apparmor pkcs11 selinux
ENV RUNC_BUILDTAGS apparmor selinux
components/engine/contrib/builder/deb/amd64/generate.sh
+1 -1
View File
@@ -41,7 +41,7 @@ for version in "${versions[@]}"; do
echo >> "$version/Dockerfile"
extraBuildTags=
extraBuildTags='pkcs11'
runcBuildTags=
# this list is sorted alphabetically; please keep it that way
components/engine/contrib/builder/deb/amd64/ubuntu-precise/Dockerfile
+1 -1
View File
@@ -12,5 +12,5 @@ ENV PATH $PATH:/usr/local/go/bin
ENV AUTO_GOPATH 1
ENV DOCKER_BUILDTAGS apparmor exclude_graphdriver_btrfs exclude_graphdriver_devicemapper selinux
ENV DOCKER_BUILDTAGS apparmor exclude_graphdriver_btrfs exclude_graphdriver_devicemapper pkcs11 selinux
ENV RUNC_BUILDTAGS apparmor selinux
components/engine/contrib/builder/deb/amd64/ubuntu-trusty/Dockerfile
+1 -1
View File
@@ -12,5 +12,5 @@ ENV PATH $PATH:/usr/local/go/bin
ENV AUTO_GOPATH 1
ENV DOCKER_BUILDTAGS apparmor selinux
ENV DOCKER_BUILDTAGS apparmor pkcs11 selinux
ENV RUNC_BUILDTAGS apparmor selinux
components/engine/contrib/builder/deb/amd64/ubuntu-wily/Dockerfile
+1 -1
View File
@@ -12,5 +12,5 @@ ENV PATH $PATH:/usr/local/go/bin
ENV AUTO_GOPATH 1
ENV DOCKER_BUILDTAGS apparmor seccomp selinux
ENV DOCKER_BUILDTAGS apparmor pkcs11 seccomp selinux
ENV RUNC_BUILDTAGS apparmor seccomp selinux
components/engine/contrib/builder/deb/amd64/ubuntu-xenial/Dockerfile
+1 -1
View File
@@ -12,5 +12,5 @@ ENV PATH $PATH:/usr/local/go/bin
ENV AUTO_GOPATH 1
ENV DOCKER_BUILDTAGS apparmor seccomp selinux
ENV DOCKER_BUILDTAGS apparmor pkcs11 seccomp selinux
ENV RUNC_BUILDTAGS apparmor seccomp selinux
components/engine/contrib/builder/rpm/amd64/centos-7/Dockerfile
+1 -1
View File
@@ -14,6 +14,6 @@ ENV PATH $PATH:/usr/local/go/bin
ENV AUTO_GOPATH 1
ENV DOCKER_BUILDTAGS selinux
ENV DOCKER_BUILDTAGS pkcs11 selinux
ENV RUNC_BUILDTAGS selinux
components/engine/contrib/builder/rpm/amd64/fedora-22/Dockerfile
+1 -1
View File
@@ -13,6 +13,6 @@ ENV PATH $PATH:/usr/local/go/bin
ENV AUTO_GOPATH 1
ENV DOCKER_BUILDTAGS seccomp selinux
ENV DOCKER_BUILDTAGS pkcs11 seccomp selinux
ENV RUNC_BUILDTAGS seccomp selinux
components/engine/contrib/builder/rpm/amd64/fedora-23/Dockerfile
+1 -1
View File
@@ -13,6 +13,6 @@ ENV PATH $PATH:/usr/local/go/bin
ENV AUTO_GOPATH 1
ENV DOCKER_BUILDTAGS seccomp selinux
ENV DOCKER_BUILDTAGS pkcs11 seccomp selinux
ENV RUNC_BUILDTAGS seccomp selinux
components/engine/contrib/builder/rpm/amd64/generate.sh
+1 -1
View File
@@ -38,7 +38,7 @@ for version in "${versions[@]}"; do
echo >> "$version/Dockerfile"
extraBuildTags=
extraBuildTags='pkcs11'
runcBuildTags=
case "$from" in
components/engine/contrib/builder/rpm/amd64/opensuse-13.2/Dockerfile
+1 -1
View File
@@ -13,6 +13,6 @@ ENV PATH $PATH:/usr/local/go/bin
ENV AUTO_GOPATH 1
ENV DOCKER_BUILDTAGS selinux
ENV DOCKER_BUILDTAGS pkcs11 selinux
ENV RUNC_BUILDTAGS selinux
components/engine/contrib/builder/rpm/amd64/oraclelinux-6/Dockerfile
+1 -1
View File
@@ -16,7 +16,7 @@ ENV PATH $PATH:/usr/local/go/bin
ENV AUTO_GOPATH 1
ENV DOCKER_BUILDTAGS selinux
ENV DOCKER_BUILDTAGS pkcs11 selinux
ENV RUNC_BUILDTAGS selinux
ENV CGO_CPPFLAGS -D__EXPORTED_HEADERS__ \
components/engine/contrib/builder/rpm/amd64/oraclelinux-7/Dockerfile
+1 -1
View File
@@ -13,6 +13,6 @@ ENV PATH $PATH:/usr/local/go/bin
ENV AUTO_GOPATH 1
ENV DOCKER_BUILDTAGS selinux
ENV DOCKER_BUILDTAGS pkcs11 selinux
ENV RUNC_BUILDTAGS selinux