kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

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:
Kenfe-Mickael Laventure 2016-10-03 15:20:51 -07:00 committed by Victor Vieux
parent 1767966502
commit 5d04e28d9e
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hack/make/cross
View File

@ -10,13 +10,14 @@ daemonSupporting=(
# if we have our linux/amd64 version compiled, let's symlink it in # if we have our linux/amd64 version compiled, let's symlink it in
if [ -x "$DEST/../binary-daemon/dockerd-$VERSION" ]; then 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-daemon/* ./
ln -s ../../../binary-client/* ./ ln -s ../../../binary-client/* ./
) )
echo "Created symlinks:" "$DEST/linux/amd64/"* echo "Created symlinks:" "$DEST/linux/${arch}/"*
fi fi
for platform in $DOCKER_CROSSPLATFORMS; do for platform in $DOCKER_CROSSPLATFORMS; do

3
hack/make/tgz
View File

@ -4,7 +4,8 @@ CROSS="$DEST/../cross"
set -e 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' echo >&2 'error: binary and cross must be run before tgz'
false false
fi fi

2
hack/release.sh
View File

@ -258,7 +258,7 @@ release_build() {
# Upload binaries and tgz files to S3 # Upload binaries and tgz files to S3
release_binaries() { 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' echo >&2 './hack/make.sh must be run before release_binaries'
exit 1 exit 1
} }