From 44ff21698580052d037f7b84ef76b7a94567d012 Mon Sep 17 00:00:00 2001 From: Tibor Vass Date: Sat, 23 Apr 2016 18:26:05 -0400 Subject: [PATCH] Add dockerd daemon binary to tgz and zip archives Signed-off-by: Tibor Vass --- hack/make/tgz | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hack/make/tgz b/hack/make/tgz index 40aa0101ef..9145f5d127 100644 --- a/hack/make/tgz +++ b/hack/make/tgz @@ -14,6 +14,7 @@ for d in "$CROSS/"*/*; do export GOARCH="$(basename "$d")" export GOOS="$(basename "$(dirname "$d")")" BINARY_NAME="docker-$VERSION" + DAEMON_BINARY_NAME="dockerd-$VERSION" BINARY_EXTENSION="$(export GOOS && binary_extension)" if [ "$GOOS" = 'windows' ]; then # if windows use a zip, not tgz @@ -24,6 +25,7 @@ for d in "$CROSS/"*/*; do IS_TAR="true" fi BINARY_FULLNAME="$BINARY_NAME$BINARY_EXTENSION" + DAEMON_BINARY_FULLNAME="$DAEMON_BINARY_NAME$BINARY_EXTENSION" mkdir -p "$DEST/$GOOS/$GOARCH" TGZ="$DEST/$GOOS/$GOARCH/$BINARY_NAME$BUNDLE_EXTENSION" @@ -39,6 +41,9 @@ for d in "$CROSS/"*/*; do # Copy the correct docker binary mkdir -p $TAR_PATH cp -L "$d/$BINARY_FULLNAME" "$TAR_PATH/docker$BINARY_EXTENSION" + if [ -f "$d/$DAEMON_BINARY_FULLNAME" ]; then + cp -L "$d/$DAEMON_BINARY_FULLNAME" "$TAR_PATH/dockerd$BINARY_EXTENSION" + fi # copy over all the containerd binaries copy_containerd $TAR_PATH