Skip to content
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

Update postgres #18050

Merged
merged 1 commit into from
Dec 9, 2024
Merged

Conversation

tianon
Copy link
Member

@tianon tianon commented Dec 9, 2024

Changes:

Changes:

- docker-library/postgres@1577814: Merge pull request docker-library/postgres#1299 from infosiftr/alpine
- docker-library/postgres@17818f2: In Alpine 3.21 bump llvm version
- docker-library/postgres@0f542bc: Merge pull request docker-library/postgres#1298 from paolobarbolini/alpine3.21
- docker-library/postgres@1075ab7: Update Alpine to 3.21
@tianon tianon requested a review from a team as a code owner December 9, 2024 17:52
Copy link

github-actions bot commented Dec 9, 2024

Diff for 8659c92:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 7fe9e06..b7cf979 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -6,16 +6,16 @@ Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: 5f590b8df7f12270d1d5227758744ca3b0bdef74
 Directory: 12/bookworm
 
-Tags: 12.22-alpine3.19, 12-alpine3.19
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 5f590b8df7f12270d1d5227758744ca3b0bdef74
-Directory: 12/alpine3.19
-
-Tags: 12.22-alpine3.20, 12-alpine3.20, 12.22-alpine, 12-alpine
+Tags: 12.22-alpine3.20, 12-alpine3.20
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 5f590b8df7f12270d1d5227758744ca3b0bdef74
+GitCommit: 17818f21dca10ccf02711476e138c219bd31b456
 Directory: 12/alpine3.20
 
+Tags: 12.22-alpine3.21, 12-alpine3.21, 12.22-alpine, 12-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 17818f21dca10ccf02711476e138c219bd31b456
+Directory: 12/alpine3.21
+
 Tags: 12.22-bullseye, 12-bullseye
 Architectures: amd64, arm32v7, arm64v8, i386
 GitCommit: 5f590b8df7f12270d1d5227758744ca3b0bdef74
@@ -26,16 +26,16 @@ Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: 9fadd0e250ba0c150dafec9e3c8728de3c8e318f
 Directory: 13/bookworm
 
-Tags: 13.18-alpine3.19, 13-alpine3.19
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 9fadd0e250ba0c150dafec9e3c8728de3c8e318f
-Directory: 13/alpine3.19
-
-Tags: 13.18-alpine3.20, 13-alpine3.20, 13.18-alpine, 13-alpine
+Tags: 13.18-alpine3.20, 13-alpine3.20
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 9fadd0e250ba0c150dafec9e3c8728de3c8e318f
+GitCommit: 17818f21dca10ccf02711476e138c219bd31b456
 Directory: 13/alpine3.20
 
+Tags: 13.18-alpine3.21, 13-alpine3.21, 13.18-alpine, 13-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 17818f21dca10ccf02711476e138c219bd31b456
+Directory: 13/alpine3.21
+
 Tags: 13.18-bullseye, 13-bullseye
 Architectures: amd64, arm32v7, arm64v8, i386
 GitCommit: 9fadd0e250ba0c150dafec9e3c8728de3c8e318f
@@ -46,16 +46,16 @@ Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: c44484583320c81b35824ec0ce16864690d68bc3
 Directory: 14/bookworm
 
-Tags: 14.15-alpine3.19, 14-alpine3.19
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: c44484583320c81b35824ec0ce16864690d68bc3
-Directory: 14/alpine3.19
-
-Tags: 14.15-alpine3.20, 14-alpine3.20, 14.15-alpine, 14-alpine
+Tags: 14.15-alpine3.20, 14-alpine3.20
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: c44484583320c81b35824ec0ce16864690d68bc3
+GitCommit: 17818f21dca10ccf02711476e138c219bd31b456
 Directory: 14/alpine3.20
 
+Tags: 14.15-alpine3.21, 14-alpine3.21, 14.15-alpine, 14-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 17818f21dca10ccf02711476e138c219bd31b456
+Directory: 14/alpine3.21
+
 Tags: 14.15-bullseye, 14-bullseye
 Architectures: amd64, arm32v7, arm64v8, i386
 GitCommit: c44484583320c81b35824ec0ce16864690d68bc3
@@ -66,16 +66,16 @@ Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: 50b4cdb50e3599013f2fce9cd8860600f53c696c
 Directory: 15/bookworm
 
-Tags: 15.10-alpine3.19, 15-alpine3.19
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 50b4cdb50e3599013f2fce9cd8860600f53c696c
-Directory: 15/alpine3.19
-
-Tags: 15.10-alpine3.20, 15-alpine3.20, 15.10-alpine, 15-alpine
+Tags: 15.10-alpine3.20, 15-alpine3.20
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 50b4cdb50e3599013f2fce9cd8860600f53c696c
+GitCommit: 17818f21dca10ccf02711476e138c219bd31b456
 Directory: 15/alpine3.20
 
+Tags: 15.10-alpine3.21, 15-alpine3.21, 15.10-alpine, 15-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 17818f21dca10ccf02711476e138c219bd31b456
+Directory: 15/alpine3.21
+
 Tags: 15.10-bullseye, 15-bullseye
 Architectures: amd64, arm32v7, arm64v8, i386
 GitCommit: 50b4cdb50e3599013f2fce9cd8860600f53c696c
@@ -86,16 +86,16 @@ Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: 960ebdf14ef92d328588e77af2a879c63e577e96
 Directory: 16/bookworm
 
-Tags: 16.6-alpine3.19, 16-alpine3.19
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 960ebdf14ef92d328588e77af2a879c63e577e96
-Directory: 16/alpine3.19
-
-Tags: 16.6-alpine3.20, 16-alpine3.20, 16.6-alpine, 16-alpine
+Tags: 16.6-alpine3.20, 16-alpine3.20
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 960ebdf14ef92d328588e77af2a879c63e577e96
+GitCommit: 17818f21dca10ccf02711476e138c219bd31b456
 Directory: 16/alpine3.20
 
+Tags: 16.6-alpine3.21, 16-alpine3.21, 16.6-alpine, 16-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 17818f21dca10ccf02711476e138c219bd31b456
+Directory: 16/alpine3.21
+
 Tags: 16.6-bullseye, 16-bullseye
 Architectures: amd64, arm32v7, arm64v8, i386
 GitCommit: 960ebdf14ef92d328588e77af2a879c63e577e96
@@ -106,16 +106,16 @@ Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: 0b87a9bbd23f56b1e9e863ecda5cc9e66416c4e0
 Directory: 17/bookworm
 
-Tags: 17.2-alpine3.19, 17-alpine3.19, alpine3.19
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 0b87a9bbd23f56b1e9e863ecda5cc9e66416c4e0
-Directory: 17/alpine3.19
-
-Tags: 17.2-alpine3.20, 17-alpine3.20, alpine3.20, 17.2-alpine, 17-alpine, alpine
+Tags: 17.2-alpine3.20, 17-alpine3.20, alpine3.20
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 0b87a9bbd23f56b1e9e863ecda5cc9e66416c4e0
+GitCommit: 17818f21dca10ccf02711476e138c219bd31b456
 Directory: 17/alpine3.20
 
+Tags: 17.2-alpine3.21, 17-alpine3.21, alpine3.21, 17.2-alpine, 17-alpine, alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 17818f21dca10ccf02711476e138c219bd31b456
+Directory: 17/alpine3.21
+
 Tags: 17.2-bullseye, 17-bullseye, bullseye
 Architectures: amd64, arm32v7, arm64v8, i386
 GitCommit: 0b87a9bbd23f56b1e9e863ecda5cc9e66416c4e0
diff --git a/_bashbrew-list b/_bashbrew-list
index 4dd99a6..ca8f43b 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,78 +1,78 @@
 postgres:12
 postgres:12-alpine
-postgres:12-alpine3.19
 postgres:12-alpine3.20
+postgres:12-alpine3.21
 postgres:12-bookworm
 postgres:12-bullseye
 postgres:12.22
 postgres:12.22-alpine
-postgres:12.22-alpine3.19
 postgres:12.22-alpine3.20
+postgres:12.22-alpine3.21
 postgres:12.22-bookworm
 postgres:12.22-bullseye
 postgres:13
 postgres:13-alpine
-postgres:13-alpine3.19
 postgres:13-alpine3.20
+postgres:13-alpine3.21
 postgres:13-bookworm
 postgres:13-bullseye
 postgres:13.18
 postgres:13.18-alpine
-postgres:13.18-alpine3.19
 postgres:13.18-alpine3.20
+postgres:13.18-alpine3.21
 postgres:13.18-bookworm
 postgres:13.18-bullseye
 postgres:14
 postgres:14-alpine
-postgres:14-alpine3.19
 postgres:14-alpine3.20
+postgres:14-alpine3.21
 postgres:14-bookworm
 postgres:14-bullseye
 postgres:14.15
 postgres:14.15-alpine
-postgres:14.15-alpine3.19
 postgres:14.15-alpine3.20
+postgres:14.15-alpine3.21
 postgres:14.15-bookworm
 postgres:14.15-bullseye
 postgres:15
 postgres:15-alpine
-postgres:15-alpine3.19
 postgres:15-alpine3.20
+postgres:15-alpine3.21
 postgres:15-bookworm
 postgres:15-bullseye
 postgres:15.10
 postgres:15.10-alpine
-postgres:15.10-alpine3.19
 postgres:15.10-alpine3.20
+postgres:15.10-alpine3.21
 postgres:15.10-bookworm
 postgres:15.10-bullseye
 postgres:16
 postgres:16-alpine
-postgres:16-alpine3.19
 postgres:16-alpine3.20
+postgres:16-alpine3.21
 postgres:16-bookworm
 postgres:16-bullseye
 postgres:16.6
 postgres:16.6-alpine
-postgres:16.6-alpine3.19
 postgres:16.6-alpine3.20
+postgres:16.6-alpine3.21
 postgres:16.6-bookworm
 postgres:16.6-bullseye
 postgres:17
 postgres:17-alpine
-postgres:17-alpine3.19
 postgres:17-alpine3.20
+postgres:17-alpine3.21
 postgres:17-bookworm
 postgres:17-bullseye
 postgres:17.2
 postgres:17.2-alpine
-postgres:17.2-alpine3.19
 postgres:17.2-alpine3.20
+postgres:17.2-alpine3.21
 postgres:17.2-bookworm
 postgres:17.2-bullseye
 postgres:alpine
-postgres:alpine3.19
 postgres:alpine3.20
+postgres:alpine3.21
 postgres:bookworm
 postgres:bullseye
 postgres:latest
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 650a667..507ea9b 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,24 +1,24 @@
 postgres:12-alpine
-postgres:12-alpine3.19
+postgres:12-alpine3.20
 postgres:12-bookworm
 postgres:12-bullseye
 postgres:13-alpine
-postgres:13-alpine3.19
+postgres:13-alpine3.20
 postgres:13-bookworm
 postgres:13-bullseye
 postgres:14-alpine
-postgres:14-alpine3.19
+postgres:14-alpine3.20
 postgres:14-bookworm
 postgres:14-bullseye
 postgres:15-alpine
-postgres:15-alpine3.19
+postgres:15-alpine3.20
 postgres:15-bookworm
 postgres:15-bullseye
 postgres:16-alpine
-postgres:16-alpine3.19
+postgres:16-alpine3.20
 postgres:16-bookworm
 postgres:16-bullseye
 postgres:alpine
-postgres:alpine3.19
+postgres:alpine3.20
 postgres:bookworm
 postgres:bullseye
diff --git a/postgres_12-alpine/Dockerfile b/postgres_12-alpine/Dockerfile
index 3f1e87e..636e771 100644
--- a/postgres_12-alpine/Dockerfile
+++ b/postgres_12-alpine/Dockerfile
@@ -4,7 +4,7 @@
 # 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/postgresql.pre-install?h=3.12-stable
@@ -57,8 +57,8 @@ ENV PG_VERSION 12.22
 ENV PG_SHA256 8df3c0474782589d3c6f374b5133b1bd14d168086edbc13c6e72e67dd4527a3b
 
 ENV DOCKER_PG_LLVM_DEPS \
-		llvm15-dev \
-		clang15
+		llvm19-dev \
+		clang19
 
 RUN set -eux; \
 	\
@@ -112,10 +112,10 @@ RUN set -eux; \
 	wget -O config/config.guess 'https://git.savannah.gnu.org/cgit/config.git/plain/config.guess?id=7d3d27baf8107b630586c962c057e22149653deb'; \
 	wget -O config/config.sub 'https://git.savannah.gnu.org/cgit/config.git/plain/config.sub?id=7d3d27baf8107b630586c962c057e22149653deb'; \
 	\
-# https://git.alpinelinux.org/aports/tree/community/postgresql12/APKBUILD?h=3.18-stable&id=a470294e6d6ca7059e41c54769b7c3c26ec901d4#n158
-	export LLVM_CONFIG="/usr/lib/llvm15/bin/llvm-config"; \
-# https://git.alpinelinux.org/aports/tree/community/postgresql12/APKBUILD?h=3.18-stable&id=a470294e6d6ca7059e41c54769b7c3c26ec901d4#n163
-	export CLANG=clang-15; \
+# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.21-stable&id=40544ade947bec1798edb0f749f4e967e842624b#n172
+	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
+	export CLANG=clang-19; \
 	\
 # configure options taken from:
 # https://anonscm.debian.org/cgit/pkg-postgresql/postgresql.git/tree/debian/rules?h=9.5
diff --git a/postgres_12-alpine3.19/Dockerfile b/postgres_12-alpine3.20/Dockerfile
similarity index 96%
rename from postgres_12-alpine3.19/Dockerfile
rename to postgres_12-alpine3.20/Dockerfile
index 21aaff4..acd5d9a 100644
--- a/postgres_12-alpine3.19/Dockerfile
+++ b/postgres_12-alpine3.20/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.19
+FROM alpine:3.20
 
 # 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
@@ -112,9 +112,9 @@ RUN set -eux; \
 	wget -O config/config.guess 'https://git.savannah.gnu.org/cgit/config.git/plain/config.guess?id=7d3d27baf8107b630586c962c057e22149653deb'; \
 	wget -O config/config.sub 'https://git.savannah.gnu.org/cgit/config.git/plain/config.sub?id=7d3d27baf8107b630586c962c057e22149653deb'; \
 	\
-# https://git.alpinelinux.org/aports/tree/community/postgresql12/APKBUILD?h=3.18-stable&id=a470294e6d6ca7059e41c54769b7c3c26ec901d4#n158
+# 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/postgresql12/APKBUILD?h=3.18-stable&id=a470294e6d6ca7059e41c54769b7c3c26ec901d4#n163
+# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.21-stable&id=40544ade947bec1798edb0f749f4e967e842624b#n177
 	export CLANG=clang-15; \
 	\
 # configure options taken from:
diff --git a/postgres_12-alpine3.19/docker-ensure-initdb.sh b/postgres_12-alpine3.20/docker-ensure-initdb.sh
similarity index 100%
rename from postgres_12-alpine3.19/docker-ensure-initdb.sh
rename to postgres_12-alpine3.20/docker-ensure-initdb.sh
diff --git a/postgres_12-alpine3.19/docker-entrypoint.sh b/postgres_12-alpine3.20/docker-entrypoint.sh
similarity index 100%
rename from postgres_12-alpine3.19/docker-entrypoint.sh
rename to postgres_12-alpine3.20/docker-entrypoint.sh
diff --git a/postgres_13-alpine/Dockerfile b/postgres_13-alpine/Dockerfile
index a4d1cf3..1adc2f8 100644
--- a/postgres_13-alpine/Dockerfile
+++ b/postgres_13-alpine/Dockerfile
@@ -4,7 +4,7 @@
 # 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/postgresql.pre-install?h=3.12-stable
@@ -57,8 +57,8 @@ ENV PG_VERSION 13.18
 ENV PG_SHA256 ceea92abee2a8c19408d278b68de6a78b6bd3dbb4fa2d653fa7ca745d666aab1
 
 ENV DOCKER_PG_LLVM_DEPS \
-		llvm15-dev \
-		clang15
+		llvm19-dev \
+		clang19
 
 RUN set -eux; \
 	\
@@ -112,10 +112,10 @@ RUN set -eux; \
 	wget -O config/config.guess 'https://git.savannah.gnu.org/cgit/config.git/plain/config.guess?id=7d3d27baf8107b630586c962c057e22149653deb'; \
 	wget -O config/config.sub 'https://git.savannah.gnu.org/cgit/config.git/plain/config.sub?id=7d3d27baf8107b630586c962c057e22149653deb'; \
 	\
-# https://git.alpinelinux.org/aports/tree/community/postgresql12/APKBUILD?h=3.18-stable&id=a470294e6d6ca7059e41c54769b7c3c26ec901d4#n158
-	export LLVM_CONFIG="/usr/lib/llvm15/bin/llvm-config"; \
-# https://git.alpinelinux.org/aports/tree/community/postgresql12/APKBUILD?h=3.18-stable&id=a470294e6d6ca7059e41c54769b7c3c26ec901d4#n163
-	export CLANG=clang-15; \
+# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.21-stable&id=40544ade947bec1798edb0f749f4e967e842624b#n172
+	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
+	export CLANG=clang-19; \
 	\
 # configure options taken from:
 # https://anonscm.debian.org/cgit/pkg-postgresql/postgresql.git/tree/debian/rules?h=9.5
diff --git a/postgres_13-alpine3.19/Dockerfile b/postgres_13-alpine3.20/Dockerfile
similarity index 96%
rename from postgres_13-alpine3.19/Dockerfile
rename to postgres_13-alpine3.20/Dockerfile
index 43c805a..3d694c3 100644
--- a/postgres_13-alpine3.19/Dockerfile
+++ b/postgres_13-alpine3.20/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.19
+FROM alpine:3.20
 
 # 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
@@ -112,9 +112,9 @@ RUN set -eux; \
 	wget -O config/config.guess 'https://git.savannah.gnu.org/cgit/config.git/plain/config.guess?id=7d3d27baf8107b630586c962c057e22149653deb'; \
 	wget -O config/config.sub 'https://git.savannah.gnu.org/cgit/config.git/plain/config.sub?id=7d3d27baf8107b630586c962c057e22149653deb'; \
 	\
-# https://git.alpinelinux.org/aports/tree/community/postgresql12/APKBUILD?h=3.18-stable&id=a470294e6d6ca7059e41c54769b7c3c26ec901d4#n158
+# 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/postgresql12/APKBUILD?h=3.18-stable&id=a470294e6d6ca7059e41c54769b7c3c26ec901d4#n163
+# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.21-stable&id=40544ade947bec1798edb0f749f4e967e842624b#n177
 	export CLANG=clang-15; \
 	\
 # configure options taken from:
diff --git a/postgres_13-alpine3.19/docker-ensure-initdb.sh b/postgres_13-alpine3.20/docker-ensure-initdb.sh
similarity index 100%
rename from postgres_13-alpine3.19/docker-ensure-initdb.sh
rename to postgres_13-alpine3.20/docker-ensure-initdb.sh
diff --git a/postgres_13-alpine3.19/docker-entrypoint.sh b/postgres_13-alpine3.20/docker-entrypoint.sh
similarity index 100%
rename from postgres_13-alpine3.19/docker-entrypoint.sh
rename to postgres_13-alpine3.20/docker-entrypoint.sh
diff --git a/postgres_14-alpine/Dockerfile b/postgres_14-alpine/Dockerfile
index 2af8d82..46e0f73 100644
--- a/postgres_14-alpine/Dockerfile
+++ b/postgres_14-alpine/Dockerfile
@@ -4,7 +4,7 @@
 # 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/postgresql.pre-install?h=3.12-stable
@@ -57,8 +57,8 @@ ENV PG_VERSION 14.15
 ENV PG_SHA256 02e891e314b4e9ee24cbd78028dab7c73f9c1ba3e30835bcbef71fe220401fc5
 
 ENV DOCKER_PG_LLVM_DEPS \
-		llvm15-dev \
-		clang15
+		llvm19-dev \
+		clang19
 
 RUN set -eux; \
 	\
@@ -114,10 +114,10 @@ RUN set -eux; \
 	wget -O config/config.guess 'https://git.savannah.gnu.org/cgit/config.git/plain/config.guess?id=7d3d27baf8107b630586c962c057e22149653deb'; \
 	wget -O config/config.sub 'https://git.savannah.gnu.org/cgit/config.git/plain/config.sub?id=7d3d27baf8107b630586c962c057e22149653deb'; \
 	\
-# https://git.alpinelinux.org/aports/tree/community/postgresql12/APKBUILD?h=3.18-stable&id=a470294e6d6ca7059e41c54769b7c3c26ec901d4#n158
-	export LLVM_CONFIG="/usr/lib/llvm15/bin/llvm-config"; \
-# https://git.alpinelinux.org/aports/tree/community/postgresql12/APKBUILD?h=3.18-stable&id=a470294e6d6ca7059e41c54769b7c3c26ec901d4#n163
-	export CLANG=clang-15; \
+# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.21-stable&id=40544ade947bec1798edb0f749f4e967e842624b#n172
+	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
+	export CLANG=clang-19; \
 	\
 # configure options taken from:
 # https://anonscm.debian.org/cgit/pkg-postgresql/postgresql.git/tree/debian/rules?h=9.5
diff --git a/postgres_14-alpine3.19/Dockerfile b/postgres_14-alpine3.20/Dockerfile
similarity index 96%
rename from postgres_14-alpine3.19/Dockerfile
rename to postgres_14-alpine3.20/Dockerfile
index 4cf84a3..98f6b30 100644
--- a/postgres_14-alpine3.19/Dockerfile
+++ b/postgres_14-alpine3.20/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.19
+FROM alpine:3.20
 
 # 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
@@ -114,9 +114,9 @@ RUN set -eux; \
 	wget -O config/config.guess 'https://git.savannah.gnu.org/cgit/config.git/plain/config.guess?id=7d3d27baf8107b630586c962c057e22149653deb'; \
 	wget -O config/config.sub 'https://git.savannah.gnu.org/cgit/config.git/plain/config.sub?id=7d3d27baf8107b630586c962c057e22149653deb'; \
 	\
-# https://git.alpinelinux.org/aports/tree/community/postgresql12/APKBUILD?h=3.18-stable&id=a470294e6d6ca7059e41c54769b7c3c26ec901d4#n158
+# 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/postgresql12/APKBUILD?h=3.18-stable&id=a470294e6d6ca7059e41c54769b7c3c26ec901d4#n163
+# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.21-stable&id=40544ade947bec1798edb0f749f4e967e842624b#n177
 	export CLANG=clang-15; \
 	\
 # configure options taken from:
diff --git a/postgres_14-alpine3.19/docker-ensure-initdb.sh b/postgres_14-alpine3.20/docker-ensure-initdb.sh
similarity index 100%
rename from postgres_14-alpine3.19/docker-ensure-initdb.sh
rename to postgres_14-alpine3.20/docker-ensure-initdb.sh
diff --git a/postgres_14-alpine3.19/docker-entrypoint.sh b/postgres_14-alpine3.20/docker-entrypoint.sh
similarity index 100%
rename from postgres_14-alpine3.19/docker-entrypoint.sh
rename to postgres_14-alpine3.20/docker-entrypoint.sh
diff --git a/postgres_15-alpine/Dockerfile b/postgres_15-alpine/Dockerfile
index effc59a..cd3c8c0 100644
--- a/postgres_15-alpine/Dockerfile
+++ b/postgres_15-alpine/Dockerfile
@@ -4,7 +4,7 @@
 # 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/postgresql.pre-install?h=3.12-stable
@@ -57,8 +57,8 @@ ENV PG_VERSION 15.10
 ENV PG_SHA256 55abe738d441f0e58658b3ec6f88097a713b5e3b73139f6230d7b5c4c389e573
 
 ENV DOCKER_PG_LLVM_DEPS \
-		llvm15-dev \
-		clang15
+		llvm19-dev \
+		clang19
 
 RUN set -eux; \
 	\
@@ -116,10 +116,10 @@ RUN set -eux; \
 	wget -O config/config.guess 'https://git.savannah.gnu.org/cgit/config.git/plain/config.guess?id=7d3d27baf8107b630586c962c057e22149653deb'; \
 	wget -O config/config.sub 'https://git.savannah.gnu.org/cgit/config.git/plain/config.sub?id=7d3d27baf8107b630586c962c057e22149653deb'; \
 	\
-# https://git.alpinelinux.org/aports/tree/community/postgresql12/APKBUILD?h=3.18-stable&id=a470294e6d6ca7059e41c54769b7c3c26ec901d4#n158
-	export LLVM_CONFIG="/usr/lib/llvm15/bin/llvm-config"; \
-# https://git.alpinelinux.org/aports/tree/community/postgresql12/APKBUILD?h=3.18-stable&id=a470294e6d6ca7059e41c54769b7c3c26ec901d4#n163
-	export CLANG=clang-15; \
+# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.21-stable&id=40544ade947bec1798edb0f749f4e967e842624b#n172
+	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
+	export CLANG=clang-19; \
 	\
 # configure options taken from:
 # https://anonscm.debian.org/cgit/pkg-postgresql/postgresql.git/tree/debian/rules?h=9.5
diff --git a/postgres_15-alpine3.19/Dockerfile b/postgres_15-alpine3.20/Dockerfile
similarity index 96%
rename from postgres_15-alpine3.19/Dockerfile
rename to postgres_15-alpine3.20/Dockerfile
index 43c890d..a837092 100644
--- a/postgres_15-alpine3.19/Dockerfile
+++ b/postgres_15-alpine3.20/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.19
+FROM alpine:3.20
 
 # 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
@@ -116,9 +116,9 @@ RUN set -eux; \
 	wget -O config/config.guess 'https://git.savannah.gnu.org/cgit/config.git/plain/config.guess?id=7d3d27baf8107b630586c962c057e22149653deb'; \
 	wget -O config/config.sub 'https://git.savannah.gnu.org/cgit/config.git/plain/config.sub?id=7d3d27baf8107b630586c962c057e22149653deb'; \
 	\
-# https://git.alpinelinux.org/aports/tree/community/postgresql12/APKBUILD?h=3.18-stable&id=a470294e6d6ca7059e41c54769b7c3c26ec901d4#n158
+# 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/postgresql12/APKBUILD?h=3.18-stable&id=a470294e6d6ca7059e41c54769b7c3c26ec901d4#n163
+# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.21-stable&id=40544ade947bec1798edb0f749f4e967e842624b#n177
 	export CLANG=clang-15; \
 	\
 # configure options taken from:
diff --git a/postgres_15-alpine3.19/docker-ensure-initdb.sh b/postgres_15-alpine3.20/docker-ensure-initdb.sh
similarity index 100%
rename from postgres_15-alpine3.19/docker-ensure-initdb.sh
rename to postgres_15-alpine3.20/docker-ensure-initdb.sh
diff --git a/postgres_15-alpine3.19/docker-entrypoint.sh b/postgres_15-alpine3.20/docker-entrypoint.sh
similarity index 100%
rename from postgres_15-alpine3.19/docker-entrypoint.sh
rename to postgres_15-alpine3.20/docker-entrypoint.sh
diff --git a/postgres_16-alpine/Dockerfile b/postgres_16-alpine/Dockerfile
index c860081..8b91733 100644
--- a/postgres_16-alpine/Dockerfile
+++ b/postgres_16-alpine/Dockerfile
@@ -4,7 +4,7 @@
 # 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/postgresql.pre-install?h=3.12-stable
@@ -57,8 +57,8 @@ ENV PG_VERSION 16.6
 ENV PG_SHA256 23369cdaccd45270ac5dcc30fa9da205d5be33fa505e1f17a0418d2caeca477b
 
 ENV DOCKER_PG_LLVM_DEPS \
-		llvm15-dev \
-		clang15
+		llvm19-dev \
+		clang19
 
 RUN set -eux; \
 	\
@@ -116,10 +116,10 @@ RUN set -eux; \
 	wget -O config/config.guess 'https://git.savannah.gnu.org/cgit/config.git/plain/config.guess?id=7d3d27baf8107b630586c962c057e22149653deb'; \
 	wget -O config/config.sub 'https://git.savannah.gnu.org/cgit/config.git/plain/config.sub?id=7d3d27baf8107b630586c962c057e22149653deb'; \
 	\
-# https://git.alpinelinux.org/aports/tree/community/postgresql12/APKBUILD?h=3.18-stable&id=a470294e6d6ca7059e41c54769b7c3c26ec901d4#n158
-	export LLVM_CONFIG="/usr/lib/llvm15/bin/llvm-config"; \
-# https://git.alpinelinux.org/aports/tree/community/postgresql12/APKBUILD?h=3.18-stable&id=a470294e6d6ca7059e41c54769b7c3c26ec901d4#n163
-	export CLANG=clang-15; \
+# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.21-stable&id=40544ade947bec1798edb0f749f4e967e842624b#n172
+	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
+	export CLANG=clang-19; \
 	\
 # configure options taken from:
 # https://anonscm.debian.org/cgit/pkg-postgresql/postgresql.git/tree/debian/rules?h=9.5
diff --git a/postgres_16-alpine3.19/Dockerfile b/postgres_16-alpine3.20/Dockerfile
similarity index 96%
rename from postgres_16-alpine3.19/Dockerfile
rename to postgres_16-alpine3.20/Dockerfile
index 0ee9671..36b35cd 100644
--- a/postgres_16-alpine3.19/Dockerfile
+++ b/postgres_16-alpine3.20/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.19
+FROM alpine:3.20
 
 # 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
@@ -116,9 +116,9 @@ RUN set -eux; \
 	wget -O config/config.guess 'https://git.savannah.gnu.org/cgit/config.git/plain/config.guess?id=7d3d27baf8107b630586c962c057e22149653deb'; \
 	wget -O config/config.sub 'https://git.savannah.gnu.org/cgit/config.git/plain/config.sub?id=7d3d27baf8107b630586c962c057e22149653deb'; \
 	\
-# https://git.alpinelinux.org/aports/tree/community/postgresql12/APKBUILD?h=3.18-stable&id=a470294e6d6ca7059e41c54769b7c3c26ec901d4#n158
+# 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/postgresql12/APKBUILD?h=3.18-stable&id=a470294e6d6ca7059e41c54769b7c3c26ec901d4#n163
+# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.21-stable&id=40544ade947bec1798edb0f749f4e967e842624b#n177
 	export CLANG=clang-15; \
 	\
 # configure options taken from:
diff --git a/postgres_16-alpine3.19/docker-ensure-initdb.sh b/postgres_16-alpine3.20/docker-ensure-initdb.sh
similarity index 100%
rename from postgres_16-alpine3.19/docker-ensure-initdb.sh
rename to postgres_16-alpine3.20/docker-ensure-initdb.sh
diff --git a/postgres_16-alpine3.19/docker-entrypoint.sh b/postgres_16-alpine3.20/docker-entrypoint.sh
similarity index 100%
rename from postgres_16-alpine3.19/docker-entrypoint.sh
rename to postgres_16-alpine3.20/docker-entrypoint.sh
diff --git a/postgres_alpine/Dockerfile b/postgres_alpine/Dockerfile
index d8481c4..5c2914f 100644
--- a/postgres_alpine/Dockerfile
+++ b/postgres_alpine/Dockerfile
@@ -4,7 +4,7 @@
 # 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/postgresql.pre-install?h=3.12-stable
@@ -56,8 +56,8 @@ ENV PG_VERSION 17.2
 ENV PG_SHA256 82ef27c0af3751695d7f64e2d963583005fbb6a0c3df63d0e4b42211d7021164
 
 ENV DOCKER_PG_LLVM_DEPS \
-		llvm15-dev \
-		clang15
+		llvm19-dev \
+		clang19
 
 RUN set -eux; \
 	\
@@ -115,10 +115,10 @@ RUN set -eux; \
 	wget -O config/config.guess 'https://git.savannah.gnu.org/cgit/config.git/plain/config.guess?id=7d3d27baf8107b630586c962c057e22149653deb'; \
 	wget -O config/config.sub 'https://git.savannah.gnu.org/cgit/config.git/plain/config.sub?id=7d3d27baf8107b630586c962c057e22149653deb'; \
 	\
-# https://git.alpinelinux.org/aports/tree/community/postgresql12/APKBUILD?h=3.18-stable&id=a470294e6d6ca7059e41c54769b7c3c26ec901d4#n158
-	export LLVM_CONFIG="/usr/lib/llvm15/bin/llvm-config"; \
-# https://git.alpinelinux.org/aports/tree/community/postgresql12/APKBUILD?h=3.18-stable&id=a470294e6d6ca7059e41c54769b7c3c26ec901d4#n163
-	export CLANG=clang-15; \
+# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.21-stable&id=40544ade947bec1798edb0f749f4e967e842624b#n172
+	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
+	export CLANG=clang-19; \
 	\
 # configure options taken from:
 # https://anonscm.debian.org/cgit/pkg-postgresql/postgresql.git/tree/debian/rules?h=9.5
diff --git a/postgres_alpine3.19/Dockerfile b/postgres_alpine3.20/Dockerfile
similarity index 96%
rename from postgres_alpine3.19/Dockerfile
rename to postgres_alpine3.20/Dockerfile
index 101ea6b..40d8bbd 100644
--- a/postgres_alpine3.19/Dockerfile
+++ b/postgres_alpine3.20/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.19
+FROM alpine:3.20
 
 # 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
@@ -115,9 +115,9 @@ RUN set -eux; \
 	wget -O config/config.guess 'https://git.savannah.gnu.org/cgit/config.git/plain/config.guess?id=7d3d27baf8107b630586c962c057e22149653deb'; \
 	wget -O config/config.sub 'https://git.savannah.gnu.org/cgit/config.git/plain/config.sub?id=7d3d27baf8107b630586c962c057e22149653deb'; \
 	\
-# https://git.alpinelinux.org/aports/tree/community/postgresql12/APKBUILD?h=3.18-stable&id=a470294e6d6ca7059e41c54769b7c3c26ec901d4#n158
+# 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/postgresql12/APKBUILD?h=3.18-stable&id=a470294e6d6ca7059e41c54769b7c3c26ec901d4#n163
+# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.21-stable&id=40544ade947bec1798edb0f749f4e967e842624b#n177
 	export CLANG=clang-15; \
 	\
 # configure options taken from:
diff --git a/postgres_alpine3.19/docker-ensure-initdb.sh b/postgres_alpine3.20/docker-ensure-initdb.sh
similarity index 100%
rename from postgres_alpine3.19/docker-ensure-initdb.sh
rename to postgres_alpine3.20/docker-ensure-initdb.sh
diff --git a/postgres_alpine3.19/docker-entrypoint.sh b/postgres_alpine3.20/docker-entrypoint.sh
similarity index 100%
rename from postgres_alpine3.19/docker-entrypoint.sh
rename to postgres_alpine3.20/docker-entrypoint.sh

Relevant Maintainers:

@yosifkit yosifkit merged commit 1080942 into docker-library:master Dec 9, 2024
29 checks passed
@yosifkit yosifkit deleted the postgres branch December 9, 2024 19:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants