diff --git a/13/alpine3.21/Dockerfile b/13/alpine3.21/Dockerfile index 50a47522ad..c79dfd0bb7 100644 --- a/13/alpine3.21/Dockerfile +++ b/13/alpine3.21/Dockerfile @@ -7,7 +7,7 @@ FROM alpine:3.21 # 70 is the standard uid/gid for "postgres" in Alpine -# https://git.alpinelinux.org/aports/tree/main/postgresql-common/postgresql-common.pre-install?h=3.21-stable +# https://git.alpinelinux.org/aports/tree/main/postgresql-common/postgresql-common.pre-install?h=3.22-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; \ @@ -109,9 +109,9 @@ RUN set -eux; \ mv src/include/pg_config_manual.h.new src/include/pg_config_manual.h; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ \ -# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.21-stable&id=40544ade947bec1798edb0f749f4e967e842624b#n172 +# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.22-stable#n176 ("export LLVM_CONFIG") export LLVM_CONFIG="/usr/lib/llvm19/bin/llvm-config"; \ -# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.21-stable&id=40544ade947bec1798edb0f749f4e967e842624b#n177 +# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.22-stable#n180 ("older clang versions don't have a 'clang' exe anymore.") export CLANG=clang-19; \ \ # configure options taken from: @@ -166,8 +166,7 @@ RUN set -eux; \ zstd \ # https://wiki.alpinelinux.org/wiki/Release_Notes_for_Alpine_3.16.0#ICU_data_split icu-data-full \ -# nss_wrapper is not availble on ppc64le: "test case segfaults in ppc64le" -# https://git.alpinelinux.org/aports/commit/testing/nss_wrapper/APKBUILD?h=3.17-stable&id=94d81ceeb58cff448d489bbcbe9a6d40c9991663 +# https://git.alpinelinux.org/aports/tree/community/nss_wrapper/APKBUILD?h=3.22-stable#n7 ("ppc64le: test case segfaults") $([ "$(apk --print-arch)" != 'ppc64le' ] && echo 'nss_wrapper') \ ; \ apk del --no-network .build-deps; \ diff --git a/13/alpine3.20/Dockerfile b/13/alpine3.22/Dockerfile similarity index 93% rename from 13/alpine3.20/Dockerfile rename to 13/alpine3.22/Dockerfile index a2f5e0918b..ece37e9796 100644 --- a/13/alpine3.20/Dockerfile +++ b/13/alpine3.22/Dockerfile @@ -4,10 +4,10 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.20 +FROM alpine:3.22 # 70 is the standard uid/gid for "postgres" in Alpine -# https://git.alpinelinux.org/aports/tree/main/postgresql-common/postgresql-common.pre-install?h=3.21-stable +# https://git.alpinelinux.org/aports/tree/main/postgresql-common/postgresql-common.pre-install?h=3.22-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; \ @@ -57,8 +57,8 @@ ENV PG_VERSION 13.21 ENV PG_SHA256 dcda1294df45f033b0656cf7a8e4afbbc624c25e1b144aec79530f74d7ef4ab4 ENV DOCKER_PG_LLVM_DEPS \ - llvm15-dev \ - clang15 + llvm19-dev \ + clang19 RUN set -eux; \ \ @@ -109,10 +109,10 @@ RUN set -eux; \ mv src/include/pg_config_manual.h.new src/include/pg_config_manual.h; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ \ -# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.21-stable&id=40544ade947bec1798edb0f749f4e967e842624b#n172 - export LLVM_CONFIG="/usr/lib/llvm15/bin/llvm-config"; \ -# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.21-stable&id=40544ade947bec1798edb0f749f4e967e842624b#n177 - export CLANG=clang-15; \ +# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.22-stable#n176 ("export LLVM_CONFIG") + export LLVM_CONFIG="/usr/lib/llvm19/bin/llvm-config"; \ +# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.22-stable#n180 ("older clang versions don't have a 'clang' exe anymore.") + export CLANG=clang-19; \ \ # configure options taken from: # https://anonscm.debian.org/cgit/pkg-postgresql/postgresql.git/tree/debian/rules?h=9.5 @@ -166,8 +166,7 @@ RUN set -eux; \ zstd \ # https://wiki.alpinelinux.org/wiki/Release_Notes_for_Alpine_3.16.0#ICU_data_split icu-data-full \ -# nss_wrapper is not availble on ppc64le: "test case segfaults in ppc64le" -# https://git.alpinelinux.org/aports/commit/testing/nss_wrapper/APKBUILD?h=3.17-stable&id=94d81ceeb58cff448d489bbcbe9a6d40c9991663 +# https://git.alpinelinux.org/aports/tree/community/nss_wrapper/APKBUILD?h=3.22-stable#n7 ("ppc64le: test case segfaults") $([ "$(apk --print-arch)" != 'ppc64le' ] && echo 'nss_wrapper') \ ; \ apk del --no-network .build-deps; \ diff --git a/13/alpine3.20/docker-ensure-initdb.sh b/13/alpine3.22/docker-ensure-initdb.sh similarity index 100% rename from 13/alpine3.20/docker-ensure-initdb.sh rename to 13/alpine3.22/docker-ensure-initdb.sh diff --git a/13/alpine3.20/docker-entrypoint.sh b/13/alpine3.22/docker-entrypoint.sh similarity index 100% rename from 13/alpine3.20/docker-entrypoint.sh rename to 13/alpine3.22/docker-entrypoint.sh diff --git a/14/alpine3.21/Dockerfile b/14/alpine3.21/Dockerfile index 82d8aeba6c..49eb44c2c7 100644 --- a/14/alpine3.21/Dockerfile +++ b/14/alpine3.21/Dockerfile @@ -7,7 +7,7 @@ FROM alpine:3.21 # 70 is the standard uid/gid for "postgres" in Alpine -# https://git.alpinelinux.org/aports/tree/main/postgresql-common/postgresql-common.pre-install?h=3.21-stable +# https://git.alpinelinux.org/aports/tree/main/postgresql-common/postgresql-common.pre-install?h=3.22-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; \ @@ -111,9 +111,9 @@ RUN set -eux; \ mv src/include/pg_config_manual.h.new src/include/pg_config_manual.h; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ \ -# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.21-stable&id=40544ade947bec1798edb0f749f4e967e842624b#n172 +# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.22-stable#n176 ("export LLVM_CONFIG") export LLVM_CONFIG="/usr/lib/llvm19/bin/llvm-config"; \ -# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.21-stable&id=40544ade947bec1798edb0f749f4e967e842624b#n177 +# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.22-stable#n180 ("older clang versions don't have a 'clang' exe anymore.") export CLANG=clang-19; \ \ # configure options taken from: @@ -169,8 +169,7 @@ RUN set -eux; \ zstd \ # https://wiki.alpinelinux.org/wiki/Release_Notes_for_Alpine_3.16.0#ICU_data_split icu-data-full \ -# nss_wrapper is not availble on ppc64le: "test case segfaults in ppc64le" -# https://git.alpinelinux.org/aports/commit/testing/nss_wrapper/APKBUILD?h=3.17-stable&id=94d81ceeb58cff448d489bbcbe9a6d40c9991663 +# https://git.alpinelinux.org/aports/tree/community/nss_wrapper/APKBUILD?h=3.22-stable#n7 ("ppc64le: test case segfaults") $([ "$(apk --print-arch)" != 'ppc64le' ] && echo 'nss_wrapper') \ ; \ apk del --no-network .build-deps; \ diff --git a/14/alpine3.20/Dockerfile b/14/alpine3.22/Dockerfile similarity index 93% rename from 14/alpine3.20/Dockerfile rename to 14/alpine3.22/Dockerfile index 9afc070826..238930ef21 100644 --- a/14/alpine3.20/Dockerfile +++ b/14/alpine3.22/Dockerfile @@ -4,10 +4,10 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.20 +FROM alpine:3.22 # 70 is the standard uid/gid for "postgres" in Alpine -# https://git.alpinelinux.org/aports/tree/main/postgresql-common/postgresql-common.pre-install?h=3.21-stable +# https://git.alpinelinux.org/aports/tree/main/postgresql-common/postgresql-common.pre-install?h=3.22-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; \ @@ -57,8 +57,8 @@ ENV PG_VERSION 14.18 ENV PG_SHA256 83ab29d6bfc3dc58b2ed3c664114fdfbeb6a0450c4b8d7fa69aee91e3ca14f8e ENV DOCKER_PG_LLVM_DEPS \ - llvm15-dev \ - clang15 + llvm19-dev \ + clang19 RUN set -eux; \ \ @@ -111,10 +111,10 @@ RUN set -eux; \ mv src/include/pg_config_manual.h.new src/include/pg_config_manual.h; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ \ -# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.21-stable&id=40544ade947bec1798edb0f749f4e967e842624b#n172 - export LLVM_CONFIG="/usr/lib/llvm15/bin/llvm-config"; \ -# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.21-stable&id=40544ade947bec1798edb0f749f4e967e842624b#n177 - export CLANG=clang-15; \ +# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.22-stable#n176 ("export LLVM_CONFIG") + export LLVM_CONFIG="/usr/lib/llvm19/bin/llvm-config"; \ +# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.22-stable#n180 ("older clang versions don't have a 'clang' exe anymore.") + export CLANG=clang-19; \ \ # configure options taken from: # https://anonscm.debian.org/cgit/pkg-postgresql/postgresql.git/tree/debian/rules?h=9.5 @@ -169,8 +169,7 @@ RUN set -eux; \ zstd \ # https://wiki.alpinelinux.org/wiki/Release_Notes_for_Alpine_3.16.0#ICU_data_split icu-data-full \ -# nss_wrapper is not availble on ppc64le: "test case segfaults in ppc64le" -# https://git.alpinelinux.org/aports/commit/testing/nss_wrapper/APKBUILD?h=3.17-stable&id=94d81ceeb58cff448d489bbcbe9a6d40c9991663 +# https://git.alpinelinux.org/aports/tree/community/nss_wrapper/APKBUILD?h=3.22-stable#n7 ("ppc64le: test case segfaults") $([ "$(apk --print-arch)" != 'ppc64le' ] && echo 'nss_wrapper') \ ; \ apk del --no-network .build-deps; \ diff --git a/14/alpine3.20/docker-ensure-initdb.sh b/14/alpine3.22/docker-ensure-initdb.sh similarity index 100% rename from 14/alpine3.20/docker-ensure-initdb.sh rename to 14/alpine3.22/docker-ensure-initdb.sh diff --git a/14/alpine3.20/docker-entrypoint.sh b/14/alpine3.22/docker-entrypoint.sh similarity index 100% rename from 14/alpine3.20/docker-entrypoint.sh rename to 14/alpine3.22/docker-entrypoint.sh diff --git a/15/alpine3.21/Dockerfile b/15/alpine3.21/Dockerfile index 203cab4d45..91ab89c023 100644 --- a/15/alpine3.21/Dockerfile +++ b/15/alpine3.21/Dockerfile @@ -7,7 +7,7 @@ FROM alpine:3.21 # 70 is the standard uid/gid for "postgres" in Alpine -# https://git.alpinelinux.org/aports/tree/main/postgresql-common/postgresql-common.pre-install?h=3.21-stable +# https://git.alpinelinux.org/aports/tree/main/postgresql-common/postgresql-common.pre-install?h=3.22-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; \ @@ -113,9 +113,9 @@ RUN set -eux; \ mv src/include/pg_config_manual.h.new src/include/pg_config_manual.h; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ \ -# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.21-stable&id=40544ade947bec1798edb0f749f4e967e842624b#n172 +# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.22-stable#n176 ("export LLVM_CONFIG") export LLVM_CONFIG="/usr/lib/llvm19/bin/llvm-config"; \ -# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.21-stable&id=40544ade947bec1798edb0f749f4e967e842624b#n177 +# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.22-stable#n180 ("older clang versions don't have a 'clang' exe anymore.") export CLANG=clang-19; \ \ # configure options taken from: @@ -172,8 +172,7 @@ RUN set -eux; \ zstd \ # https://wiki.alpinelinux.org/wiki/Release_Notes_for_Alpine_3.16.0#ICU_data_split icu-data-full \ -# nss_wrapper is not availble on ppc64le: "test case segfaults in ppc64le" -# https://git.alpinelinux.org/aports/commit/testing/nss_wrapper/APKBUILD?h=3.17-stable&id=94d81ceeb58cff448d489bbcbe9a6d40c9991663 +# https://git.alpinelinux.org/aports/tree/community/nss_wrapper/APKBUILD?h=3.22-stable#n7 ("ppc64le: test case segfaults") $([ "$(apk --print-arch)" != 'ppc64le' ] && echo 'nss_wrapper') \ ; \ apk del --no-network .build-deps; \ diff --git a/15/alpine3.20/Dockerfile b/15/alpine3.22/Dockerfile similarity index 93% rename from 15/alpine3.20/Dockerfile rename to 15/alpine3.22/Dockerfile index 9fcb077803..201065d8a3 100644 --- a/15/alpine3.20/Dockerfile +++ b/15/alpine3.22/Dockerfile @@ -4,10 +4,10 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.20 +FROM alpine:3.22 # 70 is the standard uid/gid for "postgres" in Alpine -# https://git.alpinelinux.org/aports/tree/main/postgresql-common/postgresql-common.pre-install?h=3.21-stable +# https://git.alpinelinux.org/aports/tree/main/postgresql-common/postgresql-common.pre-install?h=3.22-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; \ @@ -57,8 +57,8 @@ ENV PG_VERSION 15.13 ENV PG_SHA256 4f62e133d22ea08a0401b0840920e26698644d01a80c34341fb732dd0a90ca5d ENV DOCKER_PG_LLVM_DEPS \ - llvm15-dev \ - clang15 + llvm19-dev \ + clang19 RUN set -eux; \ \ @@ -113,10 +113,10 @@ RUN set -eux; \ mv src/include/pg_config_manual.h.new src/include/pg_config_manual.h; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ \ -# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.21-stable&id=40544ade947bec1798edb0f749f4e967e842624b#n172 - export LLVM_CONFIG="/usr/lib/llvm15/bin/llvm-config"; \ -# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.21-stable&id=40544ade947bec1798edb0f749f4e967e842624b#n177 - export CLANG=clang-15; \ +# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.22-stable#n176 ("export LLVM_CONFIG") + export LLVM_CONFIG="/usr/lib/llvm19/bin/llvm-config"; \ +# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.22-stable#n180 ("older clang versions don't have a 'clang' exe anymore.") + export CLANG=clang-19; \ \ # configure options taken from: # https://anonscm.debian.org/cgit/pkg-postgresql/postgresql.git/tree/debian/rules?h=9.5 @@ -172,8 +172,7 @@ RUN set -eux; \ zstd \ # https://wiki.alpinelinux.org/wiki/Release_Notes_for_Alpine_3.16.0#ICU_data_split icu-data-full \ -# nss_wrapper is not availble on ppc64le: "test case segfaults in ppc64le" -# https://git.alpinelinux.org/aports/commit/testing/nss_wrapper/APKBUILD?h=3.17-stable&id=94d81ceeb58cff448d489bbcbe9a6d40c9991663 +# https://git.alpinelinux.org/aports/tree/community/nss_wrapper/APKBUILD?h=3.22-stable#n7 ("ppc64le: test case segfaults") $([ "$(apk --print-arch)" != 'ppc64le' ] && echo 'nss_wrapper') \ ; \ apk del --no-network .build-deps; \ diff --git a/15/alpine3.20/docker-ensure-initdb.sh b/15/alpine3.22/docker-ensure-initdb.sh similarity index 100% rename from 15/alpine3.20/docker-ensure-initdb.sh rename to 15/alpine3.22/docker-ensure-initdb.sh diff --git a/15/alpine3.20/docker-entrypoint.sh b/15/alpine3.22/docker-entrypoint.sh similarity index 100% rename from 15/alpine3.20/docker-entrypoint.sh rename to 15/alpine3.22/docker-entrypoint.sh diff --git a/16/alpine3.21/Dockerfile b/16/alpine3.21/Dockerfile index 21f38d7596..1bf2cab5a5 100644 --- a/16/alpine3.21/Dockerfile +++ b/16/alpine3.21/Dockerfile @@ -7,7 +7,7 @@ FROM alpine:3.21 # 70 is the standard uid/gid for "postgres" in Alpine -# https://git.alpinelinux.org/aports/tree/main/postgresql-common/postgresql-common.pre-install?h=3.21-stable +# https://git.alpinelinux.org/aports/tree/main/postgresql-common/postgresql-common.pre-install?h=3.22-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; \ @@ -113,9 +113,9 @@ RUN set -eux; \ mv src/include/pg_config_manual.h.new src/include/pg_config_manual.h; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ \ -# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.21-stable&id=40544ade947bec1798edb0f749f4e967e842624b#n172 +# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.22-stable#n176 ("export LLVM_CONFIG") export LLVM_CONFIG="/usr/lib/llvm19/bin/llvm-config"; \ -# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.21-stable&id=40544ade947bec1798edb0f749f4e967e842624b#n177 +# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.22-stable#n180 ("older clang versions don't have a 'clang' exe anymore.") export CLANG=clang-19; \ \ # configure options taken from: @@ -171,8 +171,7 @@ RUN set -eux; \ zstd \ # https://wiki.alpinelinux.org/wiki/Release_Notes_for_Alpine_3.16.0#ICU_data_split icu-data-full \ -# nss_wrapper is not availble on ppc64le: "test case segfaults in ppc64le" -# https://git.alpinelinux.org/aports/commit/testing/nss_wrapper/APKBUILD?h=3.17-stable&id=94d81ceeb58cff448d489bbcbe9a6d40c9991663 +# https://git.alpinelinux.org/aports/tree/community/nss_wrapper/APKBUILD?h=3.22-stable#n7 ("ppc64le: test case segfaults") $([ "$(apk --print-arch)" != 'ppc64le' ] && echo 'nss_wrapper') \ ; \ apk del --no-network .build-deps; \ diff --git a/16/alpine3.20/Dockerfile b/16/alpine3.22/Dockerfile similarity index 93% rename from 16/alpine3.20/Dockerfile rename to 16/alpine3.22/Dockerfile index 6095fa9396..902de7538f 100644 --- a/16/alpine3.20/Dockerfile +++ b/16/alpine3.22/Dockerfile @@ -4,10 +4,10 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.20 +FROM alpine:3.22 # 70 is the standard uid/gid for "postgres" in Alpine -# https://git.alpinelinux.org/aports/tree/main/postgresql-common/postgresql-common.pre-install?h=3.21-stable +# https://git.alpinelinux.org/aports/tree/main/postgresql-common/postgresql-common.pre-install?h=3.22-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; \ @@ -57,8 +57,8 @@ ENV PG_VERSION 16.9 ENV PG_SHA256 07c00fb824df0a0c295f249f44691b86e3266753b380c96f633c3311e10bd005 ENV DOCKER_PG_LLVM_DEPS \ - llvm15-dev \ - clang15 + llvm19-dev \ + clang19 RUN set -eux; \ \ @@ -113,10 +113,10 @@ RUN set -eux; \ mv src/include/pg_config_manual.h.new src/include/pg_config_manual.h; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ \ -# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.21-stable&id=40544ade947bec1798edb0f749f4e967e842624b#n172 - export LLVM_CONFIG="/usr/lib/llvm15/bin/llvm-config"; \ -# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.21-stable&id=40544ade947bec1798edb0f749f4e967e842624b#n177 - export CLANG=clang-15; \ +# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.22-stable#n176 ("export LLVM_CONFIG") + export LLVM_CONFIG="/usr/lib/llvm19/bin/llvm-config"; \ +# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.22-stable#n180 ("older clang versions don't have a 'clang' exe anymore.") + export CLANG=clang-19; \ \ # configure options taken from: # https://anonscm.debian.org/cgit/pkg-postgresql/postgresql.git/tree/debian/rules?h=9.5 @@ -171,8 +171,7 @@ RUN set -eux; \ zstd \ # https://wiki.alpinelinux.org/wiki/Release_Notes_for_Alpine_3.16.0#ICU_data_split icu-data-full \ -# nss_wrapper is not availble on ppc64le: "test case segfaults in ppc64le" -# https://git.alpinelinux.org/aports/commit/testing/nss_wrapper/APKBUILD?h=3.17-stable&id=94d81ceeb58cff448d489bbcbe9a6d40c9991663 +# https://git.alpinelinux.org/aports/tree/community/nss_wrapper/APKBUILD?h=3.22-stable#n7 ("ppc64le: test case segfaults") $([ "$(apk --print-arch)" != 'ppc64le' ] && echo 'nss_wrapper') \ ; \ apk del --no-network .build-deps; \ diff --git a/16/alpine3.20/docker-ensure-initdb.sh b/16/alpine3.22/docker-ensure-initdb.sh similarity index 100% rename from 16/alpine3.20/docker-ensure-initdb.sh rename to 16/alpine3.22/docker-ensure-initdb.sh diff --git a/16/alpine3.20/docker-entrypoint.sh b/16/alpine3.22/docker-entrypoint.sh similarity index 100% rename from 16/alpine3.20/docker-entrypoint.sh rename to 16/alpine3.22/docker-entrypoint.sh diff --git a/17/alpine3.21/Dockerfile b/17/alpine3.21/Dockerfile index 9e4bf205bd..c3c81bd437 100644 --- a/17/alpine3.21/Dockerfile +++ b/17/alpine3.21/Dockerfile @@ -7,7 +7,7 @@ FROM alpine:3.21 # 70 is the standard uid/gid for "postgres" in Alpine -# https://git.alpinelinux.org/aports/tree/main/postgresql-common/postgresql-common.pre-install?h=3.21-stable +# https://git.alpinelinux.org/aports/tree/main/postgresql-common/postgresql-common.pre-install?h=3.22-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; \ @@ -112,9 +112,9 @@ RUN set -eux; \ mv src/include/pg_config_manual.h.new src/include/pg_config_manual.h; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ \ -# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.21-stable&id=40544ade947bec1798edb0f749f4e967e842624b#n172 +# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.22-stable#n176 ("export LLVM_CONFIG") export LLVM_CONFIG="/usr/lib/llvm19/bin/llvm-config"; \ -# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.21-stable&id=40544ade947bec1798edb0f749f4e967e842624b#n177 +# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.22-stable#n180 ("older clang versions don't have a 'clang' exe anymore.") export CLANG=clang-19; \ \ # configure options taken from: @@ -169,8 +169,7 @@ RUN set -eux; \ zstd \ # https://wiki.alpinelinux.org/wiki/Release_Notes_for_Alpine_3.16.0#ICU_data_split icu-data-full \ -# nss_wrapper is not availble on ppc64le: "test case segfaults in ppc64le" -# https://git.alpinelinux.org/aports/commit/testing/nss_wrapper/APKBUILD?h=3.17-stable&id=94d81ceeb58cff448d489bbcbe9a6d40c9991663 +# https://git.alpinelinux.org/aports/tree/community/nss_wrapper/APKBUILD?h=3.22-stable#n7 ("ppc64le: test case segfaults") $([ "$(apk --print-arch)" != 'ppc64le' ] && echo 'nss_wrapper') \ ; \ apk del --no-network .build-deps; \ diff --git a/17/alpine3.20/Dockerfile b/17/alpine3.22/Dockerfile similarity index 93% rename from 17/alpine3.20/Dockerfile rename to 17/alpine3.22/Dockerfile index bcf17f32a0..5c303bd7d0 100644 --- a/17/alpine3.20/Dockerfile +++ b/17/alpine3.22/Dockerfile @@ -4,10 +4,10 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.20 +FROM alpine:3.22 # 70 is the standard uid/gid for "postgres" in Alpine -# https://git.alpinelinux.org/aports/tree/main/postgresql-common/postgresql-common.pre-install?h=3.21-stable +# https://git.alpinelinux.org/aports/tree/main/postgresql-common/postgresql-common.pre-install?h=3.22-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; \ @@ -56,8 +56,8 @@ ENV PG_VERSION 17.5 ENV PG_SHA256 fcb7ab38e23b264d1902cb25e6adafb4525a6ebcbd015434aeef9eda80f528d8 ENV DOCKER_PG_LLVM_DEPS \ - llvm15-dev \ - clang15 + llvm19-dev \ + clang19 RUN set -eux; \ \ @@ -112,10 +112,10 @@ RUN set -eux; \ mv src/include/pg_config_manual.h.new src/include/pg_config_manual.h; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ \ -# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.21-stable&id=40544ade947bec1798edb0f749f4e967e842624b#n172 - export LLVM_CONFIG="/usr/lib/llvm15/bin/llvm-config"; \ -# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.21-stable&id=40544ade947bec1798edb0f749f4e967e842624b#n177 - export CLANG=clang-15; \ +# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.22-stable#n176 ("export LLVM_CONFIG") + export LLVM_CONFIG="/usr/lib/llvm19/bin/llvm-config"; \ +# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.22-stable#n180 ("older clang versions don't have a 'clang' exe anymore.") + export CLANG=clang-19; \ \ # configure options taken from: # https://anonscm.debian.org/cgit/pkg-postgresql/postgresql.git/tree/debian/rules?h=9.5 @@ -169,8 +169,7 @@ RUN set -eux; \ zstd \ # https://wiki.alpinelinux.org/wiki/Release_Notes_for_Alpine_3.16.0#ICU_data_split icu-data-full \ -# nss_wrapper is not availble on ppc64le: "test case segfaults in ppc64le" -# https://git.alpinelinux.org/aports/commit/testing/nss_wrapper/APKBUILD?h=3.17-stable&id=94d81ceeb58cff448d489bbcbe9a6d40c9991663 +# https://git.alpinelinux.org/aports/tree/community/nss_wrapper/APKBUILD?h=3.22-stable#n7 ("ppc64le: test case segfaults") $([ "$(apk --print-arch)" != 'ppc64le' ] && echo 'nss_wrapper') \ ; \ apk del --no-network .build-deps; \ diff --git a/17/alpine3.20/docker-ensure-initdb.sh b/17/alpine3.22/docker-ensure-initdb.sh similarity index 100% rename from 17/alpine3.20/docker-ensure-initdb.sh rename to 17/alpine3.22/docker-ensure-initdb.sh diff --git a/17/alpine3.20/docker-entrypoint.sh b/17/alpine3.22/docker-entrypoint.sh similarity index 100% rename from 17/alpine3.20/docker-entrypoint.sh rename to 17/alpine3.22/docker-entrypoint.sh diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index d0c90d18c8..29be5edb24 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -5,7 +5,7 @@ FROM alpine:{{ alpine_version }} # 70 is the standard uid/gid for "postgres" in Alpine -# https://git.alpinelinux.org/aports/tree/main/postgresql-common/postgresql-common.pre-install?h=3.21-stable +# https://git.alpinelinux.org/aports/tree/main/postgresql-common/postgresql-common.pre-install?h=3.22-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; \ @@ -58,11 +58,7 @@ ENV PG_SHA256 {{ .sha256 }} {{ def llvmver: - if alpine_version | split(".") | map(tonumber) < [3, 21] then - "15" - else - "19" - end + "19" -}} ENV DOCKER_PG_LLVM_DEPS \ llvm{{ llvmver }}-dev \ @@ -125,9 +121,9 @@ RUN set -eux; \ mv src/include/pg_config_manual.h.new src/include/pg_config_manual.h; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ \ -# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.21-stable&id=40544ade947bec1798edb0f749f4e967e842624b#n172 +# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.22-stable#n176 ("export LLVM_CONFIG") export LLVM_CONFIG="/usr/lib/llvm{{ llvmver }}/bin/llvm-config"; \ -# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.21-stable&id=40544ade947bec1798edb0f749f4e967e842624b#n177 +# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.22-stable#n180 ("older clang versions don't have a 'clang' exe anymore.") export CLANG=clang-{{ llvmver }}; \ \ # configure options taken from: @@ -195,8 +191,7 @@ RUN set -eux; \ zstd \ # https://wiki.alpinelinux.org/wiki/Release_Notes_for_Alpine_3.16.0#ICU_data_split icu-data-full \ -# nss_wrapper is not availble on ppc64le: "test case segfaults in ppc64le" -# https://git.alpinelinux.org/aports/commit/testing/nss_wrapper/APKBUILD?h=3.17-stable&id=94d81ceeb58cff448d489bbcbe9a6d40c9991663 +# https://git.alpinelinux.org/aports/tree/community/nss_wrapper/APKBUILD?h=3.22-stable#n7 ("ppc64le: test case segfaults") $([ "$(apk --print-arch)" != 'ppc64le' ] && echo 'nss_wrapper') \ ; \ apk del --no-network .build-deps; \ diff --git a/versions.json b/versions.json index 0c4bfb0d20..102381e55c 100644 --- a/versions.json +++ b/versions.json @@ -1,6 +1,6 @@ { "13": { - "alpine": "3.21", + "alpine": "3.22", "bookworm": { "arches": [ "amd64", @@ -23,13 +23,13 @@ "variants": [ "bookworm", "bullseye", - "alpine3.21", - "alpine3.20" + "alpine3.22", + "alpine3.21" ], "version": "13.21" }, "14": { - "alpine": "3.21", + "alpine": "3.22", "bookworm": { "arches": [ "amd64", @@ -52,13 +52,13 @@ "variants": [ "bookworm", "bullseye", - "alpine3.21", - "alpine3.20" + "alpine3.22", + "alpine3.21" ], "version": "14.18" }, "15": { - "alpine": "3.21", + "alpine": "3.22", "bookworm": { "arches": [ "amd64", @@ -81,13 +81,13 @@ "variants": [ "bookworm", "bullseye", - "alpine3.21", - "alpine3.20" + "alpine3.22", + "alpine3.21" ], "version": "15.13" }, "16": { - "alpine": "3.21", + "alpine": "3.22", "bookworm": { "arches": [ "amd64", @@ -110,13 +110,13 @@ "variants": [ "bookworm", "bullseye", - "alpine3.21", - "alpine3.20" + "alpine3.22", + "alpine3.21" ], "version": "16.9" }, "17": { - "alpine": "3.21", + "alpine": "3.22", "bookworm": { "arches": [ "amd64", @@ -139,8 +139,8 @@ "variants": [ "bookworm", "bullseye", - "alpine3.21", - "alpine3.20" + "alpine3.22", + "alpine3.21" ], "version": "17.5" } diff --git a/versions.sh b/versions.sh index ad83e2b000..f466ac57a9 100755 --- a/versions.sh +++ b/versions.sh @@ -7,8 +7,8 @@ supportedDebianSuites=( bullseye ) supportedAlpineVersions=( + 3.22 3.21 - 3.20 ) defaultDebianSuite="${supportedDebianSuites[0]}" declare -A debianSuites=(