Merge pull request docker-library#168 from docker-library/revert-166-alpine-3.5

tianon · web-flow · commit 0380e847a80e · 2017-01-05T12:04:35.000-08:00
Revert "Upgrade alpine to v3.5"
diff --git a/2.7/alpine/Dockerfile b/2.7/alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.5
+FROM alpine:3.4
 
 # ensure local python is preferred over distribution python
 ENV PATH /usr/local/bin:$PATH
diff --git a/3.3/alpine/Dockerfile b/3.3/alpine/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.5
+FROM alpine:3.4
 
 # ensure local python is preferred over distribution python
 ENV PATH /usr/local/bin:$PATH
diff --git a/3.4/alpine/Dockerfile b/3.4/alpine/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.5
+FROM alpine:3.4
 
 # ensure local python is preferred over distribution python
 ENV PATH /usr/local/bin:$PATH
diff --git a/3.5/alpine/Dockerfile b/3.5/alpine/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.5
+FROM alpine:3.4
 
 # ensure local python is preferred over distribution python
 ENV PATH /usr/local/bin:$PATH
diff --git a/3.6/alpine/Dockerfile b/3.6/alpine/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.5
+FROM alpine:3.4
 
 # ensure local python is preferred over distribution python
 ENV PATH /usr/local/bin:$PATH
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
@@ -1,4 +1,4 @@
-FROM alpine:3.5
+FROM alpine:3.4
 
 # ensure local python is preferred over distribution python
 ENV PATH /usr/local/bin:$PATH

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`	`# ensure local python is preferred over distribution python`
`4`	`4`	`ENV PATH /usr/local/bin:$PATH`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`# PLEASE DO NOT EDIT IT DIRECTLY.`
`5`	`5`	`#`
`6`	`6`
`7`		`-FROM alpine:3.5`
	`7`	`+FROM alpine:3.4`
`8`	`8`
`9`	`9`	`# ensure local python is preferred over distribution python`
`10`	`10`	`ENV PATH /usr/local/bin:$PATH`