Skip to content

Commit e6d3a98

Browse files
tiborvasstiborvass
committed
Merge pull request moby#21003 from riyazdf/hardware-signing-ga
Move hardware signing out of experimental
2 parents d3afe34 + f7fa83c commit e6d3a98

10 files changed

Lines changed: 11 additions & 13 deletions

File tree

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ RUN useradd --create-home --gid docker unprivilegeduser
205205

206206
VOLUME /var/lib/docker
207207
WORKDIR /go/src/github.com/docker/docker
208-
ENV DOCKER_BUILDTAGS apparmor seccomp selinux
208+
ENV DOCKER_BUILDTAGS apparmor pkcs11 seccomp selinux
209209

210210
# Let us use a .bashrc file
211211
RUN ln -sfv $PWD/.bashrc ~/.bashrc

‎Dockerfile.aarch64‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ RUN useradd --create-home --gid docker unprivilegeduser
151151

152152
VOLUME /var/lib/docker
153153
WORKDIR /go/src/github.com/docker/docker
154-
ENV DOCKER_BUILDTAGS apparmor seccomp selinux
154+
ENV DOCKER_BUILDTAGS apparmor pkcs11 seccomp selinux
155155

156156
# Let us use a .bashrc file
157157
RUN ln -sfv $PWD/.bashrc ~/.bashrc

‎Dockerfile.armhf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ RUN useradd --create-home --gid docker unprivilegeduser
162162

163163
VOLUME /var/lib/docker
164164
WORKDIR /go/src/github.com/docker/docker
165-
ENV DOCKER_BUILDTAGS apparmor seccomp selinux
165+
ENV DOCKER_BUILDTAGS apparmor pkcs11 seccomp selinux
166166

167167
# Let us use a .bashrc file
168168
RUN ln -sfv $PWD/.bashrc ~/.bashrc

‎Dockerfile.ppc64le‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ RUN useradd --create-home --gid docker unprivilegeduser
154154

155155
VOLUME /var/lib/docker
156156
WORKDIR /go/src/github.com/docker/docker
157-
ENV DOCKER_BUILDTAGS apparmor selinux
157+
ENV DOCKER_BUILDTAGS apparmor pkcs11 selinux
158158

159159
# Let us use a .bashrc file
160160
RUN ln -sfv $PWD/.bashrc ~/.bashrc

‎Dockerfile.s390x‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ RUN useradd --create-home --gid docker unprivilegeduser
133133

134134
VOLUME /var/lib/docker
135135
WORKDIR /go/src/github.com/docker/docker
136-
ENV DOCKER_BUILDTAGS apparmor selinux
136+
ENV DOCKER_BUILDTAGS apparmor pkcs11 selinux
137137

138138
# Let us use a .bashrc file
139139
RUN ln -sfv $PWD/.bashrc ~/.bashrc

‎hack/make.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ fi
113113
if [ "$DOCKER_EXPERIMENTAL" ]; then
114114
echo >&2 '# WARNING! DOCKER_EXPERIMENTAL is set: building experimental features'
115115
echo >&2
116-
DOCKER_BUILDTAGS+=" experimental pkcs11"
116+
DOCKER_BUILDTAGS+=" experimental"
117117
fi
118118

119119
if [ -z "$DOCKER_CLIENTONLY" ]; then

‎hack/make/.build-deb/rules‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ VERSION = $(shell cat VERSION)
55
override_dh_gencontrol:
66
# if we're on Ubuntu, we need to Recommends: apparmor
77
echo 'apparmor:Recommends=$(shell dpkg-vendor --is Ubuntu && echo apparmor)' >> debian/docker-engine.substvars
8-
# if we are building experimental we recommend yubico-piv-tool
9-
echo 'yubico:Recommends=$(shell [ "$DOCKER_EXPERIMENTAL" ] && echo "yubico-piv-tool (>= 1.1.0~)")' >> debian/docker-engine.substvars
8+
# recommend yubico-piv-tool since we include pkcs11 by default
9+
echo 'yubico:Recommends="yubico-piv-tool (>= 1.1.0~)"' >> debian/docker-engine.substvars
1010
dh_gencontrol
1111

1212
override_dh_auto_build:

‎hack/make/.build-rpm/docker-engine.spec‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,10 @@ Requires: device-mapper >= 1.02.90-2
6060
%global with_selinux 1
6161
%endif
6262

63-
%if 0%{?_experimental}
64-
# yubico-piv-tool conditional
63+
# yubico-piv-tool recommends
6564
%if 0%{?fedora} >= 20 || 0%{?centos} >= 7 || 0%{?rhel} >= 7
6665
Requires: yubico-piv-tool >= 1.1.0
6766
%endif
68-
%endif
6967

7068
# start if with_selinux
7169
%if 0%{?with_selinux}

‎hack/make/binary‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ if [ "$(go env GOOS)" == "linux" ] ; then
3636
esac
3737
fi
3838

39-
if [ "$IAMSTATIC" == "true" ] && [ "$(go env GOHOSTOS)" == "linux" ] && [ "$DOCKER_EXPERIMENTAL" ]; then
39+
if [ "$IAMSTATIC" == "true" ] && [ "$(go env GOHOSTOS)" == "linux" ]; then
4040
if [ "${GOOS}/${GOARCH}" == "darwin/amd64" ]; then
4141
export CGO_ENABLED=1
4242
export CC=o64-clang

‎project/PACKAGERS.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ To build the Docker daemon, you will additionally need:
6060
* btrfs-progs version 3.16.1 or later (unless using an older version is
6161
absolutely necessary, in which case 3.8 is the minimum)
6262
* libseccomp version 2.2.1 or later (for build tag seccomp)
63-
* yubico-piv-tool version 1.1.0 or later (for experimental)
63+
* yubico-piv-tool version 1.1.0 or later
6464

6565
Be sure to also check out Docker's Dockerfile for the most up-to-date list of
6666
these build-time dependencies.

0 commit comments

Comments
 (0)