From 4710ed6304b8456060f4cb4401b2ed47343991e4 Mon Sep 17 00:00:00 2001 From: cyli Date: Mon, 25 Apr 2016 11:12:57 -0700 Subject: [PATCH] Remove the pkcs11 build tag from the s390x Dockerfile, since it is using GCCGo 5.3, which is still on the Go 1.4 library, whereas the Notary Yubikey library needs interfaces from Go 1.5 Signed-off-by: cyli --- Dockerfile.s390x | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.s390x b/Dockerfile.s390x index 2effe00097..715f1c9248 100644 --- a/Dockerfile.s390x +++ b/Dockerfile.s390x @@ -158,7 +158,7 @@ RUN useradd --create-home --gid docker unprivilegeduser VOLUME /var/lib/docker WORKDIR /go/src/github.com/docker/docker -ENV DOCKER_BUILDTAGS apparmor pkcs11 selinux +ENV DOCKER_BUILDTAGS apparmor selinux # Let us use a .bashrc file RUN ln -sfv $PWD/.bashrc ~/.bashrc