diff --git a/.travis.yml b/.travis.yml index dd92ddf088..849bc8407c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: go go: - - 1.6.1 + - 1.6.2 # let us have speedy Docker-based Travis workers sudo: false diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0ea594e645..f32ba4056f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -25,7 +25,7 @@ sudo apt-get install git You also need Go 1.5 or higher. Download Go from [https://golang.org/dl/](https://golang.org/dl/). To install on Linux: ```sh -tar xzvf go1.6.1.linux-amd64.tar.gz +tar xzvf go1.6.2.linux-amd64.tar.gz sudo mv go /usr/local ``` diff --git a/Dockerfile b/Dockerfile index b079eeb56a..f54575d234 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.6.1-alpine +FROM golang:1.6.2-alpine ARG GOOS diff --git a/test/integration/Dockerfile b/test/integration/Dockerfile index fc5daacd20..b7a2c0d425 100644 --- a/test/integration/Dockerfile +++ b/test/integration/Dockerfile @@ -8,7 +8,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends git file parall && apt-get clean && rm -rf /var/lib/apt/lists/* # Install golang -ENV GO_VERSION 1.6.1 +ENV GO_VERSION 1.6.2 RUN curl -sSL https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz | tar -v -C /usr/local -xz ENV PATH /go/bin:/usr/local/go/bin:$PATH ENV GOPATH /go