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

Move hardware signing out of experimental
Upstream-commit: e6d3a9849c96201681915944947a0e5452619929
Component: engine
This commit is contained in:
Tibor Vass
2016-03-17 14:16:40 -04:00
10 changed files with 11 additions and 13 deletions

View File

@ -162,7 +162,7 @@ RUN useradd --create-home --gid docker unprivilegeduser
VOLUME /var/lib/docker
WORKDIR /go/src/github.com/docker/docker
ENV DOCKER_BUILDTAGS apparmor seccomp selinux
ENV DOCKER_BUILDTAGS apparmor pkcs11 seccomp selinux
# Let us use a .bashrc file
RUN ln -sfv $PWD/.bashrc ~/.bashrc