Merge pull request #4374 from mboersma/swarm-golang-1.5

mboersma · mboersma · commit 56256c5adf1b · 2015-08-30T21:29:22.000-06:00
chore(swarm): update to go 1.5
diff --git a/swarm/Dockerfile b/swarm/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.4
+FROM golang:1.5
 
 WORKDIR /go/src/github.com/docker
 RUN git clone https://github.com/deis/swarm

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM golang:1.4`
	`1`	`+FROM golang:1.5`
`2`	`2`
`3`	`3`	`WORKDIR /go/src/github.com/docker`
`4`	`4`	`RUN git clone https://github.com/deis/swarm`