Merge pull request #2851 from yep/alpine-3-4

karalabe · web-flow · commit fb81bc32912e · 2016-07-22T12:18:22.000+03:00
containers/docker: update to alpine 3.4
diff --git a/containers/docker/develop-alpine/Dockerfile b/containers/docker/develop-alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.3
+FROM alpine:3.4
 
 RUN \
   apk add --update go git make gcc musl-dev         && \
diff --git a/containers/docker/master-alpine/Dockerfile b/containers/docker/master-alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.3
+FROM alpine:3.4
 
 RUN \
   apk add --update go git make gcc musl-dev         && \

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM alpine:3.3`
	`1`	`+FROM alpine:3.4`
`2`	`2`
`3`	`3`	`RUN \`
`4`	`4`	`apk add --update go git make gcc musl-dev && \`