From 3d9e51f06521689924b035c9847b40bf56fcf251 Mon Sep 17 00:00:00 2001 From: Christoph Hartmann Date: Wed, 4 May 2016 13:47:03 +0200 Subject: [PATCH 1/2] use go 1.6.2 for docker go build --- go-docker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go-docker b/go-docker index 3a77764d..42c60129 100755 --- a/go-docker +++ b/go-docker @@ -23,4 +23,4 @@ for VAR in ${DOCKER_LINKS//,/ }; do done echo "running with docker, might take a while to pull the image..." -docker run $LINKS_STR $ENV_STR --rm -v `pwd`:/go/src/$REPO -w /go/src/$REPO quay.io/coreos/dex-builder:1.4 $@ +docker run $LINKS_STR $ENV_STR --rm -v `pwd`:/go/src/$REPO -w /go/src/$REPO -t golang:1.6.2 $@ From 58b908ff9ac300723289c6c045e1bf024c046344 Mon Sep 17 00:00:00 2001 From: Christoph Hartmann Date: Wed, 4 May 2016 20:20:14 +0200 Subject: [PATCH 2/2] remove dockerfile-builder --- Dockerfile-builder | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 Dockerfile-builder diff --git a/Dockerfile-builder b/Dockerfile-builder deleted file mode 100644 index 3ca1303c..00000000 --- a/Dockerfile-builder +++ /dev/null @@ -1,5 +0,0 @@ -FROM golang:1.6 - -RUN go get golang.org/x/tools/cmd/cover -RUN go get golang.org/x/tools/cmd/vet -RUN go get github.com/tools/godep