Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
| ... | ... |
@@ -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 pkcs11 seccomp selinux |
|
| 74 |
+ENV DOCKER_BUILDTAGS apparmor seccomp selinux |
|
| 75 | 75 |
|
| 76 | 76 |
# Wrap all commands in the "docker-in-docker" script to allow nested containers |
| 77 | 77 |
ENTRYPOINT ["hack/dind"] |
| ... | ... |
@@ -6,7 +6,7 @@ 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 | 8 |
# recommend yubico-piv-tool since we include pkcs11 by default |
| 9 |
- echo 'yubico:Recommends=$(echo "yubico-piv-tool (>= 1.1.0~)")' >> debian/docker-engine.substvars |
|
| 9 |
+ echo 'yubico:Recommends="yubico-piv-tool (>= 1.1.0~)"' >> debian/docker-engine.substvars |
|
| 10 | 10 |
dh_gencontrol |
| 11 | 11 |
|
| 12 | 12 |
override_dh_auto_build: |