aboutsummaryrefslogtreecommitdiff
path: root/build.sh
diff options
context:
space:
mode:
authorJakob Borg <jakob@nym.se>2015-02-11 10:17:15 +0100
committerJakob Borg <jakob@nym.se>2015-02-11 10:17:15 +0100
commit35d3af50398ec293a4783bf9bb000a6b9c85fca8 (patch)
tree86dfc25576e992ad929752b106e5d1730ea15ab3 /build.sh
parent57e8cd6eab680bcda6bc3b772297f35467165c73 (diff)
downloadsyncthing-35d3af50398ec293a4783bf9bb000a6b9c85fca8.tar.gz
syncthing-35d3af50398ec293a4783bf9bb000a6b9c85fca8.zip
Use syncthing/build:latest for building
Diffstat (limited to 'build.sh')
-rwxr-xr-xbuild.sh9
1 files changed, 2 insertions, 7 deletions
diff --git a/build.sh b/build.sh
index aaaea87c0..b4a79fe28 100755
--- a/build.sh
+++ b/build.sh
@@ -2,7 +2,6 @@
set -euo pipefail
IFS=$'\n\t'
-DOCKERIMGV=1.4.1-1
STTRACE=${STTRACE:-}
case "${1:-default}" in
@@ -103,16 +102,12 @@ case "${1:-default}" in
fi
;;
- docker-init)
- docker build -q -t syncthing/build:$DOCKERIMGV docker
- ;;
-
docker-all)
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:$DOCKERIMGV \
+ syncthing/build:latest \
sh -c './build.sh clean \
&& go vet ./cmd/... ./internal/... \
&& ( golint ./cmd/... ; golint ./internal/... ) | egrep -v "comment on exported|should have comment" \
@@ -125,7 +120,7 @@ case "${1:-default}" in
-v $(pwd):/go/src/github.com/syncthing/syncthing \
-w /go/src/github.com/syncthing/syncthing \
-e "STTRACE=$STTRACE" \
- syncthing/build:$DOCKERIMGV \
+ syncthing/build:latest \
sh -euxc './build.sh clean \
&& go run build.go -race \
&& export GOPATH=$(pwd)/Godeps/_workspace:$GOPATH \