1. docker
  2. Commit 3ef31215f40af4a7102bd84051bbd29e8872c383
Browse code

Revert "Merge pull request #21003 from riyazdf/hardware-signing-ga"

This reverts commit e6d3a9849c96201681915944947a0e5452619929, reversing
changes made to d3afe34b51e7588984cc21a2f48da116645e52e3.

Signed-off-by: cyli <cyli@twistedmatrix.com>
(cherry picked from commit dd33d18045e50a198d3d75db8fba12f126e93937)

cyli authored on 2016/03/25 13:08:03
Showing 10 changed files
Dockerfile
History View file @ 3ef3121
... ... 
@@ -203,7 +203,7 @@ RUN useradd --create-home --gid docker unprivilegeduser
203 203
204 204 
 VOLUME /var/lib/docker
205 205 
 WORKDIR /go/src/github.com/docker/docker
206 
-ENV DOCKER_BUILDTAGS apparmor pkcs11 seccomp selinux
206 
+ENV DOCKER_BUILDTAGS apparmor seccomp selinux
207 207
208 208 
 # Let us use a .bashrc file
209 209 
 RUN ln -sfv $PWD/.bashrc ~/.bashrc
Dockerfile.aarch64
History View file @ 3ef3121
... ... 
@@ -152,7 +152,7 @@ RUN useradd --create-home --gid docker unprivilegeduser
152 152
153 153 
 VOLUME /var/lib/docker
154 154 
 WORKDIR /go/src/github.com/docker/docker
155 
-ENV DOCKER_BUILDTAGS apparmor pkcs11 seccomp selinux
155 
+ENV DOCKER_BUILDTAGS apparmor seccomp selinux
156 156
157 157 
 # Let us use a .bashrc file
158 158 
 RUN ln -sfv $PWD/.bashrc ~/.bashrc
Dockerfile.armhf
History View file @ 3ef3121
... ... 
@@ -154,7 +154,7 @@ RUN useradd --create-home --gid docker unprivilegeduser
154 154
155 155 
 VOLUME /var/lib/docker
156 156 
 WORKDIR /go/src/github.com/docker/docker
157 
-ENV DOCKER_BUILDTAGS apparmor pkcs11 seccomp selinux
157 
+ENV DOCKER_BUILDTAGS apparmor seccomp selinux
158 158
159 159 
 # Let us use a .bashrc file
160 160 
 RUN ln -sfv $PWD/.bashrc ~/.bashrc
Dockerfile.ppc64le
History View file @ 3ef3121
... ... 
@@ -155,7 +155,7 @@ RUN useradd --create-home --gid docker unprivilegeduser
155 155
156 156 
 VOLUME /var/lib/docker
157 157 
 WORKDIR /go/src/github.com/docker/docker
158 
-ENV DOCKER_BUILDTAGS apparmor pkcs11 selinux
158 
+ENV DOCKER_BUILDTAGS apparmor selinux
159 159
160 160 
 # Let us use a .bashrc file
161 161 
 RUN ln -sfv $PWD/.bashrc ~/.bashrc
Dockerfile.s390x
History View file @ 3ef3121
... ... 
@@ -134,7 +134,7 @@ RUN useradd --create-home --gid docker unprivilegeduser
134 134
135 135 
 VOLUME /var/lib/docker
136 136 
 WORKDIR /go/src/github.com/docker/docker
137 
-ENV DOCKER_BUILDTAGS apparmor pkcs11 selinux
137 
+ENV DOCKER_BUILDTAGS apparmor selinux
138 138
139 139 
 # Let us use a .bashrc file
140 140 
 RUN ln -sfv $PWD/.bashrc ~/.bashrc
hack/make.sh
History View file @ 3ef3121
... ... 
@@ -113,7 +113,7 @@ fi
113 113 
 if [ "$DOCKER_EXPERIMENTAL" ]; then
114 114 
 	echo >&2 '# WARNING! DOCKER_EXPERIMENTAL is set: building experimental features'
115 115 
 	echo >&2
116 
-	DOCKER_BUILDTAGS+=" experimental"
116 
+	DOCKER_BUILDTAGS+=" experimental pkcs11"
117 117 
 fi
118 118
119 119 
 if [ -z "$DOCKER_CLIENTONLY" ]; then
hack/make/.build-deb/rules
History View file @ 3ef3121
... ... 
@@ -5,8 +5,8 @@ VERSION = $(shell cat VERSION)
5 5 
 override_dh_gencontrol:
6 6 
 	# if we're on Ubuntu, we need to Recommends: apparmor
7 7 
 	echo 'apparmor:Recommends=$(shell dpkg-vendor --is Ubuntu && echo apparmor)' >> debian/docker-engine.substvars
8 
-	# recommend yubico-piv-tool since we include pkcs11 by default
9 
-	echo 'yubico:Recommends=yubico-piv-tool (>= 1.1.0~)' >> debian/docker-engine.substvars
8 
+	# if we are building experimental we recommend yubico-piv-tool
9 
+	echo 'yubico:Recommends=$(shell [ "$DOCKER_EXPERIMENTAL" ] && echo "yubico-piv-tool (>= 1.1.0~)")' >> debian/docker-engine.substvars
10 10 
 	dh_gencontrol
11 11
12 12 
 override_dh_auto_build:
hack/make/.build-rpm/docker-engine.spec
History View file @ 3ef3121
... ... 
@@ -60,10 +60,12 @@ Requires: device-mapper >= 1.02.90-2
60 60 
 %global with_selinux 1
61 61 
 %endif
62 62
63 
-# yubico-piv-tool recommends
63 
+%if 0%{?_experimental}
64 
+# yubico-piv-tool conditional
64 65 
 %if 0%{?fedora} >= 20 || 0%{?centos} >= 7 || 0%{?rhel} >= 7
65 66 
 Requires: yubico-piv-tool >= 1.1.0
66 67 
 %endif
68 
+%endif
67 69
68 70 
 # start if with_selinux
69 71 
 %if 0%{?with_selinux}
hack/make/binary
History View file @ 3ef3121
... ... 
@@ -36,7 +36,7 @@ if [ "$(go env GOOS)" == "linux" ] ; then
36 36 
 	esac
37 37 
 fi
38 38
39 
-if [ "$IAMSTATIC" == "true" ] && [ "$(go env GOHOSTOS)" == "linux" ]; then
39 
+if [ "$IAMSTATIC" == "true" ] && [ "$(go env GOHOSTOS)" == "linux" ] && [ "$DOCKER_EXPERIMENTAL" ]; then
40 40 
 	if  [ "${GOOS}/${GOARCH}" == "darwin/amd64" ]; then
41 41 
 		export CGO_ENABLED=1
42 42 
 		export CC=o64-clang
project/PACKAGERS.md
History View file @ 3ef3121
... ... 
@@ -60,7 +60,7 @@ To build the Docker daemon, you will additionally need:
60 60 
 * btrfs-progs version 3.16.1 or later (unless using an older version is
61 61 
   absolutely necessary, in which case 3.8 is the minimum)
62 62 
 * libseccomp version 2.2.1 or later (for build tag seccomp)
63 
-* yubico-piv-tool version 1.1.0 or later
63 
+* yubico-piv-tool version 1.1.0 or later (for experimental)
64 64
65 65 
 Be sure to also check out Docker's Dockerfile for the most up-to-date list of
66 66 
 these build-time dependencies.