Skip to content

Update postgres #19229

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 1 commit into from
Jun 9, 2025
Merged

Update postgres #19229

merged 1 commit into from
Jun 9, 2025

Conversation

yosifkit
Copy link
Member

@yosifkit yosifkit commented Jun 9, 2025

Changes:

Changes:

- docker-library/postgres@38b3c10: Merge pull request docker-library/postgres#1345 from infosiftr/conditional-jit
- docker-library/postgres@46e8474: Only install 18+ JIT package on architectures where it's supported
Copy link

github-actions bot commented Jun 9, 2025

Diff for cdde545:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index a697ae9..72f5496 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -103,7 +103,7 @@ Directory: 17/bullseye
 
 Tags: 18beta1, 18beta1-bookworm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 2c6fe8daca9d2ccc143afe6b1cdbc1eb80379d3f
+GitCommit: 46e8474a6e8ac8460416ac62afcbdf59cfeb6366
 Directory: 18/bookworm
 
 Tags: 18beta1-alpine3.21
@@ -118,5 +118,5 @@ Directory: 18/alpine3.22
 
 Tags: 18beta1-bullseye
 Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 2c6fe8daca9d2ccc143afe6b1cdbc1eb80379d3f
+GitCommit: 46e8474a6e8ac8460416ac62afcbdf59cfeb6366
 Directory: 18/bullseye
diff --git a/postgres_18beta1-bookworm/Dockerfile b/postgres_18beta1-bookworm/Dockerfile
index 88e3634..0cf4c0f 100644
--- a/postgres_18beta1-bookworm/Dockerfile
+++ b/postgres_18beta1-bookworm/Dockerfile
@@ -156,9 +156,11 @@ RUN set -ex; \
 	sed -ri 's/#(create_main_cluster) .*$/\1 = false/' /etc/postgresql-common/createcluster.conf; \
 	apt-get install -y --no-install-recommends \
 		"postgresql-$PG_MAJOR=$PG_VERSION" \
-# https://github.com/docker-library/postgres/pull/1344#issuecomment-2936578203 (JIT is a separate package in 18+)
-		"postgresql-$PG_MAJOR-jit=$PG_VERSION" \
 	; \
+# https://github.com/docker-library/postgres/pull/1344#issuecomment-2936578203 (JIT is a separate package in 18+, but only supported for a subset of architectures)
+	if apt-get install -s "postgresql-$PG_MAJOR-jit" > /dev/null 2>&1; then \
+		apt-get install -y --no-install-recommends "postgresql-$PG_MAJOR-jit=$PG_VERSION"; \
+	fi; \
 	\
 	rm -rf /var/lib/apt/lists/*; \
 	\
diff --git a/postgres_18beta1-bullseye/Dockerfile b/postgres_18beta1-bullseye/Dockerfile
index b2ec63d..2a4b74b 100644
--- a/postgres_18beta1-bullseye/Dockerfile
+++ b/postgres_18beta1-bullseye/Dockerfile
@@ -156,9 +156,11 @@ RUN set -ex; \
 	sed -ri 's/#(create_main_cluster) .*$/\1 = false/' /etc/postgresql-common/createcluster.conf; \
 	apt-get install -y --no-install-recommends \
 		"postgresql-$PG_MAJOR=$PG_VERSION" \
-# https://github.com/docker-library/postgres/pull/1344#issuecomment-2936578203 (JIT is a separate package in 18+)
-		"postgresql-$PG_MAJOR-jit=$PG_VERSION" \
 	; \
+# https://github.com/docker-library/postgres/pull/1344#issuecomment-2936578203 (JIT is a separate package in 18+, but only supported for a subset of architectures)
+	if apt-get install -s "postgresql-$PG_MAJOR-jit" > /dev/null 2>&1; then \
+		apt-get install -y --no-install-recommends "postgresql-$PG_MAJOR-jit=$PG_VERSION"; \
+	fi; \
 	\
 	rm -rf /var/lib/apt/lists/*; \
 	\

Relevant Maintainers:

@tianon tianon merged commit a773de8 into docker-library:master Jun 9, 2025
29 checks passed
@tianon tianon deleted the postgres branch June 9, 2025 23:04
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