-
Notifications
You must be signed in to change notification settings - Fork 2.4k
Update postgres #19175
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Update postgres #19175
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Changes: - docker-library/postgres@86e5040: Merge pull request docker-library/postgres#1342 from infosiftr/alpine3.22 - docker-library/postgres@172d9e7: Add Alpine 3.22 (remove Alpine 3.20)
Diff for 3b09e7a:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 89183fd..59afc04 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -6,15 +6,15 @@ Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
GitCommit: d9c4773ca5dc96692188c458f281d217d78b14d9
Directory: 13/bookworm
-Tags: 13.21-alpine3.20, 13-alpine3.20
+Tags: 13.21-alpine3.21, 13-alpine3.21
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: b23470265cc9c4bc283a88bf6c5054e3fca87c16
-Directory: 13/alpine3.20
+GitCommit: 172d9e7dbcff681ed65899f9bb01ba8bcc5fc063
+Directory: 13/alpine3.21
-Tags: 13.21-alpine3.21, 13-alpine3.21, 13.21-alpine, 13-alpine
+Tags: 13.21-alpine3.22, 13-alpine3.22, 13.21-alpine, 13-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: b23470265cc9c4bc283a88bf6c5054e3fca87c16
-Directory: 13/alpine3.21
+GitCommit: 172d9e7dbcff681ed65899f9bb01ba8bcc5fc063
+Directory: 13/alpine3.22
Tags: 13.21-bullseye, 13-bullseye
Architectures: amd64, arm32v7, arm64v8, i386
@@ -26,15 +26,15 @@ Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
GitCommit: d9c4773ca5dc96692188c458f281d217d78b14d9
Directory: 14/bookworm
-Tags: 14.18-alpine3.20, 14-alpine3.20
+Tags: 14.18-alpine3.21, 14-alpine3.21
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: b23470265cc9c4bc283a88bf6c5054e3fca87c16
-Directory: 14/alpine3.20
+GitCommit: 172d9e7dbcff681ed65899f9bb01ba8bcc5fc063
+Directory: 14/alpine3.21
-Tags: 14.18-alpine3.21, 14-alpine3.21, 14.18-alpine, 14-alpine
+Tags: 14.18-alpine3.22, 14-alpine3.22, 14.18-alpine, 14-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: b23470265cc9c4bc283a88bf6c5054e3fca87c16
-Directory: 14/alpine3.21
+GitCommit: 172d9e7dbcff681ed65899f9bb01ba8bcc5fc063
+Directory: 14/alpine3.22
Tags: 14.18-bullseye, 14-bullseye
Architectures: amd64, arm32v7, arm64v8, i386
@@ -46,15 +46,15 @@ Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
GitCommit: d9c4773ca5dc96692188c458f281d217d78b14d9
Directory: 15/bookworm
-Tags: 15.13-alpine3.20, 15-alpine3.20
+Tags: 15.13-alpine3.21, 15-alpine3.21
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: b23470265cc9c4bc283a88bf6c5054e3fca87c16
-Directory: 15/alpine3.20
+GitCommit: 172d9e7dbcff681ed65899f9bb01ba8bcc5fc063
+Directory: 15/alpine3.21
-Tags: 15.13-alpine3.21, 15-alpine3.21, 15.13-alpine, 15-alpine
+Tags: 15.13-alpine3.22, 15-alpine3.22, 15.13-alpine, 15-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: b23470265cc9c4bc283a88bf6c5054e3fca87c16
-Directory: 15/alpine3.21
+GitCommit: 172d9e7dbcff681ed65899f9bb01ba8bcc5fc063
+Directory: 15/alpine3.22
Tags: 15.13-bullseye, 15-bullseye
Architectures: amd64, arm32v7, arm64v8, i386
@@ -66,15 +66,15 @@ Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
GitCommit: d9c4773ca5dc96692188c458f281d217d78b14d9
Directory: 16/bookworm
-Tags: 16.9-alpine3.20, 16-alpine3.20
+Tags: 16.9-alpine3.21, 16-alpine3.21
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: b23470265cc9c4bc283a88bf6c5054e3fca87c16
-Directory: 16/alpine3.20
+GitCommit: 172d9e7dbcff681ed65899f9bb01ba8bcc5fc063
+Directory: 16/alpine3.21
-Tags: 16.9-alpine3.21, 16-alpine3.21, 16.9-alpine, 16-alpine
+Tags: 16.9-alpine3.22, 16-alpine3.22, 16.9-alpine, 16-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: b23470265cc9c4bc283a88bf6c5054e3fca87c16
-Directory: 16/alpine3.21
+GitCommit: 172d9e7dbcff681ed65899f9bb01ba8bcc5fc063
+Directory: 16/alpine3.22
Tags: 16.9-bullseye, 16-bullseye
Architectures: amd64, arm32v7, arm64v8, i386
@@ -86,15 +86,15 @@ Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
GitCommit: d9c4773ca5dc96692188c458f281d217d78b14d9
Directory: 17/bookworm
-Tags: 17.5-alpine3.20, 17-alpine3.20, alpine3.20
+Tags: 17.5-alpine3.21, 17-alpine3.21, alpine3.21
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: b23470265cc9c4bc283a88bf6c5054e3fca87c16
-Directory: 17/alpine3.20
+GitCommit: 172d9e7dbcff681ed65899f9bb01ba8bcc5fc063
+Directory: 17/alpine3.21
-Tags: 17.5-alpine3.21, 17-alpine3.21, alpine3.21, 17.5-alpine, 17-alpine, alpine
+Tags: 17.5-alpine3.22, 17-alpine3.22, alpine3.22, 17.5-alpine, 17-alpine, alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: b23470265cc9c4bc283a88bf6c5054e3fca87c16
-Directory: 17/alpine3.21
+GitCommit: 172d9e7dbcff681ed65899f9bb01ba8bcc5fc063
+Directory: 17/alpine3.22
Tags: 17.5-bullseye, 17-bullseye, bullseye
Architectures: amd64, arm32v7, arm64v8, i386
diff --git a/_bashbrew-list b/_bashbrew-list
index 10a8105..c11ecb5 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,66 +1,66 @@
postgres:13
postgres:13-alpine
-postgres:13-alpine3.20
postgres:13-alpine3.21
+postgres:13-alpine3.22
postgres:13-bookworm
postgres:13-bullseye
postgres:13.21
postgres:13.21-alpine
-postgres:13.21-alpine3.20
postgres:13.21-alpine3.21
+postgres:13.21-alpine3.22
postgres:13.21-bookworm
postgres:13.21-bullseye
postgres:14
postgres:14-alpine
-postgres:14-alpine3.20
postgres:14-alpine3.21
+postgres:14-alpine3.22
postgres:14-bookworm
postgres:14-bullseye
postgres:14.18
postgres:14.18-alpine
-postgres:14.18-alpine3.20
postgres:14.18-alpine3.21
+postgres:14.18-alpine3.22
postgres:14.18-bookworm
postgres:14.18-bullseye
postgres:15
postgres:15-alpine
-postgres:15-alpine3.20
postgres:15-alpine3.21
+postgres:15-alpine3.22
postgres:15-bookworm
postgres:15-bullseye
postgres:15.13
postgres:15.13-alpine
-postgres:15.13-alpine3.20
postgres:15.13-alpine3.21
+postgres:15.13-alpine3.22
postgres:15.13-bookworm
postgres:15.13-bullseye
postgres:16
postgres:16-alpine
-postgres:16-alpine3.20
postgres:16-alpine3.21
+postgres:16-alpine3.22
postgres:16-bookworm
postgres:16-bullseye
postgres:16.9
postgres:16.9-alpine
-postgres:16.9-alpine3.20
postgres:16.9-alpine3.21
+postgres:16.9-alpine3.22
postgres:16.9-bookworm
postgres:16.9-bullseye
postgres:17
postgres:17-alpine
-postgres:17-alpine3.20
postgres:17-alpine3.21
+postgres:17-alpine3.22
postgres:17-bookworm
postgres:17-bullseye
postgres:17.5
postgres:17.5-alpine
-postgres:17.5-alpine3.20
postgres:17.5-alpine3.21
+postgres:17.5-alpine3.22
postgres:17.5-bookworm
postgres:17.5-bullseye
postgres:alpine
-postgres:alpine3.20
postgres:alpine3.21
+postgres:alpine3.22
postgres:bookworm
postgres:bullseye
postgres:latest
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 7d96dba..5c69527 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,20 +1,20 @@
postgres:13-alpine
-postgres:13-alpine3.20
+postgres:13-alpine3.21
postgres:13-bookworm
postgres:13-bullseye
postgres:14-alpine
-postgres:14-alpine3.20
+postgres:14-alpine3.21
postgres:14-bookworm
postgres:14-bullseye
postgres:15-alpine
-postgres:15-alpine3.20
+postgres:15-alpine3.21
postgres:15-bookworm
postgres:15-bullseye
postgres:16-alpine
-postgres:16-alpine3.20
+postgres:16-alpine3.21
postgres:16-bookworm
postgres:16-bullseye
postgres:alpine
-postgres:alpine3.20
+postgres:alpine3.21
postgres:bookworm
postgres:bullseye
diff --git a/postgres_13-alpine/Dockerfile b/postgres_13-alpine/Dockerfile
index 50a4752..ece37e9 100644
--- a/postgres_13-alpine/Dockerfile
+++ b/postgres_13-alpine/Dockerfile
@@ -4,10 +4,10 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM alpine:3.21
+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; \
@@ -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/postgres_13-alpine3.20/Dockerfile b/postgres_13-alpine3.21/Dockerfile
similarity index 93%
rename from postgres_13-alpine3.20/Dockerfile
rename to postgres_13-alpine3.21/Dockerfile
index a2f5e09..c79dfd0 100644
--- a/postgres_13-alpine3.20/Dockerfile
+++ b/postgres_13-alpine3.21/Dockerfile
@@ -4,10 +4,10 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM alpine:3.20
+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; \
@@ -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/postgres_13-alpine3.20/docker-ensure-initdb.sh b/postgres_13-alpine3.21/docker-ensure-initdb.sh
similarity index 100%
rename from postgres_13-alpine3.20/docker-ensure-initdb.sh
rename to postgres_13-alpine3.21/docker-ensure-initdb.sh
diff --git a/postgres_13-alpine3.20/docker-entrypoint.sh b/postgres_13-alpine3.21/docker-entrypoint.sh
similarity index 100%
rename from postgres_13-alpine3.20/docker-entrypoint.sh
rename to postgres_13-alpine3.21/docker-entrypoint.sh
diff --git a/postgres_14-alpine/Dockerfile b/postgres_14-alpine/Dockerfile
index 82d8aeb..238930e 100644
--- a/postgres_14-alpine/Dockerfile
+++ b/postgres_14-alpine/Dockerfile
@@ -4,10 +4,10 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM alpine:3.21
+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; \
@@ -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/postgres_14-alpine3.20/Dockerfile b/postgres_14-alpine3.21/Dockerfile
similarity index 93%
rename from postgres_14-alpine3.20/Dockerfile
rename to postgres_14-alpine3.21/Dockerfile
index 9afc070..49eb44c 100644
--- a/postgres_14-alpine3.20/Dockerfile
+++ b/postgres_14-alpine3.21/Dockerfile
@@ -4,10 +4,10 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM alpine:3.20
+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; \
@@ -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/postgres_14-alpine3.20/docker-ensure-initdb.sh b/postgres_14-alpine3.21/docker-ensure-initdb.sh
similarity index 100%
rename from postgres_14-alpine3.20/docker-ensure-initdb.sh
rename to postgres_14-alpine3.21/docker-ensure-initdb.sh
diff --git a/postgres_14-alpine3.20/docker-entrypoint.sh b/postgres_14-alpine3.21/docker-entrypoint.sh
similarity index 100%
rename from postgres_14-alpine3.20/docker-entrypoint.sh
rename to postgres_14-alpine3.21/docker-entrypoint.sh
diff --git a/postgres_15-alpine/Dockerfile b/postgres_15-alpine/Dockerfile
index 203cab4..201065d 100644
--- a/postgres_15-alpine/Dockerfile
+++ b/postgres_15-alpine/Dockerfile
@@ -4,10 +4,10 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM alpine:3.21
+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; \
@@ -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/postgres_15-alpine3.20/Dockerfile b/postgres_15-alpine3.21/Dockerfile
similarity index 93%
rename from postgres_15-alpine3.20/Dockerfile
rename to postgres_15-alpine3.21/Dockerfile
index 9fcb077..91ab89c 100644
--- a/postgres_15-alpine3.20/Dockerfile
+++ b/postgres_15-alpine3.21/Dockerfile
@@ -4,10 +4,10 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM alpine:3.20
+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; \
@@ -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/postgres_15-alpine3.20/docker-ensure-initdb.sh b/postgres_15-alpine3.21/docker-ensure-initdb.sh
similarity index 100%
rename from postgres_15-alpine3.20/docker-ensure-initdb.sh
rename to postgres_15-alpine3.21/docker-ensure-initdb.sh
diff --git a/postgres_15-alpine3.20/docker-entrypoint.sh b/postgres_15-alpine3.21/docker-entrypoint.sh
similarity index 100%
rename from postgres_15-alpine3.20/docker-entrypoint.sh
rename to postgres_15-alpine3.21/docker-entrypoint.sh
diff --git a/postgres_16-alpine/Dockerfile b/postgres_16-alpine/Dockerfile
index 21f38d7..902de75 100644
--- a/postgres_16-alpine/Dockerfile
+++ b/postgres_16-alpine/Dockerfile
@@ -4,10 +4,10 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM alpine:3.21
+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; \
@@ -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/postgres_16-alpine3.20/Dockerfile b/postgres_16-alpine3.21/Dockerfile
similarity index 93%
rename from postgres_16-alpine3.20/Dockerfile
rename to postgres_16-alpine3.21/Dockerfile
index 6095fa9..1bf2cab 100644
--- a/postgres_16-alpine3.20/Dockerfile
+++ b/postgres_16-alpine3.21/Dockerfile
@@ -4,10 +4,10 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM alpine:3.20
+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; \
@@ -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/postgres_16-alpine3.20/docker-ensure-initdb.sh b/postgres_16-alpine3.21/docker-ensure-initdb.sh
similarity index 100%
rename from postgres_16-alpine3.20/docker-ensure-initdb.sh
rename to postgres_16-alpine3.21/docker-ensure-initdb.sh
diff --git a/postgres_16-alpine3.20/docker-entrypoint.sh b/postgres_16-alpine3.21/docker-entrypoint.sh
similarity index 100%
rename from postgres_16-alpine3.20/docker-entrypoint.sh
rename to postgres_16-alpine3.21/docker-entrypoint.sh
diff --git a/postgres_alpine/Dockerfile b/postgres_alpine/Dockerfile
index 9e4bf20..5c303bd 100644
--- a/postgres_alpine/Dockerfile
+++ b/postgres_alpine/Dockerfile
@@ -4,10 +4,10 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM alpine:3.21
+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; \
@@ -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/postgres_alpine3.20/Dockerfile b/postgres_alpine3.21/Dockerfile
similarity index 93%
rename from postgres_alpine3.20/Dockerfile
rename to postgres_alpine3.21/Dockerfile
index bcf17f3..c3c81bd 100644
--- a/postgres_alpine3.20/Dockerfile
+++ b/postgres_alpine3.21/Dockerfile
@@ -4,10 +4,10 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM alpine:3.20
+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; \
@@ -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/postgres_alpine3.20/docker-ensure-initdb.sh b/postgres_alpine3.21/docker-ensure-initdb.sh
similarity index 100%
rename from postgres_alpine3.20/docker-ensure-initdb.sh
rename to postgres_alpine3.21/docker-ensure-initdb.sh
diff --git a/postgres_alpine3.20/docker-entrypoint.sh b/postgres_alpine3.21/docker-entrypoint.sh
similarity index 100%
rename from postgres_alpine3.20/docker-entrypoint.sh
rename to postgres_alpine3.21/docker-entrypoint.sh Relevant Maintainers: |
tianon
approved these changes
Jun 2, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes: