From 2655bf875555182278fba07181bf3dd10d95cbff Mon Sep 17 00:00:00 2001 From: Ethan Buchman Date: Fri, 2 Jun 2017 12:37:51 -0400 Subject: [PATCH] dist: dont mkdir in container --- scripts/dist.sh | 5 +++++ scripts/dist_build.sh | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/dist.sh b/scripts/dist.sh index 977b36ae2f3..f96d6454f98 100755 --- a/scripts/dist.sh +++ b/scripts/dist.sh @@ -21,6 +21,11 @@ DIR="$( cd -P "$( dirname "$SOURCE" )/.." && pwd )" # Change into that dir because we expect that. cd "$DIR" +# Delete the old dir +echo "==> Removing old directory..." +rm -rf build/pkg +mkdir -p build/pkg + # Do a hermetic build inside a Docker container. docker build -t tendermint/${REPO_NAME}-builder scripts/${REPO_NAME}-builder/ docker run --rm -e "BUILD_TAGS=$BUILD_TAGS" -v "$(pwd)":/go/src/github.com/tendermint/${REPO_NAME} tendermint/${REPO_NAME}-builder ./scripts/dist_build.sh diff --git a/scripts/dist_build.sh b/scripts/dist_build.sh index 2812bef8aef..f1566c8997f 100755 --- a/scripts/dist_build.sh +++ b/scripts/dist_build.sh @@ -18,11 +18,6 @@ GIT_IMPORT="github.com/tendermint/basecoin/version" XC_ARCH=${XC_ARCH:-"386 amd64 arm"} XC_OS=${XC_OS:-"solaris darwin freebsd linux windows"} -# Delete the old dir -echo "==> Removing old directory..." -rm -rf build/pkg -mkdir -p build/pkg - # Make sure build tools are available. make tools