Merge pull request #1512 from vieux/1.5.1-

go 1.5.1->1.5.2
docker-archive · Dec 8, 2015 · ba976ed · ba976ed
2 parents a4a1d3b + 9677ddd
commit ba976ed
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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