Skip to content

Commit

Permalink
Update Go version to 1.7.4
Browse files Browse the repository at this point in the history
  • Loading branch information
e-dard committed Dec 5, 2016
1 parent aff2d7c commit 30bea33
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 10 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
- [#7356](https://github.com/influxdata/influxdb/issues/7356): Use X-Forwarded-For IP address in HTTP logger if present.
- [#7601](https://github.com/influxdata/influxdb/issues/7601): Prune data in meta store for deleted shards.
- [#7669](https://github.com/influxdata/influxdb/issues/7669): Uncomment section headers from the default configuration file.
- [#7684](https://github.com/influxdata/influxdb/issues/7684): Update Go version to 1.7.4.

### Bugfixes

Expand Down
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,16 +69,16 @@ second to sign our CLA, which can be found

Installing Go
-------------
InfluxDB requires Go 1.7.3.
InfluxDB requires Go 1.7.4.

At InfluxDB we find gvm, a Go version manager, useful for installing Go. For instructions
on how to install it see [the gvm page on github](https://github.com/moovweb/gvm).

After installing gvm you can install and set the default go version by
running the following:

gvm install go1.7.3
gvm use go1.7.3 --default
gvm install go1.7.4
gvm use go1.7.4 --default

Installing GDM
-------------
Expand Down
4 changes: 2 additions & 2 deletions DOCKER.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.3` 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.4` 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.3 ./build-docker.sh
$ GO_VER=1.7.4 ./build-docker.sh
```

Available version can be found [here](https://hub.docker.com/_/golang/).
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile_build_ubuntu32
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ RUN gem install fpm

# Install go
ENV GOPATH /root/go
ENV GO_VERSION 1.7.3
ENV GO_VERSION 1.7.4
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 ; \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile_build_ubuntu64
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ RUN gem install fpm

# Install go
ENV GOPATH /root/go
ENV GO_VERSION 1.7.3
ENV GO_VERSION 1.7.4
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 ; \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile_build_ubuntu64_git
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ VOLUME $PROJECT_DIR


# Install go
ENV GO_VERSION 1.7.3
ENV GO_VERSION 1.7.4
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 ; \
Expand Down
2 changes: 1 addition & 1 deletion build-docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -e -x

GO_VER=${GO_VER:-1.7.3}
GO_VER=${GO_VER:-1.7.4}

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'

Expand Down
2 changes: 1 addition & 1 deletion circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ machine:
services:
- docker
environment:
GODIST: "go1.7.3.linux-amd64.tar.gz"
GODIST: "go1.7.4.linux-amd64.tar.gz"
post:
- mkdir -p download
- test -e download/$GODIST || curl -o download/$GODIST https://storage.googleapis.com/golang/$GODIST
Expand Down

0 comments on commit 30bea33

Please sign in to comment.