Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #7522 from influxdata/jw-go173 

Use go1.7.3
pull/7523/head
Jason Wilder 2016-10-26 09:47:57 -06:00 committed by GitHub
parent 7cc95ce28b 1ccdda88aa
commit d785a2d9f2
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DOCKER.md
View File

@ -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/).

2
Dockerfile_build_ubuntu32
View File

@ -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 ; \

2
Dockerfile_build_ubuntu64
View File

@ -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 ; \

2
Dockerfile_build_ubuntu64_git
View File

@ -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 ; \

2
build-docker.sh
View File

@ -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'

2
circle.yml
View File

@ -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