Update postgres #19083
Merged
Update postgres #19083
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@833dab5: Merge pull request docker-library/postgres#1341 from infosiftr/drop-pgdg-keyring - docker-library/postgres@d9c4773: Update apt build depend
Diff for edb4f43:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 6acb8d0..89183fd 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -3,7 +3,7 @@ GitRepo: https://github.com/docker-library/postgres.git
Tags: 13.21, 13, 13.21-bookworm, 13-bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 266748257c85f28eb01a276e84860013ade2eb14
+GitCommit: d9c4773ca5dc96692188c458f281d217d78b14d9
Directory: 13/bookworm
Tags: 13.21-alpine3.20, 13-alpine3.20
@@ -18,12 +18,12 @@ Directory: 13/alpine3.21
Tags: 13.21-bullseye, 13-bullseye
Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 266748257c85f28eb01a276e84860013ade2eb14
+GitCommit: d9c4773ca5dc96692188c458f281d217d78b14d9
Directory: 13/bullseye
Tags: 14.18, 14, 14.18-bookworm, 14-bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 266748257c85f28eb01a276e84860013ade2eb14
+GitCommit: d9c4773ca5dc96692188c458f281d217d78b14d9
Directory: 14/bookworm
Tags: 14.18-alpine3.20, 14-alpine3.20
@@ -38,12 +38,12 @@ Directory: 14/alpine3.21
Tags: 14.18-bullseye, 14-bullseye
Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 266748257c85f28eb01a276e84860013ade2eb14
+GitCommit: d9c4773ca5dc96692188c458f281d217d78b14d9
Directory: 14/bullseye
Tags: 15.13, 15, 15.13-bookworm, 15-bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 266748257c85f28eb01a276e84860013ade2eb14
+GitCommit: d9c4773ca5dc96692188c458f281d217d78b14d9
Directory: 15/bookworm
Tags: 15.13-alpine3.20, 15-alpine3.20
@@ -58,12 +58,12 @@ Directory: 15/alpine3.21
Tags: 15.13-bullseye, 15-bullseye
Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 266748257c85f28eb01a276e84860013ade2eb14
+GitCommit: d9c4773ca5dc96692188c458f281d217d78b14d9
Directory: 15/bullseye
Tags: 16.9, 16, 16.9-bookworm, 16-bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 266748257c85f28eb01a276e84860013ade2eb14
+GitCommit: d9c4773ca5dc96692188c458f281d217d78b14d9
Directory: 16/bookworm
Tags: 16.9-alpine3.20, 16-alpine3.20
@@ -78,12 +78,12 @@ Directory: 16/alpine3.21
Tags: 16.9-bullseye, 16-bullseye
Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 266748257c85f28eb01a276e84860013ade2eb14
+GitCommit: d9c4773ca5dc96692188c458f281d217d78b14d9
Directory: 16/bullseye
Tags: 17.5, 17, latest, 17.5-bookworm, 17-bookworm, bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 266748257c85f28eb01a276e84860013ade2eb14
+GitCommit: d9c4773ca5dc96692188c458f281d217d78b14d9
Directory: 17/bookworm
Tags: 17.5-alpine3.20, 17-alpine3.20, alpine3.20
@@ -98,5 +98,5 @@ Directory: 17/alpine3.21
Tags: 17.5-bullseye, 17-bullseye, bullseye
Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 266748257c85f28eb01a276e84860013ade2eb14
+GitCommit: d9c4773ca5dc96692188c458f281d217d78b14d9
Directory: 17/bullseye
diff --git a/postgres_13-bookworm/Dockerfile b/postgres_13-bookworm/Dockerfile
index 3dd050a..721ad94 100644
--- a/postgres_13-bookworm/Dockerfile
+++ b/postgres_13-bookworm/Dockerfile
@@ -131,10 +131,9 @@ RUN set -ex; \
# build .deb files from upstream's source packages (which are verified by apt-get)
nproc="$(nproc)"; \
export DEB_BUILD_OPTIONS="nocheck parallel=$nproc"; \
-# we have to build postgresql-common first because postgresql-$PG_MAJOR shares "debian/rules" logic with it: https://salsa.debian.org/postgresql/postgresql/-/commit/99f44476e258cae6bf9e919219fa2c5414fa2876
-# (and it "Depends: pgdg-keyring")
- apt-get build-dep -y postgresql-common pgdg-keyring; \
- apt-get source --compile postgresql-common pgdg-keyring; \
+# we have to build postgresql-common-dev first because postgresql-$PG_MAJOR shares "debian/rules" logic with it: https://salsa.debian.org/postgresql/postgresql/-/commit/f4338a0d28cf4541956bddb0f4e444ba9dba81b9
+ apt-get build-dep -y postgresql-common-dev; \
+ apt-get source --compile postgresql-common-dev; \
_update_repo; \
# we need DEBIAN_FRONTEND on postgresql-13 for slapd ("Please enter the password for the admin entry in your LDAP directory."); see https://bugs.debian.org/929417
DEBIAN_FRONTEND=noninteractive \
diff --git a/postgres_13-bullseye/Dockerfile b/postgres_13-bullseye/Dockerfile
index 990363d..b914b71 100644
--- a/postgres_13-bullseye/Dockerfile
+++ b/postgres_13-bullseye/Dockerfile
@@ -131,10 +131,9 @@ RUN set -ex; \
# build .deb files from upstream's source packages (which are verified by apt-get)
nproc="$(nproc)"; \
export DEB_BUILD_OPTIONS="nocheck parallel=$nproc"; \
-# we have to build postgresql-common first because postgresql-$PG_MAJOR shares "debian/rules" logic with it: https://salsa.debian.org/postgresql/postgresql/-/commit/99f44476e258cae6bf9e919219fa2c5414fa2876
-# (and it "Depends: pgdg-keyring")
- apt-get build-dep -y postgresql-common pgdg-keyring; \
- apt-get source --compile postgresql-common pgdg-keyring; \
+# we have to build postgresql-common-dev first because postgresql-$PG_MAJOR shares "debian/rules" logic with it: https://salsa.debian.org/postgresql/postgresql/-/commit/f4338a0d28cf4541956bddb0f4e444ba9dba81b9
+ apt-get build-dep -y postgresql-common-dev; \
+ apt-get source --compile postgresql-common-dev; \
_update_repo; \
# we need DEBIAN_FRONTEND on postgresql-13 for slapd ("Please enter the password for the admin entry in your LDAP directory."); see https://bugs.debian.org/929417
DEBIAN_FRONTEND=noninteractive \
diff --git a/postgres_14-bookworm/Dockerfile b/postgres_14-bookworm/Dockerfile
index 701a02c..e9a0e21 100644
--- a/postgres_14-bookworm/Dockerfile
+++ b/postgres_14-bookworm/Dockerfile
@@ -131,10 +131,9 @@ RUN set -ex; \
# build .deb files from upstream's source packages (which are verified by apt-get)
nproc="$(nproc)"; \
export DEB_BUILD_OPTIONS="nocheck parallel=$nproc"; \
-# we have to build postgresql-common first because postgresql-$PG_MAJOR shares "debian/rules" logic with it: https://salsa.debian.org/postgresql/postgresql/-/commit/99f44476e258cae6bf9e919219fa2c5414fa2876
-# (and it "Depends: pgdg-keyring")
- apt-get build-dep -y postgresql-common pgdg-keyring; \
- apt-get source --compile postgresql-common pgdg-keyring; \
+# we have to build postgresql-common-dev first because postgresql-$PG_MAJOR shares "debian/rules" logic with it: https://salsa.debian.org/postgresql/postgresql/-/commit/f4338a0d28cf4541956bddb0f4e444ba9dba81b9
+ apt-get build-dep -y postgresql-common-dev; \
+ apt-get source --compile postgresql-common-dev; \
_update_repo; \
apt-get build-dep -y "postgresql-$PG_MAJOR=$PG_VERSION"; \
apt-get source --compile "postgresql-$PG_MAJOR=$PG_VERSION"; \
diff --git a/postgres_14-bullseye/Dockerfile b/postgres_14-bullseye/Dockerfile
index 004e677..ff863ef 100644
--- a/postgres_14-bullseye/Dockerfile
+++ b/postgres_14-bullseye/Dockerfile
@@ -131,10 +131,9 @@ RUN set -ex; \
# build .deb files from upstream's source packages (which are verified by apt-get)
nproc="$(nproc)"; \
export DEB_BUILD_OPTIONS="nocheck parallel=$nproc"; \
-# we have to build postgresql-common first because postgresql-$PG_MAJOR shares "debian/rules" logic with it: https://salsa.debian.org/postgresql/postgresql/-/commit/99f44476e258cae6bf9e919219fa2c5414fa2876
-# (and it "Depends: pgdg-keyring")
- apt-get build-dep -y postgresql-common pgdg-keyring; \
- apt-get source --compile postgresql-common pgdg-keyring; \
+# we have to build postgresql-common-dev first because postgresql-$PG_MAJOR shares "debian/rules" logic with it: https://salsa.debian.org/postgresql/postgresql/-/commit/f4338a0d28cf4541956bddb0f4e444ba9dba81b9
+ apt-get build-dep -y postgresql-common-dev; \
+ apt-get source --compile postgresql-common-dev; \
_update_repo; \
apt-get build-dep -y "postgresql-$PG_MAJOR=$PG_VERSION"; \
apt-get source --compile "postgresql-$PG_MAJOR=$PG_VERSION"; \
diff --git a/postgres_15-bookworm/Dockerfile b/postgres_15-bookworm/Dockerfile
index 953f19a..d58f9ab 100644
--- a/postgres_15-bookworm/Dockerfile
+++ b/postgres_15-bookworm/Dockerfile
@@ -131,10 +131,9 @@ RUN set -ex; \
# build .deb files from upstream's source packages (which are verified by apt-get)
nproc="$(nproc)"; \
export DEB_BUILD_OPTIONS="nocheck parallel=$nproc"; \
-# we have to build postgresql-common first because postgresql-$PG_MAJOR shares "debian/rules" logic with it: https://salsa.debian.org/postgresql/postgresql/-/commit/99f44476e258cae6bf9e919219fa2c5414fa2876
-# (and it "Depends: pgdg-keyring")
- apt-get build-dep -y postgresql-common pgdg-keyring; \
- apt-get source --compile postgresql-common pgdg-keyring; \
+# we have to build postgresql-common-dev first because postgresql-$PG_MAJOR shares "debian/rules" logic with it: https://salsa.debian.org/postgresql/postgresql/-/commit/f4338a0d28cf4541956bddb0f4e444ba9dba81b9
+ apt-get build-dep -y postgresql-common-dev; \
+ apt-get source --compile postgresql-common-dev; \
_update_repo; \
apt-get build-dep -y "postgresql-$PG_MAJOR=$PG_VERSION"; \
apt-get source --compile "postgresql-$PG_MAJOR=$PG_VERSION"; \
diff --git a/postgres_15-bullseye/Dockerfile b/postgres_15-bullseye/Dockerfile
index af49fae..ec325d7 100644
--- a/postgres_15-bullseye/Dockerfile
+++ b/postgres_15-bullseye/Dockerfile
@@ -131,10 +131,9 @@ RUN set -ex; \
# build .deb files from upstream's source packages (which are verified by apt-get)
nproc="$(nproc)"; \
export DEB_BUILD_OPTIONS="nocheck parallel=$nproc"; \
-# we have to build postgresql-common first because postgresql-$PG_MAJOR shares "debian/rules" logic with it: https://salsa.debian.org/postgresql/postgresql/-/commit/99f44476e258cae6bf9e919219fa2c5414fa2876
-# (and it "Depends: pgdg-keyring")
- apt-get build-dep -y postgresql-common pgdg-keyring; \
- apt-get source --compile postgresql-common pgdg-keyring; \
+# we have to build postgresql-common-dev first because postgresql-$PG_MAJOR shares "debian/rules" logic with it: https://salsa.debian.org/postgresql/postgresql/-/commit/f4338a0d28cf4541956bddb0f4e444ba9dba81b9
+ apt-get build-dep -y postgresql-common-dev; \
+ apt-get source --compile postgresql-common-dev; \
_update_repo; \
apt-get build-dep -y "postgresql-$PG_MAJOR=$PG_VERSION"; \
apt-get source --compile "postgresql-$PG_MAJOR=$PG_VERSION"; \
diff --git a/postgres_16-bookworm/Dockerfile b/postgres_16-bookworm/Dockerfile
index 57ce9f7..7421cca 100644
--- a/postgres_16-bookworm/Dockerfile
+++ b/postgres_16-bookworm/Dockerfile
@@ -131,10 +131,9 @@ RUN set -ex; \
# build .deb files from upstream's source packages (which are verified by apt-get)
nproc="$(nproc)"; \
export DEB_BUILD_OPTIONS="nocheck parallel=$nproc"; \
-# we have to build postgresql-common first because postgresql-$PG_MAJOR shares "debian/rules" logic with it: https://salsa.debian.org/postgresql/postgresql/-/commit/99f44476e258cae6bf9e919219fa2c5414fa2876
-# (and it "Depends: pgdg-keyring")
- apt-get build-dep -y postgresql-common pgdg-keyring; \
- apt-get source --compile postgresql-common pgdg-keyring; \
+# we have to build postgresql-common-dev first because postgresql-$PG_MAJOR shares "debian/rules" logic with it: https://salsa.debian.org/postgresql/postgresql/-/commit/f4338a0d28cf4541956bddb0f4e444ba9dba81b9
+ apt-get build-dep -y postgresql-common-dev; \
+ apt-get source --compile postgresql-common-dev; \
_update_repo; \
apt-get build-dep -y "postgresql-$PG_MAJOR=$PG_VERSION"; \
apt-get source --compile "postgresql-$PG_MAJOR=$PG_VERSION"; \
diff --git a/postgres_16-bullseye/Dockerfile b/postgres_16-bullseye/Dockerfile
index 54f864c..a3ac0c5 100644
--- a/postgres_16-bullseye/Dockerfile
+++ b/postgres_16-bullseye/Dockerfile
@@ -131,10 +131,9 @@ RUN set -ex; \
# build .deb files from upstream's source packages (which are verified by apt-get)
nproc="$(nproc)"; \
export DEB_BUILD_OPTIONS="nocheck parallel=$nproc"; \
-# we have to build postgresql-common first because postgresql-$PG_MAJOR shares "debian/rules" logic with it: https://salsa.debian.org/postgresql/postgresql/-/commit/99f44476e258cae6bf9e919219fa2c5414fa2876
-# (and it "Depends: pgdg-keyring")
- apt-get build-dep -y postgresql-common pgdg-keyring; \
- apt-get source --compile postgresql-common pgdg-keyring; \
+# we have to build postgresql-common-dev first because postgresql-$PG_MAJOR shares "debian/rules" logic with it: https://salsa.debian.org/postgresql/postgresql/-/commit/f4338a0d28cf4541956bddb0f4e444ba9dba81b9
+ apt-get build-dep -y postgresql-common-dev; \
+ apt-get source --compile postgresql-common-dev; \
_update_repo; \
apt-get build-dep -y "postgresql-$PG_MAJOR=$PG_VERSION"; \
apt-get source --compile "postgresql-$PG_MAJOR=$PG_VERSION"; \
diff --git a/postgres_bookworm/Dockerfile b/postgres_bookworm/Dockerfile
index eca1c04..25c2142 100644
--- a/postgres_bookworm/Dockerfile
+++ b/postgres_bookworm/Dockerfile
@@ -131,10 +131,9 @@ RUN set -ex; \
# build .deb files from upstream's source packages (which are verified by apt-get)
nproc="$(nproc)"; \
export DEB_BUILD_OPTIONS="nocheck parallel=$nproc"; \
-# we have to build postgresql-common first because postgresql-$PG_MAJOR shares "debian/rules" logic with it: https://salsa.debian.org/postgresql/postgresql/-/commit/99f44476e258cae6bf9e919219fa2c5414fa2876
-# (and it "Depends: pgdg-keyring")
- apt-get build-dep -y postgresql-common pgdg-keyring; \
- apt-get source --compile postgresql-common pgdg-keyring; \
+# we have to build postgresql-common-dev first because postgresql-$PG_MAJOR shares "debian/rules" logic with it: https://salsa.debian.org/postgresql/postgresql/-/commit/f4338a0d28cf4541956bddb0f4e444ba9dba81b9
+ apt-get build-dep -y postgresql-common-dev; \
+ apt-get source --compile postgresql-common-dev; \
_update_repo; \
apt-get build-dep -y "postgresql-$PG_MAJOR=$PG_VERSION"; \
apt-get source --compile "postgresql-$PG_MAJOR=$PG_VERSION"; \
diff --git a/postgres_bullseye/Dockerfile b/postgres_bullseye/Dockerfile
index 90b92bb..fc554d1 100644
--- a/postgres_bullseye/Dockerfile
+++ b/postgres_bullseye/Dockerfile
@@ -131,10 +131,9 @@ RUN set -ex; \
# build .deb files from upstream's source packages (which are verified by apt-get)
nproc="$(nproc)"; \
export DEB_BUILD_OPTIONS="nocheck parallel=$nproc"; \
-# we have to build postgresql-common first because postgresql-$PG_MAJOR shares "debian/rules" logic with it: https://salsa.debian.org/postgresql/postgresql/-/commit/99f44476e258cae6bf9e919219fa2c5414fa2876
-# (and it "Depends: pgdg-keyring")
- apt-get build-dep -y postgresql-common pgdg-keyring; \
- apt-get source --compile postgresql-common pgdg-keyring; \
+# we have to build postgresql-common-dev first because postgresql-$PG_MAJOR shares "debian/rules" logic with it: https://salsa.debian.org/postgresql/postgresql/-/commit/f4338a0d28cf4541956bddb0f4e444ba9dba81b9
+ apt-get build-dep -y postgresql-common-dev; \
+ apt-get source --compile postgresql-common-dev; \
_update_repo; \
apt-get build-dep -y "postgresql-$PG_MAJOR=$PG_VERSION"; \
apt-get source --compile "postgresql-$PG_MAJOR=$PG_VERSION"; \Relevant Maintainers: |
yosifkit
approved these changes
May 22, 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: