Merge pull request #861 from J0WI/alpine-3.14

yosifkit · web-flow · commit 55001e0c1305 · 2021-06-16T10:34:49.000-07:00
Alpine 3.14
diff --git a/10/alpine/Dockerfile b/10/alpine/Dockerfile
@@ -1,5 +1,5 @@
 # vim:set ft=dockerfile:
-FROM alpine:3.13
+FROM alpine:3.14
 
 # 70 is the standard uid/gid for "postgres" in Alpine
 # https://git.alpinelinux.org/aports/tree/main/postgresql/postgresql.pre-install?h=3.12-stable
diff --git a/11/alpine/Dockerfile b/11/alpine/Dockerfile
@@ -1,5 +1,5 @@
 # vim:set ft=dockerfile:
-FROM alpine:3.13
+FROM alpine:3.14
 
 # 70 is the standard uid/gid for "postgres" in Alpine
 # https://git.alpinelinux.org/aports/tree/main/postgresql/postgresql.pre-install?h=3.12-stable
@@ -46,7 +46,7 @@ RUN set -eux; \
 		libxml2-dev \
 		libxslt-dev \
 		linux-headers \
-		llvm10-dev clang g++ \
+		llvm11-dev clang g++ \
 		make \
 #		openldap-dev \
 		openssl-dev \
diff --git a/12/alpine/Dockerfile b/12/alpine/Dockerfile
@@ -1,5 +1,5 @@
 # vim:set ft=dockerfile:
-FROM alpine:3.13
+FROM alpine:3.14
 
 # 70 is the standard uid/gid for "postgres" in Alpine
 # https://git.alpinelinux.org/aports/tree/main/postgresql/postgresql.pre-install?h=3.12-stable
@@ -46,7 +46,7 @@ RUN set -eux; \
 		libxml2-dev \
 		libxslt-dev \
 		linux-headers \
-		llvm10-dev clang g++ \
+		llvm11-dev clang g++ \
 		make \
 #		openldap-dev \
 		openssl-dev \
diff --git a/13/alpine/Dockerfile b/13/alpine/Dockerfile
@@ -1,5 +1,5 @@
 # vim:set ft=dockerfile:
-FROM alpine:3.13
+FROM alpine:3.14
 
 # 70 is the standard uid/gid for "postgres" in Alpine
 # https://git.alpinelinux.org/aports/tree/main/postgresql/postgresql.pre-install?h=3.12-stable
@@ -46,7 +46,7 @@ RUN set -eux; \
 		libxml2-dev \
 		libxslt-dev \
 		linux-headers \
-		llvm10-dev clang g++ \
+		llvm11-dev clang g++ \
 		make \
 #		openldap-dev \
 		openssl-dev \
diff --git a/9.6/alpine/Dockerfile b/9.6/alpine/Dockerfile
@@ -1,5 +1,5 @@
 # vim:set ft=dockerfile:
-FROM alpine:3.13
+FROM alpine:3.14
 
 # 70 is the standard uid/gid for "postgres" in Alpine
 # https://git.alpinelinux.org/aports/tree/main/postgresql/postgresql.pre-install?h=3.12-stable
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
@@ -46,7 +46,7 @@ RUN set -eux; \
 		libxml2-dev \
 		libxslt-dev \
 		linux-headers \
-		llvm10-dev clang g++ \
+		llvm11-dev clang g++ \
 		make \
 #		openldap-dev \
 		openssl-dev \
diff --git a/update.sh b/update.sh
@@ -16,7 +16,7 @@ declare -A debianSuite=(
 	[10]='stretch-slim'
 	[11]='stretch-slim'
 )
-defaultAlpineVersion='3.13'
+defaultAlpineVersion='3.14'
 declare -A alpineVersion=(
 	#[9.6]='3.5'
 )

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ declare -A debianSuite=(`
`16`	`16`	`[10]='stretch-slim'`
`17`	`17`	`[11]='stretch-slim'`
`18`	`18`	`)`
`19`		`-defaultAlpineVersion='3.13'`
	`19`	`+defaultAlpineVersion='3.14'`
`20`	`20`	`declare -A alpineVersion=(`
`21`	`21`	`#[9.6]='3.5'`
`22`	`22`	`)`