Merge pull request #742 from J0WI/alpine-3.12

Upgrade Alpine to 3.12
docker-library · Jun 10, 2020 · 9586595 · 9586595
2 parents 9c5ca99 + b1f60bd
commit 9586595
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 18 deletions.
diff --git a/10/alpine/Dockerfile b/10/alpine/Dockerfile
@@ -1,8 +1,8 @@
 # vim:set ft=dockerfile:
-FROM alpine:3.11
+FROM alpine:3.12
 
 # 70 is the standard uid/gid for "postgres" in Alpine
-# https://git.alpinelinux.org/aports/tree/main/postgresql/postgresql.pre-install?h=3.11-stable
+# https://git.alpinelinux.org/aports/tree/main/postgresql/postgresql.pre-install?h=3.12-stable
 RUN set -eux; \
 	addgroup -g 70 -S postgres; \
 	adduser -u 70 -S -D -G postgres -H -h /var/lib/postgresql -s /bin/sh postgres; \

diff --git a/11/alpine/Dockerfile b/11/alpine/Dockerfile
@@ -1,8 +1,8 @@
 # vim:set ft=dockerfile:
-FROM alpine:3.11
+FROM alpine:3.12
 
 # 70 is the standard uid/gid for "postgres" in Alpine
-# https://git.alpinelinux.org/aports/tree/main/postgresql/postgresql.pre-install?h=3.11-stable
+# https://git.alpinelinux.org/aports/tree/main/postgresql/postgresql.pre-install?h=3.12-stable
 RUN set -eux; \
 	addgroup -g 70 -S postgres; \
 	adduser -u 70 -S -D -G postgres -H -h /var/lib/postgresql -s /bin/sh postgres; \
@@ -50,7 +50,7 @@ RUN set -ex \
 		libxml2-dev \
 		libxslt-dev \
 		linux-headers \
-		llvm9-dev clang g++ \
+		llvm10-dev clang g++ \
 		make \
 #		openldap-dev \
 		openssl-dev \

diff --git a/12/alpine/Dockerfile b/12/alpine/Dockerfile
@@ -1,8 +1,8 @@
 # vim:set ft=dockerfile:
-FROM alpine:3.11
+FROM alpine:3.12
 
 # 70 is the standard uid/gid for "postgres" in Alpine
-# https://git.alpinelinux.org/aports/tree/main/postgresql/postgresql.pre-install?h=3.11-stable
+# https://git.alpinelinux.org/aports/tree/main/postgresql/postgresql.pre-install?h=3.12-stable
 RUN set -eux; \
 	addgroup -g 70 -S postgres; \
 	adduser -u 70 -S -D -G postgres -H -h /var/lib/postgresql -s /bin/sh postgres; \
@@ -50,7 +50,7 @@ RUN set -ex \
 		libxml2-dev \
 		libxslt-dev \
 		linux-headers \
-		llvm9-dev clang g++ \
+		llvm10-dev clang g++ \
 		make \
 #		openldap-dev \
 		openssl-dev \

diff --git a/13/alpine/Dockerfile b/13/alpine/Dockerfile
@@ -1,8 +1,8 @@
 # vim:set ft=dockerfile:
-FROM alpine:3.11
+FROM alpine:3.12
 
 # 70 is the standard uid/gid for "postgres" in Alpine
-# https://git.alpinelinux.org/aports/tree/main/postgresql/postgresql.pre-install?h=3.11-stable
+# https://git.alpinelinux.org/aports/tree/main/postgresql/postgresql.pre-install?h=3.12-stable
 RUN set -eux; \
 	addgroup -g 70 -S postgres; \
 	adduser -u 70 -S -D -G postgres -H -h /var/lib/postgresql -s /bin/sh postgres; \
@@ -50,7 +50,7 @@ RUN set -ex \
 		libxml2-dev \
 		libxslt-dev \
 		linux-headers \
-		llvm9-dev clang g++ \
+		llvm10-dev clang g++ \
 		make \
 #		openldap-dev \
 		openssl-dev \

diff --git a/9.5/alpine/Dockerfile b/9.5/alpine/Dockerfile
@@ -1,8 +1,8 @@
 # vim:set ft=dockerfile:
-FROM alpine:3.11
+FROM alpine:3.12
 
 # 70 is the standard uid/gid for "postgres" in Alpine
-# https://git.alpinelinux.org/aports/tree/main/postgresql/postgresql.pre-install?h=3.11-stable
+# https://git.alpinelinux.org/aports/tree/main/postgresql/postgresql.pre-install?h=3.12-stable
 RUN set -eux; \
 	addgroup -g 70 -S postgres; \
 	adduser -u 70 -S -D -G postgres -H -h /var/lib/postgresql -s /bin/sh postgres; \

diff --git a/9.6/alpine/Dockerfile b/9.6/alpine/Dockerfile
@@ -1,8 +1,8 @@
 # vim:set ft=dockerfile:
-FROM alpine:3.11
+FROM alpine:3.12
 
 # 70 is the standard uid/gid for "postgres" in Alpine
-# https://git.alpinelinux.org/aports/tree/main/postgresql/postgresql.pre-install?h=3.11-stable
+# https://git.alpinelinux.org/aports/tree/main/postgresql/postgresql.pre-install?h=3.12-stable
 RUN set -eux; \
 	addgroup -g 70 -S postgres; \
 	adduser -u 70 -S -D -G postgres -H -h /var/lib/postgresql -s /bin/sh postgres; \

diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
@@ -2,7 +2,7 @@
 FROM alpine:%%ALPINE-VERSION%%
 
 # 70 is the standard uid/gid for "postgres" in Alpine
-# https://git.alpinelinux.org/aports/tree/main/postgresql/postgresql.pre-install?h=3.11-stable
+# https://git.alpinelinux.org/aports/tree/main/postgresql/postgresql.pre-install?h=3.12-stable
 RUN set -eux; \
 	addgroup -g 70 -S postgres; \
 	adduser -u 70 -S -D -G postgres -H -h /var/lib/postgresql -s /bin/sh postgres; \
@@ -50,7 +50,7 @@ RUN set -ex \
 		libxml2-dev \
 		libxslt-dev \
 		linux-headers \
-		llvm9-dev clang g++ \
+		llvm10-dev clang g++ \
 		make \
 #		openldap-dev \
 		openssl-dev \

diff --git a/update.sh b/update.sh
@@ -18,7 +18,7 @@ declare -A debianSuite=(
 	[10]='stretch-slim'
 	[11]='stretch-slim'
 )
-defaultAlpineVersion='3.11'
+defaultAlpineVersion='3.12'
 declare -A alpineVersion=(
 	#[9.6]='3.5'
 )