Merge pull request #132 from infosiftr/revert-alpine

tianon · web-flow · commit 4d3c44d6b8cb · 2017-01-05T12:04:12.000-08:00
Revert Alpine 3.5 upgrade in 1.6 and 1.7 (leaving 1.8 on Alpine 3.5)
diff --git a/1.6/alpine/Dockerfile b/1.6/alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.5
+FROM alpine:3.4
 
 RUN apk add --no-cache ca-certificates
 
diff --git a/1.7/alpine/Dockerfile b/1.7/alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.5
+FROM alpine:3.4
 
 RUN apk add --no-cache ca-certificates
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM alpine:3.5`
	`1`	`+FROM alpine:3.4`
`2`	`2`
`3`	`3`	`RUN apk add --no-cache ca-certificates`
`4`	`4`