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

add buildtag pkcs11 to experimental

Browse source 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
This commit is contained in:
Jessica Frazelle 2015-10-30 18:14:10 -07:00
parent 94ea6af8cd
commit 141369457f
No known key found for this signature in database
GPG key ID: 18F3685C0022BFF3
3 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Dockerfile
View file

@ -45,6 +45,7 @@ RUN apt-get update && apt-get install -y \
iptables \ iptables \
libapparmor-dev \ libapparmor-dev \
libcap-dev \ libcap-dev \
libltdl-dev \
libsqlite3-dev \ libsqlite3-dev \
libsystemd-journal-dev \ libsystemd-journal-dev \
mercurial \ mercurial \

2
hack/make.sh
View file

@ -98,7 +98,7 @@ fi
if [ "$DOCKER_EXPERIMENTAL" ] || [ "$DOCKER_REMAP_ROOT" ]; then if [ "$DOCKER_EXPERIMENTAL" ] || [ "$DOCKER_REMAP_ROOT" ]; 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" DOCKER_BUILDTAGS+=" experimental pkcs11"
fi fi
if [ -z "$DOCKER_CLIENTONLY" ]; then if [ -z "$DOCKER_CLIENTONLY" ]; then

4
hack/make/binary
View file

@ -25,6 +25,10 @@ if [ "$(go env GOHOSTOS)/$(go env GOHOSTARCH)" == "windows/amd64" ] && [ "$(go e
export LDFLAGS_STATIC_DOCKER="$LDFLAGS_STATIC_DOCKER -linkmode=internal" export LDFLAGS_STATIC_DOCKER="$LDFLAGS_STATIC_DOCKER -linkmode=internal"
fi fi
if [ "$IAMSTATIC" == "true" ]; then
export BUILDFLAGS=( "${BUILDFLAGS[@]/pkcs11 /}" ) # we cannot dlopen in pkcs11 in a static binary
fi
echo "Building: $DEST/$BINARY_FULLNAME" echo "Building: $DEST/$BINARY_FULLNAME"
go build \ go build \
-o "$DEST/$BINARY_FULLNAME" \ -o "$DEST/$BINARY_FULLNAME" \