From a2f73a7d35933b3ae8a08740f12dc9e356b0d80a Mon Sep 17 00:00:00 2001 From: Jakob Borg Date: Sun, 9 Aug 2015 14:40:18 +0200 Subject: [PATCH] Allow specifying Docker image to use for building --- build.sh | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/build.sh b/build.sh index 2401476fc..0ca2c0691 100755 --- a/build.sh +++ b/build.sh @@ -123,11 +123,12 @@ case "${1:-default}" in ;; docker-all) + img=${DOCKERIMG:-syncthing/build:latest} docker run --rm -h syncthing-builder -u $(id -u) -t \ -v $(pwd):/go/src/github.com/syncthing/syncthing \ -w /go/src/github.com/syncthing/syncthing \ -e "STTRACE=$STTRACE" \ - syncthing/build:latest \ + "$img" \ sh -c './build.sh clean \ && ./build.sh test-cov \ && ./build.sh bench \ @@ -135,11 +136,12 @@ case "${1:-default}" in ;; docker-test) + img=${DOCKERIMG:-syncthing/build:latest} docker run --rm -h syncthing-builder -u $(id -u) -t \ -v $(pwd):/go/src/github.com/syncthing/syncthing \ -w /go/src/github.com/syncthing/syncthing \ -e "STTRACE=$STTRACE" \ - syncthing/build:latest \ + "$img" \ sh -euxc './build.sh clean \ && go run build.go -race \ && export GOPATH=$(pwd)/Godeps/_workspace:$GOPATH \ @@ -149,21 +151,23 @@ case "${1:-default}" in ;; docker-lint) + img=${DOCKERIMG:-syncthing/build:latest} docker run --rm -h syncthing-builder -u $(id -u) -t \ -v $(pwd):/go/src/github.com/syncthing/syncthing \ -w /go/src/github.com/syncthing/syncthing \ -e "STTRACE=$STTRACE" \ - syncthing/build:latest \ + "$img" \ sh -euxc 'go run build.go lint' ;; docker-vet) + img=${DOCKERIMG:-syncthing/build:latest} docker run --rm -h syncthing-builder -u $(id -u) -t \ -v $(pwd):/go/src/github.com/syncthing/syncthing \ -w /go/src/github.com/syncthing/syncthing \ -e "STTRACE=$STTRACE" \ - syncthing/build:latest \ + "$img" \ sh -euxc 'go run build.go vet' ;;