Merge pull request docker-library#590 from J0WI/alpine10

yosifkit · web-flow · commit ba24350aa029 · 2019-06-21T13:39:48.000-07:00
Upgrade Alpine to 3.10
diff --git a/10/alpine/Dockerfile b/10/alpine/Dockerfile
@@ -1,5 +1,5 @@
 # vim:set ft=dockerfile:
-FROM alpine:3.9
+FROM alpine:3.10
 
 # alpine includes "postgres" user/group in base install
 #   /etc/passwd:22:postgres:x:70:70::/var/lib/postgresql:/bin/sh
diff --git a/11/alpine/Dockerfile b/11/alpine/Dockerfile
@@ -1,5 +1,5 @@
 # vim:set ft=dockerfile:
-FROM alpine:3.9
+FROM alpine:3.10
 
 # alpine includes "postgres" user/group in base install
 #   /etc/passwd:22:postgres:x:70:70::/var/lib/postgresql:/bin/sh
diff --git a/12/alpine/Dockerfile b/12/alpine/Dockerfile
@@ -1,5 +1,5 @@
 # vim:set ft=dockerfile:
-FROM alpine:3.9
+FROM alpine:3.10
 
 # alpine includes "postgres" user/group in base install
 #   /etc/passwd:22:postgres:x:70:70::/var/lib/postgresql:/bin/sh
diff --git a/9.4/alpine/Dockerfile b/9.4/alpine/Dockerfile
@@ -1,5 +1,5 @@
 # vim:set ft=dockerfile:
-FROM alpine:3.9
+FROM alpine:3.10
 
 # alpine includes "postgres" user/group in base install
 #   /etc/passwd:22:postgres:x:70:70::/var/lib/postgresql:/bin/sh
diff --git a/9.5/alpine/Dockerfile b/9.5/alpine/Dockerfile
@@ -1,5 +1,5 @@
 # vim:set ft=dockerfile:
-FROM alpine:3.9
+FROM alpine:3.10
 
 # alpine includes "postgres" user/group in base install
 #   /etc/passwd:22:postgres:x:70:70::/var/lib/postgresql:/bin/sh
diff --git a/9.6/alpine/Dockerfile b/9.6/alpine/Dockerfile
@@ -1,5 +1,5 @@
 # vim:set ft=dockerfile:
-FROM alpine:3.9
+FROM alpine:3.10
 
 # alpine includes "postgres" user/group in base install
 #   /etc/passwd:22:postgres:x:70:70::/var/lib/postgresql:/bin/sh
diff --git a/update.sh b/update.sh
@@ -21,7 +21,7 @@ declare -A debianSuite=(
 	[10]='stretch-slim'
 	[11]='stretch-slim'
 )
-defaultAlpineVersion='3.9'
+defaultAlpineVersion='3.10'
 declare -A alpineVersion=(
 	#[9.6]='3.5'
 )

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ declare -A debianSuite=(`
`21`	`21`	`[10]='stretch-slim'`
`22`	`22`	`[11]='stretch-slim'`
`23`	`23`	`)`
`24`		`-defaultAlpineVersion='3.9'`
	`24`	`+defaultAlpineVersion='3.10'`
`25`	`25`	`declare -A alpineVersion=(`
`26`	`26`	`#[9.6]='3.5'`
`27`	`27`	`)`