kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

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

Browse source 
Move hardware signing out of experimental
This commit is contained in:
Tibor Vass 2016-03-17 14:16:40 -04:00
commit e6d3a9849c
10 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Dockerfile
View file

@ -205,7 +205,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 seccomp selinux ENV DOCKER_BUILDTAGS apparmor pkcs11 seccomp selinux
# Let us use a .bashrc file # Let us use a .bashrc file
RUN ln -sfv $PWD/.bashrc ~/.bashrc RUN ln -sfv $PWD/.bashrc ~/.bashrc

2
Dockerfile.aarch64
View file

@ -151,7 +151,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 seccomp selinux ENV DOCKER_BUILDTAGS apparmor pkcs11 seccomp selinux
# Let us use a .bashrc file # Let us use a .bashrc file
RUN ln -sfv $PWD/.bashrc ~/.bashrc RUN ln -sfv $PWD/.bashrc ~/.bashrc

2
Dockerfile.armhf
View file

@ -162,7 +162,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 seccomp selinux ENV DOCKER_BUILDTAGS apparmor pkcs11 seccomp selinux
# Let us use a .bashrc file # Let us use a .bashrc file
RUN ln -sfv $PWD/.bashrc ~/.bashrc RUN ln -sfv $PWD/.bashrc ~/.bashrc

2
Dockerfile.ppc64le
View file

@ -154,7 +154,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 selinux ENV DOCKER_BUILDTAGS apparmor pkcs11 selinux
# Let us use a .bashrc file # Let us use a .bashrc file
RUN ln -sfv $PWD/.bashrc ~/.bashrc RUN ln -sfv $PWD/.bashrc ~/.bashrc

2
Dockerfile.s390x
View file

@ -133,7 +133,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 selinux ENV DOCKER_BUILDTAGS apparmor pkcs11 selinux
# Let us use a .bashrc file # Let us use a .bashrc file
RUN ln -sfv $PWD/.bashrc ~/.bashrc RUN ln -sfv $PWD/.bashrc ~/.bashrc

2
hack/make.sh
View file

@ -113,7 +113,7 @@ fi
if [ "$DOCKER_EXPERIMENTAL" ]; then if [ "$DOCKER_EXPERIMENTAL" ]; then
echo >&2 '# WARNING! DOCKER_EXPERIMENTAL is set: building experimental features' echo >&2 '# WARNING! DOCKER_EXPERIMENTAL is set: building experimental features'
echo >&2 echo >&2
DOCKER_BUILDTAGS+=" experimental pkcs11" DOCKER_BUILDTAGS+=" experimental"
fi fi
if [ -z "$DOCKER_CLIENTONLY" ]; then if [ -z "$DOCKER_CLIENTONLY" ]; then

4
hack/make/.build-deb/rules
View file

@ -5,8 +5,8 @@ VERSION = $(shell cat VERSION)
override_dh_gencontrol: 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
# if we are building experimental we recommend yubico-piv-tool # recommend yubico-piv-tool since we include pkcs11 by default
echo 'yubico:Recommends=$(shell [ "$DOCKER_EXPERIMENTAL" ] && 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:

4
hack/make/.build-rpm/docker-engine.spec
View file

@ -60,12 +60,10 @@ Requires: device-mapper >= 1.02.90-2
%global with_selinux 1 %global with_selinux 1
%endif %endif
%if 0%{?_experimental} # yubico-piv-tool recommends
# yubico-piv-tool conditional
%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
%endif
# start if with_selinux # start if with_selinux
%if 0%{?with_selinux} %if 0%{?with_selinux}

2
hack/make/binary
View file

@ -36,7 +36,7 @@ if [ "$(go env GOOS)" == "linux" ] ; then
esac esac
fi fi
if [ "$IAMSTATIC" == "true" ] && [ "$(go env GOHOSTOS)" == "linux" ] && [ "$DOCKER_EXPERIMENTAL" ]; then if [ "$IAMSTATIC" == "true" ] && [ "$(go env GOHOSTOS)" == "linux" ]; then
if [ "${GOOS}/${GOARCH}" == "darwin/amd64" ]; then if [ "${GOOS}/${GOARCH}" == "darwin/amd64" ]; then
export CGO_ENABLED=1 export CGO_ENABLED=1
export CC=o64-clang export CC=o64-clang

2
project/PACKAGERS.md
View file

@ -60,7 +60,7 @@ To build the Docker daemon, you will additionally need:
* btrfs-progs version 3.16.1 or later (unless using an older version is * btrfs-progs version 3.16.1 or later (unless using an older version is
absolutely necessary, in which case 3.8 is the minimum) absolutely necessary, in which case 3.8 is the minimum)
* libseccomp version 2.2.1 or later (for build tag seccomp) * libseccomp version 2.2.1 or later (for build tag seccomp)
* yubico-piv-tool version 1.1.0 or later (for experimental) * yubico-piv-tool version 1.1.0 or later
Be sure to also check out Docker's Dockerfile for the most up-to-date list of Be sure to also check out Docker's Dockerfile for the most up-to-date list of
these build-time dependencies. these build-time dependencies.