Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
(cherry picked from commit 61335bcb03ac60385bc19b6e1346b34cd168f7de)
Signed-off-by: Victor Vieux <vieux@docker.com>
... | ... |
@@ -10,13 +10,14 @@ daemonSupporting=( |
10 | 10 |
|
11 | 11 |
# if we have our linux/amd64 version compiled, let's symlink it in |
12 | 12 |
if [ -x "$DEST/../binary-daemon/dockerd-$VERSION" ]; then |
13 |
- mkdir -p "$DEST/linux/amd64" |
|
13 |
+ arch=$(go env GOHOSTARCH) |
|
14 |
+ mkdir -p "$DEST/linux/${arch}" |
|
14 | 15 |
( |
15 |
- cd "$DEST/linux/amd64" |
|
16 |
+ cd "$DEST/linux/${arch}" |
|
16 | 17 |
ln -s ../../../binary-daemon/* ./ |
17 | 18 |
ln -s ../../../binary-client/* ./ |
18 | 19 |
) |
19 |
- echo "Created symlinks:" "$DEST/linux/amd64/"* |
|
20 |
+ echo "Created symlinks:" "$DEST/linux/${arch}/"* |
|
20 | 21 |
fi |
21 | 22 |
|
22 | 23 |
for platform in $DOCKER_CROSSPLATFORMS; do |
... | ... |
@@ -258,7 +258,7 @@ release_build() { |
258 | 258 |
|
259 | 259 |
# Upload binaries and tgz files to S3 |
260 | 260 |
release_binaries() { |
261 |
- [ -e "bundles/$VERSION/cross/linux/amd64/docker-$VERSION" ] || { |
|
261 |
+ [ "$(find bundles/$VERSION -path "bundles/$VERSION/cross/*/*/docker-$VERSION")" != "" ] || { |
|
262 | 262 |
echo >&2 './hack/make.sh must be run before release_binaries' |
263 | 263 |
exit 1 |
264 | 264 |
} |