From b924f7f8fa4ec0e185fec8c31fdcc4458f13e1c6 Mon Sep 17 00:00:00 2001 From: Victor Vieux Date: Mon, 26 Oct 2015 11:49:48 -0700 Subject: [PATCH] switch to go1.5.1 Signed-off-by: Victor Vieux --- .travis.yml | 2 +- Dockerfile | 2 +- test/integration/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index f1c6dfc329..1e8bbe7170 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: go go: - - 1.5 + - 1.5.1 # let us have speedy Docker-based Travis workers sudo: false diff --git a/Dockerfile b/Dockerfile index 91d06f2653..5b1974ca4c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.5 +FROM golang:1.5.1 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 6eb94403fb..2a90cd4126 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 \ && apt-get clean && rm -rf /var/lib/apt/lists/* # Install golang -ENV GO_VERSION 1.5 +ENV GO_VERSION 1.5.1 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