diff --git a/10/alpine/Dockerfile b/10/alpine/Dockerfile index 10b736dd69..24096a466a 100644 --- a/10/alpine/Dockerfile +++ b/10/alpine/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.14 +FROM alpine:3.15 # 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 index 750e665767..5b94edab68 100644 --- a/11/alpine/Dockerfile +++ b/11/alpine/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.14 +FROM alpine:3.15 # 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 @@ -51,7 +51,7 @@ RUN set -eux; \ libxml2-dev \ libxslt-dev \ linux-headers \ - llvm11-dev clang g++ \ + llvm-dev clang g++ \ make \ openldap-dev \ openssl-dev \ diff --git a/12/alpine/Dockerfile b/12/alpine/Dockerfile index 6a5dfd6f2a..010c546139 100644 --- a/12/alpine/Dockerfile +++ b/12/alpine/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.14 +FROM alpine:3.15 # 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 @@ -51,7 +51,7 @@ RUN set -eux; \ libxml2-dev \ libxslt-dev \ linux-headers \ - llvm11-dev clang g++ \ + llvm-dev clang g++ \ make \ openldap-dev \ openssl-dev \ diff --git a/13/alpine/Dockerfile b/13/alpine/Dockerfile index 7fc80cc9b5..bacc9add68 100644 --- a/13/alpine/Dockerfile +++ b/13/alpine/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.14 +FROM alpine:3.15 # 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 @@ -51,7 +51,7 @@ RUN set -eux; \ libxml2-dev \ libxslt-dev \ linux-headers \ - llvm11-dev clang g++ \ + llvm-dev clang g++ \ make \ openldap-dev \ openssl-dev \ diff --git a/14/alpine/Dockerfile b/14/alpine/Dockerfile index d03d5d42ba..85e9eeb4de 100644 --- a/14/alpine/Dockerfile +++ b/14/alpine/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.14 +FROM alpine:3.15 # 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 @@ -51,7 +51,7 @@ RUN set -eux; \ libxml2-dev \ libxslt-dev \ linux-headers \ - llvm11-dev clang g++ \ + llvm-dev clang g++ \ make \ openldap-dev \ openssl-dev \ diff --git a/9.6/alpine/Dockerfile b/9.6/alpine/Dockerfile index dc391b7fc2..63453d4c2e 100644 --- a/9.6/alpine/Dockerfile +++ b/9.6/alpine/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.14 +FROM alpine:3.15 # 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 index 31a9882e50..19333bf46a 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -46,7 +46,7 @@ RUN set -eux; \ libxslt-dev \ linux-headers \ {{ if .major >= 11 then ( -}} - llvm11-dev clang g++ \ + llvm-dev clang g++ \ {{ ) else "" end -}} make \ openldap-dev \ diff --git a/versions.json b/versions.json index f5a6792859..55bf9bad75 100644 --- a/versions.json +++ b/versions.json @@ -1,6 +1,6 @@ { "10": { - "alpine": "3.14", + "alpine": "3.15", "bullseye": { "arches": [ "amd64", @@ -27,7 +27,7 @@ "version": "10.19" }, "11": { - "alpine": "3.14", + "alpine": "3.15", "bullseye": { "arches": [ "amd64", @@ -54,7 +54,7 @@ "version": "11.14" }, "12": { - "alpine": "3.14", + "alpine": "3.15", "bullseye": { "arches": [ "amd64", @@ -72,7 +72,7 @@ "version": "12.9" }, "13": { - "alpine": "3.14", + "alpine": "3.15", "bullseye": { "arches": [ "amd64", @@ -90,7 +90,7 @@ "version": "13.5" }, "14": { - "alpine": "3.14", + "alpine": "3.15", "bullseye": { "arches": [ "amd64", @@ -108,7 +108,7 @@ "version": "14.1" }, "9.6": { - "alpine": "3.14", + "alpine": "3.15", "bullseye": { "arches": [ "amd64", diff --git a/versions.sh b/versions.sh index c02b45b63f..55b4fd44a1 100755 --- a/versions.sh +++ b/versions.sh @@ -12,7 +12,7 @@ allDebianSuites=( bullseye stretch ) -defaultAlpineVersion='3.14' +defaultAlpineVersion='3.15' declare -A alpineVersions=( #[9.6]='3.5' )