Remove amd64 assumption in release.sh, cross and tgz scripts
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
(cherry picked from commit 61335bcb03
)
Signed-off-by: Victor Vieux <vieux@docker.com>
This commit is contained in:
parent
1767966502
commit
5d04e28d9e
3 changed files with 7 additions and 5 deletions
|
@ -10,13 +10,14 @@ daemonSupporting=(
|
|||
|
||||
# if we have our linux/amd64 version compiled, let's symlink it in
|
||||
if [ -x "$DEST/../binary-daemon/dockerd-$VERSION" ]; then
|
||||
mkdir -p "$DEST/linux/amd64"
|
||||
arch=$(go env GOHOSTARCH)
|
||||
mkdir -p "$DEST/linux/${arch}"
|
||||
(
|
||||
cd "$DEST/linux/amd64"
|
||||
cd "$DEST/linux/${arch}"
|
||||
ln -s ../../../binary-daemon/* ./
|
||||
ln -s ../../../binary-client/* ./
|
||||
)
|
||||
echo "Created symlinks:" "$DEST/linux/amd64/"*
|
||||
echo "Created symlinks:" "$DEST/linux/${arch}/"*
|
||||
fi
|
||||
|
||||
for platform in $DOCKER_CROSSPLATFORMS; do
|
||||
|
|
|
@ -4,7 +4,8 @@ CROSS="$DEST/../cross"
|
|||
|
||||
set -e
|
||||
|
||||
if [ ! -d "$CROSS/linux/amd64" ]; then
|
||||
arch=$(go env GOHOSTARCH)
|
||||
if [ ! -d "$CROSS/linux/${arch}" ]; then
|
||||
echo >&2 'error: binary and cross must be run before tgz'
|
||||
false
|
||||
fi
|
||||
|
|
|
@ -258,7 +258,7 @@ release_build() {
|
|||
|
||||
# Upload binaries and tgz files to S3
|
||||
release_binaries() {
|
||||
[ -e "bundles/$VERSION/cross/linux/amd64/docker-$VERSION" ] || {
|
||||
[ "$(find bundles/$VERSION -path "bundles/$VERSION/cross/*/*/docker-$VERSION")" != "" ] || {
|
||||
echo >&2 './hack/make.sh must be run before release_binaries'
|
||||
exit 1
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue