diff --git a/.travis.yml b/.travis.yml index 1e8bbe7170..87fdaf2d7d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: go go: - - 1.5.1 + - 1.5.2 # let us have speedy Docker-based Travis workers sudo: false diff --git a/Dockerfile b/Dockerfile index 5b1974ca4c..5a21c47558 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.5.1 +FROM golang:1.5.2 COPY . /go/src/github.com/docker/swarm WORKDIR /go/src/github.com/docker/swarm diff --git a/test/integration/Dockerfile b/test/integration/Dockerfile index d660a2e36d..0a8b4acdfd 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.5.1 +ENV GO_VERSION 1.5.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