docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve messaging and binary generation for pkcs11 

Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
This commit is contained in:
Riyaz Faizullabhoy 2016-03-15 16:25:44 -07:00
parent 2c3e9e5794
commit f7fa83c910
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile.gccgo
View File

@ -71,7 +71,7 @@ RUN useradd --create-home --gid docker unprivilegeduser
VOLUME /var/lib/docker VOLUME /var/lib/docker
WORKDIR /go/src/github.com/docker/docker WORKDIR /go/src/github.com/docker/docker
ENV DOCKER_BUILDTAGS apparmor pkcs11 seccomp selinux ENV DOCKER_BUILDTAGS apparmor seccomp selinux
# Wrap all commands in the "docker-in-docker" script to allow nested containers # Wrap all commands in the "docker-in-docker" script to allow nested containers
ENTRYPOINT ["hack/dind"] ENTRYPOINT ["hack/dind"]

2
hack/make/.build-deb/rules
View File

@ -6,7 +6,7 @@ override_dh_gencontrol:
# if we're on Ubuntu, we need to Recommends: apparmor # if we're on Ubuntu, we need to Recommends: apparmor
echo 'apparmor:Recommends=$(shell dpkg-vendor --is Ubuntu && echo apparmor)' >> debian/docker-engine.substvars echo 'apparmor:Recommends=$(shell dpkg-vendor --is Ubuntu && echo apparmor)' >> debian/docker-engine.substvars
# recommend yubico-piv-tool since we include pkcs11 by default # recommend yubico-piv-tool since we include pkcs11 by default
echo 'yubico:Recommends=$(echo "yubico-piv-tool (>= 1.1.0~)")' >> debian/docker-engine.substvars echo 'yubico:Recommends="yubico-piv-tool (>= 1.1.0~)"' >> debian/docker-engine.substvars
dh_gencontrol dh_gencontrol
override_dh_auto_build: override_dh_auto_build:

2
hack/make/.build-rpm/docker-engine.spec
View File

@ -60,7 +60,7 @@ Requires: device-mapper >= 1.02.90-2
%global with_selinux 1 %global with_selinux 1
%endif %endif
# yubico-piv-tool required # yubico-piv-tool recommends
%if 0%{?fedora} >= 20 || 0%{?centos} >= 7 || 0%{?rhel} >= 7 %if 0%{?fedora} >= 20 || 0%{?centos} >= 7 || 0%{?rhel} >= 7
Requires: yubico-piv-tool >= 1.1.0 Requires: yubico-piv-tool >= 1.1.0
%endif %endif