From 50be9d2a4d2e022c1efa20b2ed46f1f93c126140 Mon Sep 17 00:00:00 2001 From: Evan Hazlett Date: Fri, 27 Mar 2015 07:38:35 -0700 Subject: [PATCH 1/4] adds md5 and sha256 for binaries on release Signed-off-by: Evan Hazlett --- script/release | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/script/release b/script/release index c7d53d488d..9b0746e53d 100755 --- a/script/release +++ b/script/release @@ -11,6 +11,12 @@ if [ -z "$GITHUB_TOKEN" ]; then fi script/build + +for BINARY in docker-machine_*; do + sha256sum $BINARY > $BINARY.sha256 + md5sum $BINARY >> $BINARY.md5 +done + git tag $VERSION git push --tags docker run --rm -e GITHUB_TOKEN docker-machine github-release release \ From d121c4d742b9ecb1c5a1010862bd1094bedfff0e Mon Sep 17 00:00:00 2001 From: Evan Hazlett Date: Mon, 30 Mar 2015 12:42:36 -0400 Subject: [PATCH 2/4] run sum generation in container Signed-off-by: Evan Hazlett --- script/build | 4 +++- script/generate-sums | 8 ++++++++ script/release | 5 ----- 3 files changed, 11 insertions(+), 6 deletions(-) create mode 100755 script/generate-sums diff --git a/script/build b/script/build index bb4b44071d..f5a4e218dc 100755 --- a/script/build +++ b/script/build @@ -15,4 +15,6 @@ fi docker build -t docker-machine . rm -f docker-machine* -exec docker run --rm -v `pwd`:/go/src/github.com/docker/machine docker-machine gox "${OS_PLATFORM_ARG[@]}" "${OS_ARCH_ARG[@]}" -output="docker-machine_{{.OS}}-{{.Arch}}" -ldflags="-w -X github.com/docker/machine/version.GITCOMMIT `git rev-parse --short HEAD`" +docker run --rm -v `pwd`:/go/src/github.com/docker/machine docker-machine gox "${OS_PLATFORM_ARG[@]}" "${OS_ARCH_ARG[@]}" -output="docker-machine_{{.OS}}-{{.Arch}}" -ldflags="-w -X github.com/docker/machine/version.GITCOMMIT `git rev-parse --short HEAD`" + +exec docker run --rm -v `pwd`:/go/src/github.com/docker/machine docker-machine ./script/generate-sums diff --git a/script/generate-sums b/script/generate-sums new file mode 100755 index 0000000000..51361e05d9 --- /dev/null +++ b/script/generate-sums @@ -0,0 +1,8 @@ +#!/bin/bash +set -e + +for BINARY in docker-machine_*; do + sha256sum $BINARY > $BINARY.sha256 + md5sum $BINARY >> $BINARY.md5 +done + diff --git a/script/release b/script/release index 9b0746e53d..c12ff5e7fb 100755 --- a/script/release +++ b/script/release @@ -12,11 +12,6 @@ fi script/build -for BINARY in docker-machine_*; do - sha256sum $BINARY > $BINARY.sha256 - md5sum $BINARY >> $BINARY.md5 -done - git tag $VERSION git push --tags docker run --rm -e GITHUB_TOKEN docker-machine github-release release \ From d32f30b14e98a721f4ef2284e2017d5f43ec5a0e Mon Sep 17 00:00:00 2001 From: Evan Hazlett Date: Mon, 30 Mar 2015 13:11:33 -0400 Subject: [PATCH 3/4] run the sum generation in the release script instead of build Signed-off-by: Evan Hazlett --- script/build | 2 -- script/release | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/script/build b/script/build index f5a4e218dc..56fd71782d 100755 --- a/script/build +++ b/script/build @@ -16,5 +16,3 @@ fi docker build -t docker-machine . rm -f docker-machine* docker run --rm -v `pwd`:/go/src/github.com/docker/machine docker-machine gox "${OS_PLATFORM_ARG[@]}" "${OS_ARCH_ARG[@]}" -output="docker-machine_{{.OS}}-{{.Arch}}" -ldflags="-w -X github.com/docker/machine/version.GITCOMMIT `git rev-parse --short HEAD`" - -exec docker run --rm -v `pwd`:/go/src/github.com/docker/machine docker-machine ./script/generate-sums diff --git a/script/release b/script/release index c12ff5e7fb..87e67d7cd6 100755 --- a/script/release +++ b/script/release @@ -31,3 +31,4 @@ for BINARY in docker-machine_*; do --file $BINARY done +docker run --rm -v `pwd`:/go/src/github.com/docker/machine docker-machine ./script/generate-sums From 6c8661f16f39b098307999fab37c73e1febacc9d Mon Sep 17 00:00:00 2001 From: Evan Hazlett Date: Mon, 30 Mar 2015 13:48:14 -0400 Subject: [PATCH 4/4] run sum generation before uploading Signed-off-by: Evan Hazlett --- script/release | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/script/release b/script/release index 87e67d7cd6..30c282ee84 100755 --- a/script/release +++ b/script/release @@ -12,6 +12,8 @@ fi script/build +docker run --rm -v `pwd`:/go/src/github.com/docker/machine docker-machine ./script/generate-sums + git tag $VERSION git push --tags docker run --rm -e GITHUB_TOKEN docker-machine github-release release \ @@ -30,5 +32,3 @@ for BINARY in docker-machine_*; do --name $BINARY \ --file $BINARY done - -docker run --rm -v `pwd`:/go/src/github.com/docker/machine docker-machine ./script/generate-sums