From 1ccdda88aad85a30d2dea01424ee145933e437fa Mon Sep 17 00:00:00 2001 From: Jason Wilder Date: Tue, 25 Oct 2016 20:16:58 -0600 Subject: [PATCH] Use go1.7.3 --- DOCKER.md | 4 ++-- Dockerfile_build_ubuntu32 | 2 +- Dockerfile_build_ubuntu64 | 2 +- Dockerfile_build_ubuntu64_git | 2 +- build-docker.sh | 2 +- circle.yml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/DOCKER.md b/DOCKER.md index 6fa2196b8b..afd57a5b08 100644 --- a/DOCKER.md +++ b/DOCKER.md @@ -11,12 +11,12 @@ To build a docker image for InfluxDB from your current checkout, run the followi $ ./build-docker.sh ``` -This script uses the `golang:1.7.1` image to build a fully static binary of `influxd` and then adds it to a minimal `scratch` image. +This script uses the `golang:1.7.3` image to build a fully static binary of `influxd` and then adds it to a minimal `scratch` image. To build the image using a different version of go: ``` -$ GO_VER=1.7.1 ./build-docker.sh +$ GO_VER=1.7.3 ./build-docker.sh ``` Available version can be found [here](https://hub.docker.com/_/golang/). diff --git a/Dockerfile_build_ubuntu32 b/Dockerfile_build_ubuntu32 index 0588977969..c3ba4f37ff 100644 --- a/Dockerfile_build_ubuntu32 +++ b/Dockerfile_build_ubuntu32 @@ -18,7 +18,7 @@ RUN gem install fpm # Install go ENV GOPATH /root/go -ENV GO_VERSION 1.7.1 +ENV GO_VERSION 1.7.3 ENV GO_ARCH 386 RUN wget https://storage.googleapis.com/golang/go${GO_VERSION}.linux-${GO_ARCH}.tar.gz; \ tar -C /usr/local/ -xf /go${GO_VERSION}.linux-${GO_ARCH}.tar.gz ; \ diff --git a/Dockerfile_build_ubuntu64 b/Dockerfile_build_ubuntu64 index 638ecef63d..0720d1a628 100644 --- a/Dockerfile_build_ubuntu64 +++ b/Dockerfile_build_ubuntu64 @@ -21,7 +21,7 @@ RUN gem install fpm # Install go ENV GOPATH /root/go -ENV GO_VERSION 1.7.1 +ENV GO_VERSION 1.7.3 ENV GO_ARCH amd64 RUN wget https://storage.googleapis.com/golang/go${GO_VERSION}.linux-${GO_ARCH}.tar.gz; \ tar -C /usr/local/ -xf /go${GO_VERSION}.linux-${GO_ARCH}.tar.gz ; \ diff --git a/Dockerfile_build_ubuntu64_git b/Dockerfile_build_ubuntu64_git index 08716183e4..b0cb7be1dc 100644 --- a/Dockerfile_build_ubuntu64_git +++ b/Dockerfile_build_ubuntu64_git @@ -26,7 +26,7 @@ VOLUME $PROJECT_DIR # Install go -ENV GO_VERSION 1.7.1 +ENV GO_VERSION 1.7.3 ENV GO_ARCH amd64 RUN wget https://storage.googleapis.com/golang/go${GO_VERSION}.linux-${GO_ARCH}.tar.gz; \ tar -C /usr/local/ -xf /go${GO_VERSION}.linux-${GO_ARCH}.tar.gz ; \ diff --git a/build-docker.sh b/build-docker.sh index 75a4b5a343..ee921e8f83 100755 --- a/build-docker.sh +++ b/build-docker.sh @@ -2,7 +2,7 @@ set -e -x -GO_VER=${GO_VER:-1.7.1} +GO_VER=${GO_VER:-1.7.3} docker run -it -v "${GOPATH}":/gopath -v "$(pwd)":/app -e "GOPATH=/gopath" -w /app golang:$GO_VER sh -c 'CGO_ENABLED=0 go build -a --installsuffix cgo --ldflags="-s" -o influxd ./cmd/influxd' diff --git a/circle.yml b/circle.yml index 613e5e841e..16ea75669f 100644 --- a/circle.yml +++ b/circle.yml @@ -2,7 +2,7 @@ machine: services: - docker environment: - GODIST: "go1.7.1.linux-amd64.tar.gz" + GODIST: "go1.7.3.linux-amd64.tar.gz" post: - mkdir -p download - test -e download/$GODIST || curl -o download/$GODIST https://storage.googleapis.com/golang/$GODIST