Merge pull request #108 from docker-library/revert-103-alpine-3.5

tianon · web-flow · commit cd4cbb4dee4b · 2017-01-05T13:33:44.000-08:00
Revert "Update to Alpine 3.5"
diff --git a/2.1/alpine/Dockerfile b/2.1/alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.5
+FROM alpine:3.4
 
 # skip installing gem documentation
 RUN mkdir -p /usr/local/etc \
diff --git a/2.2/alpine/Dockerfile b/2.2/alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.5
+FROM alpine:3.4
 
 # skip installing gem documentation
 RUN mkdir -p /usr/local/etc \
diff --git a/2.3/alpine/Dockerfile b/2.3/alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.5
+FROM alpine:3.4
 
 # skip installing gem documentation
 RUN mkdir -p /usr/local/etc \
diff --git a/2.4/alpine/Dockerfile b/2.4/alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.5
+FROM alpine:3.4
 
 # skip installing gem documentation
 RUN mkdir -p /usr/local/etc \
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
@@ -1,4 +1,4 @@
-FROM alpine:3.5
+FROM alpine:3.4
 
 # skip installing gem documentation
 RUN mkdir -p /usr/local/etc \

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`	`# skip installing gem documentation`
`4`	`4`	`RUN mkdir -p /usr/local/etc \`