Browse code
Move pkcs11 out of experimental, into GA
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Riyaz Faizullabhoy authored on 2016/03/03 04:44:15Showing 7 changed files
- Dockerfile
- Dockerfile.aarch64
- Dockerfile.armhf
- Dockerfile.gccgo
- Dockerfile.ppc64le
- Dockerfile.s390x
- hack/make.sh
| ... | ... |
@@ -205,7 +205,7 @@ RUN useradd --create-home --gid docker unprivilegeduser |
| 205 | 205 |
|
| 206 | 206 |
VOLUME /var/lib/docker |
| 207 | 207 |
WORKDIR /go/src/github.com/docker/docker |
| 208 |
-ENV DOCKER_BUILDTAGS apparmor seccomp selinux |
|
| 208 |
+ENV DOCKER_BUILDTAGS apparmor pkcs11 seccomp selinux |
|
| 209 | 209 |
|
| 210 | 210 |
# Let us use a .bashrc file |
| 211 | 211 |
RUN ln -sfv $PWD/.bashrc ~/.bashrc |
| ... | ... |
@@ -153,7 +153,7 @@ RUN useradd --create-home --gid docker unprivilegeduser |
| 153 | 153 |
|
| 154 | 154 |
VOLUME /var/lib/docker |
| 155 | 155 |
WORKDIR /go/src/github.com/docker/docker |
| 156 |
-ENV DOCKER_BUILDTAGS apparmor seccomp selinux |
|
| 156 |
+ENV DOCKER_BUILDTAGS apparmor pkcs11 seccomp selinux |
|
| 157 | 157 |
|
| 158 | 158 |
# Let us use a .bashrc file |
| 159 | 159 |
RUN ln -sfv $PWD/.bashrc ~/.bashrc |
| ... | ... |
@@ -162,7 +162,7 @@ RUN useradd --create-home --gid docker unprivilegeduser |
| 162 | 162 |
|
| 163 | 163 |
VOLUME /var/lib/docker |
| 164 | 164 |
WORKDIR /go/src/github.com/docker/docker |
| 165 |
-ENV DOCKER_BUILDTAGS apparmor seccomp selinux |
|
| 165 |
+ENV DOCKER_BUILDTAGS apparmor pkcs11 seccomp selinux |
|
| 166 | 166 |
|
| 167 | 167 |
# Let us use a .bashrc file |
| 168 | 168 |
RUN ln -sfv $PWD/.bashrc ~/.bashrc |
| ... | ... |
@@ -71,7 +71,7 @@ RUN useradd --create-home --gid docker unprivilegeduser |
| 71 | 71 |
|
| 72 | 72 |
VOLUME /var/lib/docker |
| 73 | 73 |
WORKDIR /go/src/github.com/docker/docker |
| 74 |
-ENV DOCKER_BUILDTAGS apparmor seccomp selinux |
|
| 74 |
+ENV DOCKER_BUILDTAGS apparmor pkcs11 seccomp selinux |
|
| 75 | 75 |
|
| 76 | 76 |
# Wrap all commands in the "docker-in-docker" script to allow nested containers |
| 77 | 77 |
ENTRYPOINT ["hack/dind"] |
| ... | ... |
@@ -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 selinux |
|
| 157 |
+ENV DOCKER_BUILDTAGS apparmor pkcs11 selinux |
|
| 158 | 158 |
|
| 159 | 159 |
# Let us use a .bashrc file |
| 160 | 160 |
RUN ln -sfv $PWD/.bashrc ~/.bashrc |
| ... | ... |
@@ -133,7 +133,7 @@ RUN useradd --create-home --gid docker unprivilegeduser |
| 133 | 133 |
|
| 134 | 134 |
VOLUME /var/lib/docker |
| 135 | 135 |
WORKDIR /go/src/github.com/docker/docker |
| 136 |
-ENV DOCKER_BUILDTAGS apparmor selinux |
|
| 136 |
+ENV DOCKER_BUILDTAGS apparmor pkcs11 selinux |
|
| 137 | 137 |
|
| 138 | 138 |
# Let us use a .bashrc file |
| 139 | 139 |
RUN ln -sfv $PWD/.bashrc ~/.bashrc |
| ... | ... |
@@ -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 pkcs11" |
|
| 116 |
+ DOCKER_BUILDTAGS+=" experimental" |
|
| 117 | 117 |
fi |
| 118 | 118 |
|
| 119 | 119 |
if [ -z "$DOCKER_CLIENTONLY" ]; then |