From 78988282f76cb028a7b246c9f54c7342628cd13e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Gill=C3=A9?= Date: Mon, 24 Jun 2019 11:14:53 -0700 Subject: [PATCH] [script] make docker image build script directory-independent --- docker/client/build.sh | 4 +++- docker/mint/build.sh | 4 +++- docker/validator/build.sh | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/docker/client/build.sh b/docker/client/build.sh index da9da850239c..9db25039495e 100755 --- a/docker/client/build.sh +++ b/docker/client/build.sh @@ -1,9 +1,11 @@ #!/bin/sh set -e +DIR="$( cd "$( dirname "$0" )" && pwd )" + PROXY="" if [ "$https_proxy" ]; then PROXY=" --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy" fi -docker build -f docker/client/client.Dockerfile . --tag libra_client --build-arg GIT_REV="$(git rev-parse HEAD)" --build-arg GIT_UPSTREAM="$(git merge-base HEAD origin/master)" --build-arg BUILD_DATE="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" $PROXY +docker build -f $DIR/client.Dockerfile $DIR/../.. --tag libra_client --build-arg GIT_REV="$(git rev-parse HEAD)" --build-arg GIT_UPSTREAM="$(git merge-base HEAD origin/master)" --build-arg BUILD_DATE="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" $PROXY diff --git a/docker/mint/build.sh b/docker/mint/build.sh index a86567c10932..ed6cd04f8aa7 100755 --- a/docker/mint/build.sh +++ b/docker/mint/build.sh @@ -1,9 +1,11 @@ #!/bin/sh set -e +DIR="$( cd "$( dirname "$0" )" && pwd )" + PROXY="" if [ "$https_proxy" ]; then PROXY=" --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy" fi -docker build -f docker/mint/mint.Dockerfile . --tag libra_mint --build-arg GIT_REV=$(git rev-parse HEAD) --build-arg GIT_UPSTREAM=$(git merge-base --fork-point origin/master) --build-arg BUILD_DATE="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" $PROXY +docker build -f $DIR/mint.Dockerfile $DIR/../.. --tag libra_mint --build-arg GIT_REV=$(git rev-parse HEAD) --build-arg GIT_UPSTREAM=$(git merge-base --fork-point origin/master) --build-arg BUILD_DATE="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" $PROXY diff --git a/docker/validator/build.sh b/docker/validator/build.sh index 48a7ea1bc901..f165edbddba9 100755 --- a/docker/validator/build.sh +++ b/docker/validator/build.sh @@ -1,9 +1,11 @@ #!/bin/sh set -e +DIR="$( cd "$( dirname "$0" )" && pwd )" + PROXY="" if [ "$https_proxy" ]; then PROXY=" --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy" fi -docker build -f docker/validator/validator.Dockerfile . --tag libra_e2e --build-arg GIT_REV="$(git rev-parse HEAD)" --build-arg GIT_UPSTREAM="$(git merge-base HEAD origin/master)" --build-arg BUILD_DATE="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" $PROXY +docker build -f $DIR/validator.Dockerfile $DIR/../.. --tag libra_e2e --build-arg GIT_REV="$(git rev-parse HEAD)" --build-arg GIT_UPSTREAM="$(git merge-base HEAD origin/master)" --build-arg BUILD_DATE="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" $PROXY