docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #22015 from endophage/pkcs11_debs 

add pkcs11 build tag to deb and rpm builds
This commit is contained in:
Tibor Vass 2016-04-22 13:29:44 -04:00
parent 9b00817dc6 829d1883dc
commit 4377a58c12
15 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/builder/deb/amd64/debian-jessie/Dockerfile
View File

@ -12,5 +12,5 @@ ENV PATH $PATH:/usr/local/go/bin
ENV AUTO_GOPATH 1 ENV AUTO_GOPATH 1
ENV DOCKER_BUILDTAGS apparmor selinux ENV DOCKER_BUILDTAGS apparmor pkcs11 selinux
ENV RUNC_BUILDTAGS apparmor selinux ENV RUNC_BUILDTAGS apparmor selinux

2
contrib/builder/deb/amd64/debian-stretch/Dockerfile
View File

@ -12,5 +12,5 @@ ENV PATH $PATH:/usr/local/go/bin
ENV AUTO_GOPATH 1 ENV AUTO_GOPATH 1
ENV DOCKER_BUILDTAGS apparmor seccomp selinux ENV DOCKER_BUILDTAGS apparmor pkcs11 seccomp selinux
ENV RUNC_BUILDTAGS apparmor seccomp selinux ENV RUNC_BUILDTAGS apparmor seccomp selinux

2
contrib/builder/deb/amd64/debian-wheezy/Dockerfile
View File

@ -13,5 +13,5 @@ ENV PATH $PATH:/usr/local/go/bin
ENV AUTO_GOPATH 1 ENV AUTO_GOPATH 1
ENV DOCKER_BUILDTAGS apparmor selinux ENV DOCKER_BUILDTAGS apparmor pkcs11 selinux
ENV RUNC_BUILDTAGS apparmor selinux ENV RUNC_BUILDTAGS apparmor selinux

2
contrib/builder/deb/amd64/generate.sh
View File

@ -41,7 +41,7 @@ for version in "${versions[@]}"; do
echo >> "$version/Dockerfile" echo >> "$version/Dockerfile"
extraBuildTags= extraBuildTags='pkcs11'
runcBuildTags= runcBuildTags=
# this list is sorted alphabetically; please keep it that way # this list is sorted alphabetically; please keep it that way

2
contrib/builder/deb/amd64/ubuntu-precise/Dockerfile
View File

@ -12,5 +12,5 @@ ENV PATH $PATH:/usr/local/go/bin
ENV AUTO_GOPATH 1 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 ENV RUNC_BUILDTAGS apparmor selinux

2
contrib/builder/deb/amd64/ubuntu-trusty/Dockerfile
View File

@ -12,5 +12,5 @@ ENV PATH $PATH:/usr/local/go/bin
ENV AUTO_GOPATH 1 ENV AUTO_GOPATH 1
ENV DOCKER_BUILDTAGS apparmor selinux ENV DOCKER_BUILDTAGS apparmor pkcs11 selinux
ENV RUNC_BUILDTAGS apparmor selinux ENV RUNC_BUILDTAGS apparmor selinux

2
contrib/builder/deb/amd64/ubuntu-wily/Dockerfile
View File

@ -12,5 +12,5 @@ ENV PATH $PATH:/usr/local/go/bin
ENV AUTO_GOPATH 1 ENV AUTO_GOPATH 1
ENV DOCKER_BUILDTAGS apparmor seccomp selinux ENV DOCKER_BUILDTAGS apparmor pkcs11 seccomp selinux
ENV RUNC_BUILDTAGS apparmor seccomp selinux ENV RUNC_BUILDTAGS apparmor seccomp selinux

2
contrib/builder/deb/amd64/ubuntu-xenial/Dockerfile
View File

@ -12,5 +12,5 @@ ENV PATH $PATH:/usr/local/go/bin
ENV AUTO_GOPATH 1 ENV AUTO_GOPATH 1
ENV DOCKER_BUILDTAGS apparmor seccomp selinux ENV DOCKER_BUILDTAGS apparmor pkcs11 seccomp selinux
ENV RUNC_BUILDTAGS apparmor seccomp selinux ENV RUNC_BUILDTAGS apparmor seccomp selinux

2
contrib/builder/rpm/amd64/centos-7/Dockerfile
View File

@ -14,6 +14,6 @@ ENV PATH $PATH:/usr/local/go/bin
ENV AUTO_GOPATH 1 ENV AUTO_GOPATH 1
ENV DOCKER_BUILDTAGS selinux ENV DOCKER_BUILDTAGS pkcs11 selinux
ENV RUNC_BUILDTAGS selinux ENV RUNC_BUILDTAGS selinux

2
contrib/builder/rpm/amd64/fedora-22/Dockerfile
View File

@ -13,6 +13,6 @@ ENV PATH $PATH:/usr/local/go/bin
ENV AUTO_GOPATH 1 ENV AUTO_GOPATH 1
ENV DOCKER_BUILDTAGS seccomp selinux ENV DOCKER_BUILDTAGS pkcs11 seccomp selinux
ENV RUNC_BUILDTAGS seccomp selinux ENV RUNC_BUILDTAGS seccomp selinux

2
contrib/builder/rpm/amd64/fedora-23/Dockerfile
View File

@ -13,6 +13,6 @@ ENV PATH $PATH:/usr/local/go/bin
ENV AUTO_GOPATH 1 ENV AUTO_GOPATH 1
ENV DOCKER_BUILDTAGS seccomp selinux ENV DOCKER_BUILDTAGS pkcs11 seccomp selinux
ENV RUNC_BUILDTAGS seccomp selinux ENV RUNC_BUILDTAGS seccomp selinux

2
contrib/builder/rpm/amd64/generate.sh
View File

@ -38,7 +38,7 @@ for version in "${versions[@]}"; do
echo >> "$version/Dockerfile" echo >> "$version/Dockerfile"
extraBuildTags= extraBuildTags='pkcs11'
runcBuildTags= runcBuildTags=
case "$from" in case "$from" in

2
contrib/builder/rpm/amd64/opensuse-13.2/Dockerfile
View File

@ -13,6 +13,6 @@ ENV PATH $PATH:/usr/local/go/bin
ENV AUTO_GOPATH 1 ENV AUTO_GOPATH 1
ENV DOCKER_BUILDTAGS selinux ENV DOCKER_BUILDTAGS pkcs11 selinux
ENV RUNC_BUILDTAGS selinux ENV RUNC_BUILDTAGS selinux

2
contrib/builder/rpm/amd64/oraclelinux-6/Dockerfile
View File

@ -16,7 +16,7 @@ ENV PATH $PATH:/usr/local/go/bin
ENV AUTO_GOPATH 1 ENV AUTO_GOPATH 1
ENV DOCKER_BUILDTAGS selinux ENV DOCKER_BUILDTAGS pkcs11 selinux
ENV RUNC_BUILDTAGS selinux ENV RUNC_BUILDTAGS selinux
ENV CGO_CPPFLAGS -D__EXPORTED_HEADERS__ \ ENV CGO_CPPFLAGS -D__EXPORTED_HEADERS__ \

2
contrib/builder/rpm/amd64/oraclelinux-7/Dockerfile
View File

@ -13,6 +13,6 @@ ENV PATH $PATH:/usr/local/go/bin
ENV AUTO_GOPATH 1 ENV AUTO_GOPATH 1
ENV DOCKER_BUILDTAGS selinux ENV DOCKER_BUILDTAGS pkcs11 selinux
ENV RUNC_BUILDTAGS selinux ENV RUNC_BUILDTAGS selinux