Signed-off-by: Tibor Vass <tibor@docker.com>
| ... | ... |
@@ -14,6 +14,7 @@ for d in "$CROSS/"*/*; do |
| 14 | 14 |
export GOARCH="$(basename "$d")" |
| 15 | 15 |
export GOOS="$(basename "$(dirname "$d")")" |
| 16 | 16 |
BINARY_NAME="docker-$VERSION" |
| 17 |
+ DAEMON_BINARY_NAME="dockerd-$VERSION" |
|
| 17 | 18 |
BINARY_EXTENSION="$(export GOOS && binary_extension)" |
| 18 | 19 |
if [ "$GOOS" = 'windows' ]; then |
| 19 | 20 |
# if windows use a zip, not tgz |
| ... | ... |
@@ -24,6 +25,7 @@ for d in "$CROSS/"*/*; do |
| 24 | 24 |
IS_TAR="true" |
| 25 | 25 |
fi |
| 26 | 26 |
BINARY_FULLNAME="$BINARY_NAME$BINARY_EXTENSION" |
| 27 |
+ DAEMON_BINARY_FULLNAME="$DAEMON_BINARY_NAME$BINARY_EXTENSION" |
|
| 27 | 28 |
mkdir -p "$DEST/$GOOS/$GOARCH" |
| 28 | 29 |
TGZ="$DEST/$GOOS/$GOARCH/$BINARY_NAME$BUNDLE_EXTENSION" |
| 29 | 30 |
|
| ... | ... |
@@ -39,6 +41,9 @@ for d in "$CROSS/"*/*; do |
| 39 | 39 |
# Copy the correct docker binary |
| 40 | 40 |
mkdir -p $TAR_PATH |
| 41 | 41 |
cp -L "$d/$BINARY_FULLNAME" "$TAR_PATH/docker$BINARY_EXTENSION" |
| 42 |
+ if [ -f "$d/$DAEMON_BINARY_FULLNAME" ]; then |
|
| 43 |
+ cp -L "$d/$DAEMON_BINARY_FULLNAME" "$TAR_PATH/dockerd$BINARY_EXTENSION" |
|
| 44 |
+ fi |
|
| 42 | 45 |
|
| 43 | 46 |
# copy over all the containerd binaries |
| 44 | 47 |
copy_containerd $TAR_PATH |