From b1f60bd4f88fa2f82aaaa304dc1476a26938cb38 Mon Sep 17 00:00:00 2001 From: J0WI Date: Thu, 11 Jun 2020 00:19:04 +0200 Subject: [PATCH] Upgrade Alpine to 3.12 --- 10/alpine/Dockerfile | 4 ++-- 11/alpine/Dockerfile | 6 +++--- 12/alpine/Dockerfile | 6 +++--- 13/alpine/Dockerfile | 6 +++--- 9.5/alpine/Dockerfile | 4 ++-- 9.6/alpine/Dockerfile | 4 ++-- Dockerfile-alpine.template | 4 ++-- update.sh | 2 +- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/10/alpine/Dockerfile b/10/alpine/Dockerfile index cc4b360214..9571cff9c4 100644 --- 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 index e3d710a49b..42cc7c4b4d 100644 --- 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 index 05487ef035..8d24a8a05e 100644 --- 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 index 5cc92c02f6..d3c882e554 100644 --- 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 index 700c688987..b9f76da027 100644 --- 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 index e1d58c185d..767dca2a89 100644 --- 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 index 7819ce02a6..26a47a4798 100644 --- 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 index 2e76a6891c..c88e04db65 100755 --- 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' )