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 #17631

Merged
merged 1 commit into from
Sep 26, 2024
Merged

Update postgres #17631

merged 1 commit into from
Sep 26, 2024

Conversation

tianon
Copy link
Member

@tianon tianon commented Sep 26, 2024

Changes:

Changes:

- docker-library/postgres@b406380: Update "latest" to 17 (now GA)
- docker-library/postgres@1725440: Update 17 to 17.0, bookworm 17.0-1.pgdg120+1, bullseye 17.0-1.pgdg110+1
- docker-library/postgres@c9906f9: Update 16 to bookworm 16.4-1.pgdg120+2, bullseye 16.4-1.pgdg110+2
@tianon tianon requested a review from a team as a code owner September 26, 2024 23:04
Copy link

Diff for 3c75042:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index b4f9ef1..a443ff4 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -81,42 +81,42 @@ Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: 8cce578a4361ed18a29f53fed24e4554f673a3a4
 Directory: 15/bullseye
 
-Tags: 16.4, 16, latest, 16.4-bookworm, 16-bookworm, bookworm
+Tags: 16.4, 16, 16.4-bookworm, 16-bookworm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 3a94d965ecbe08f4b1b255d3ed9ccae671a7a984
+GitCommit: c9906f922daaacdfc425b3b918e7644a8722290d
 Directory: 16/bookworm
 
-Tags: 16.4-alpine3.19, 16-alpine3.19, alpine3.19
+Tags: 16.4-alpine3.19, 16-alpine3.19
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: 3a94d965ecbe08f4b1b255d3ed9ccae671a7a984
 Directory: 16/alpine3.19
 
-Tags: 16.4-alpine3.20, 16-alpine3.20, alpine3.20, 16.4-alpine, 16-alpine, alpine
+Tags: 16.4-alpine3.20, 16-alpine3.20, 16.4-alpine, 16-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
 GitCommit: 3a94d965ecbe08f4b1b255d3ed9ccae671a7a984
 Directory: 16/alpine3.20
 
-Tags: 16.4-bullseye, 16-bullseye, bullseye
+Tags: 16.4-bullseye, 16-bullseye
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 3a94d965ecbe08f4b1b255d3ed9ccae671a7a984
+GitCommit: c9906f922daaacdfc425b3b918e7644a8722290d
 Directory: 16/bullseye
 
-Tags: 17rc1, 17rc1-bookworm
+Tags: 17.0, 17, latest, 17.0-bookworm, 17-bookworm, bookworm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: eaa1c35769621a6bb1e499073a5812ba478c7688
+GitCommit: 172544062d1031004b241e917f5f3f9dfebc0df5
 Directory: 17/bookworm
 
-Tags: 17rc1-alpine3.19
+Tags: 17.0-alpine3.19, 17-alpine3.19, alpine3.19
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: eaa1c35769621a6bb1e499073a5812ba478c7688
+GitCommit: 172544062d1031004b241e917f5f3f9dfebc0df5
 Directory: 17/alpine3.19
 
-Tags: 17rc1-alpine3.20, 17rc1-alpine
+Tags: 17.0-alpine3.20, 17-alpine3.20, alpine3.20, 17.0-alpine, 17-alpine, alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: eaa1c35769621a6bb1e499073a5812ba478c7688
+GitCommit: 172544062d1031004b241e917f5f3f9dfebc0df5
 Directory: 17/alpine3.20
 
-Tags: 17rc1-bullseye
+Tags: 17.0-bullseye, 17-bullseye, bullseye
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: eaa1c35769621a6bb1e499073a5812ba478c7688
+GitCommit: 172544062d1031004b241e917f5f3f9dfebc0df5
 Directory: 17/bullseye
diff --git a/_bashbrew-list b/_bashbrew-list
index 9f9b674..08dd433 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -58,12 +58,18 @@ postgres:16.4-alpine3.19
 postgres:16.4-alpine3.20
 postgres:16.4-bookworm
 postgres:16.4-bullseye
-postgres:17rc1
-postgres:17rc1-alpine
-postgres:17rc1-alpine3.19
-postgres:17rc1-alpine3.20
-postgres:17rc1-bookworm
-postgres:17rc1-bullseye
+postgres:17
+postgres:17-alpine
+postgres:17-alpine3.19
+postgres:17-alpine3.20
+postgres:17-bookworm
+postgres:17-bullseye
+postgres:17.0
+postgres:17.0-alpine
+postgres:17.0-alpine3.19
+postgres:17.0-alpine3.20
+postgres:17.0-bookworm
+postgres:17.0-bullseye
 postgres:alpine
 postgres:alpine3.19
 postgres:alpine3.20
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index df9d290..650a667 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -14,10 +14,10 @@ postgres:15-alpine
 postgres:15-alpine3.19
 postgres:15-bookworm
 postgres:15-bullseye
-postgres:17rc1-alpine
-postgres:17rc1-alpine3.19
-postgres:17rc1-bookworm
-postgres:17rc1-bullseye
+postgres:16-alpine
+postgres:16-alpine3.19
+postgres:16-bookworm
+postgres:16-bullseye
 postgres:alpine
 postgres:alpine3.19
 postgres:bookworm
diff --git a/postgres_alpine/Dockerfile b/postgres_16-alpine/Dockerfile
similarity index 100%
copy from postgres_alpine/Dockerfile
copy to postgres_16-alpine/Dockerfile
diff --git a/postgres_17rc1-alpine/docker-ensure-initdb.sh b/postgres_16-alpine/docker-ensure-initdb.sh
similarity index 100%
rename from postgres_17rc1-alpine/docker-ensure-initdb.sh
rename to postgres_16-alpine/docker-ensure-initdb.sh
diff --git a/postgres_17rc1-alpine/docker-entrypoint.sh b/postgres_16-alpine/docker-entrypoint.sh
similarity index 100%
rename from postgres_17rc1-alpine/docker-entrypoint.sh
rename to postgres_16-alpine/docker-entrypoint.sh
diff --git a/postgres_alpine3.19/Dockerfile b/postgres_16-alpine3.19/Dockerfile
similarity index 100%
copy from postgres_alpine3.19/Dockerfile
copy to postgres_16-alpine3.19/Dockerfile
diff --git a/postgres_17rc1-alpine3.19/docker-ensure-initdb.sh b/postgres_16-alpine3.19/docker-ensure-initdb.sh
similarity index 100%
rename from postgres_17rc1-alpine3.19/docker-ensure-initdb.sh
rename to postgres_16-alpine3.19/docker-ensure-initdb.sh
diff --git a/postgres_17rc1-alpine3.19/docker-entrypoint.sh b/postgres_16-alpine3.19/docker-entrypoint.sh
similarity index 100%
rename from postgres_17rc1-alpine3.19/docker-entrypoint.sh
rename to postgres_16-alpine3.19/docker-entrypoint.sh
diff --git a/postgres_bookworm/Dockerfile b/postgres_16-bookworm/Dockerfile
similarity index 99%
copy from postgres_bookworm/Dockerfile
copy to postgres_16-bookworm/Dockerfile
index c18ea69..40feae2 100644
--- a/postgres_bookworm/Dockerfile
+++ b/postgres_16-bookworm/Dockerfile
@@ -89,7 +89,7 @@ RUN set -ex; \
 ENV PG_MAJOR 16
 ENV PATH $PATH:/usr/lib/postgresql/$PG_MAJOR/bin
 
-ENV PG_VERSION 16.4-1.pgdg120+1
+ENV PG_VERSION 16.4-1.pgdg120+2
 
 RUN set -ex; \
 	\
diff --git a/postgres_17rc1-bookworm/docker-ensure-initdb.sh b/postgres_16-bookworm/docker-ensure-initdb.sh
similarity index 100%
rename from postgres_17rc1-bookworm/docker-ensure-initdb.sh
rename to postgres_16-bookworm/docker-ensure-initdb.sh
diff --git a/postgres_17rc1-bookworm/docker-entrypoint.sh b/postgres_16-bookworm/docker-entrypoint.sh
similarity index 100%
rename from postgres_17rc1-bookworm/docker-entrypoint.sh
rename to postgres_16-bookworm/docker-entrypoint.sh
diff --git a/postgres_bullseye/Dockerfile b/postgres_16-bullseye/Dockerfile
similarity index 99%
copy from postgres_bullseye/Dockerfile
copy to postgres_16-bullseye/Dockerfile
index 012558e..fb68549 100644
--- a/postgres_bullseye/Dockerfile
+++ b/postgres_16-bullseye/Dockerfile
@@ -89,7 +89,7 @@ RUN set -ex; \
 ENV PG_MAJOR 16
 ENV PATH $PATH:/usr/lib/postgresql/$PG_MAJOR/bin
 
-ENV PG_VERSION 16.4-1.pgdg110+1
+ENV PG_VERSION 16.4-1.pgdg110+2
 
 RUN set -ex; \
 	\
diff --git a/postgres_17rc1-bullseye/docker-ensure-initdb.sh b/postgres_16-bullseye/docker-ensure-initdb.sh
similarity index 100%
rename from postgres_17rc1-bullseye/docker-ensure-initdb.sh
rename to postgres_16-bullseye/docker-ensure-initdb.sh
diff --git a/postgres_17rc1-bullseye/docker-entrypoint.sh b/postgres_16-bullseye/docker-entrypoint.sh
similarity index 100%
rename from postgres_17rc1-bullseye/docker-entrypoint.sh
rename to postgres_16-bullseye/docker-entrypoint.sh
diff --git a/postgres_17rc1-alpine/Dockerfile b/postgres_17rc1-alpine/Dockerfile
deleted file mode 100644
index 98d3565..0000000
diff --git a/postgres_17rc1-alpine3.19/Dockerfile b/postgres_17rc1-alpine3.19/Dockerfile
deleted file mode 100644
index 16ab911..0000000
diff --git a/postgres_17rc1-bookworm/Dockerfile b/postgres_17rc1-bookworm/Dockerfile
deleted file mode 100644
index b3c3dcd..0000000
diff --git a/postgres_17rc1-bullseye/Dockerfile b/postgres_17rc1-bullseye/Dockerfile
deleted file mode 100644
index cfec2a2..0000000
diff --git a/postgres_alpine/Dockerfile b/postgres_alpine/Dockerfile
index 33d0109..4a33b69 100644
--- a/postgres_alpine/Dockerfile
+++ b/postgres_alpine/Dockerfile
@@ -44,7 +44,6 @@ RUN set -eux; \
 # verify that the binary works
 	gosu --version; \
 	gosu nobody true
-RUN set -eux; ln -svf gosu /usr/local/bin/su-exec; su-exec nobody true # backwards compatibility (removed in PostgreSQL 17+)
 
 # make the "en_US.UTF-8" locale so postgres will be utf-8 enabled by default
 # alpine doesn't require explicit locale-file generation
@@ -52,9 +51,9 @@ ENV LANG en_US.utf8
 
 RUN mkdir /docker-entrypoint-initdb.d
 
-ENV PG_MAJOR 16
-ENV PG_VERSION 16.4
-ENV PG_SHA256 971766d645aa73e93b9ef4e3be44201b4f45b5477095b049125403f9f3386d6f
+ENV PG_MAJOR 17
+ENV PG_VERSION 17.0
+ENV PG_SHA256 7e276131c0fdd6b62588dbad9b3bb24b8c3498d5009328dba59af16e819109de
 
 ENV DOCKER_PG_LLVM_DEPS \
 		llvm15-dev \
@@ -129,7 +128,6 @@ RUN set -eux; \
 # "/usr/src/postgresql/src/backend/access/common/tupconvert.c:105: undefined reference to `libintl_gettext'"
 #		--enable-nls \
 		--enable-integer-datetimes \
-		--enable-thread-safety \
 		--enable-tap-tests \
 # skip debugging info -- we want tiny size instead
 #		--enable-debug \
diff --git a/postgres_alpine3.19/Dockerfile b/postgres_alpine3.19/Dockerfile
index 16f3df5..793e3d4 100644
--- a/postgres_alpine3.19/Dockerfile
+++ b/postgres_alpine3.19/Dockerfile
@@ -44,7 +44,6 @@ RUN set -eux; \
 # verify that the binary works
 	gosu --version; \
 	gosu nobody true
-RUN set -eux; ln -svf gosu /usr/local/bin/su-exec; su-exec nobody true # backwards compatibility (removed in PostgreSQL 17+)
 
 # make the "en_US.UTF-8" locale so postgres will be utf-8 enabled by default
 # alpine doesn't require explicit locale-file generation
@@ -52,9 +51,9 @@ ENV LANG en_US.utf8
 
 RUN mkdir /docker-entrypoint-initdb.d
 
-ENV PG_MAJOR 16
-ENV PG_VERSION 16.4
-ENV PG_SHA256 971766d645aa73e93b9ef4e3be44201b4f45b5477095b049125403f9f3386d6f
+ENV PG_MAJOR 17
+ENV PG_VERSION 17.0
+ENV PG_SHA256 7e276131c0fdd6b62588dbad9b3bb24b8c3498d5009328dba59af16e819109de
 
 ENV DOCKER_PG_LLVM_DEPS \
 		llvm15-dev \
@@ -129,7 +128,6 @@ RUN set -eux; \
 # "/usr/src/postgresql/src/backend/access/common/tupconvert.c:105: undefined reference to `libintl_gettext'"
 #		--enable-nls \
 		--enable-integer-datetimes \
-		--enable-thread-safety \
 		--enable-tap-tests \
 # skip debugging info -- we want tiny size instead
 #		--enable-debug \
diff --git a/postgres_bookworm/Dockerfile b/postgres_bookworm/Dockerfile
index c18ea69..21a1f49 100644
--- a/postgres_bookworm/Dockerfile
+++ b/postgres_bookworm/Dockerfile
@@ -86,10 +86,10 @@ RUN set -ex; \
 	gpgconf --kill all; \
 	rm -rf "$GNUPGHOME"
 
-ENV PG_MAJOR 16
+ENV PG_MAJOR 17
 ENV PATH $PATH:/usr/lib/postgresql/$PG_MAJOR/bin
 
-ENV PG_VERSION 16.4-1.pgdg120+1
+ENV PG_VERSION 17.0-1.pgdg120+1
 
 RUN set -ex; \
 	\
diff --git a/postgres_bullseye/Dockerfile b/postgres_bullseye/Dockerfile
index 012558e..a7ff824 100644
--- a/postgres_bullseye/Dockerfile
+++ b/postgres_bullseye/Dockerfile
@@ -86,10 +86,10 @@ RUN set -ex; \
 	gpgconf --kill all; \
 	rm -rf "$GNUPGHOME"
 
-ENV PG_MAJOR 16
+ENV PG_MAJOR 17
 ENV PATH $PATH:/usr/lib/postgresql/$PG_MAJOR/bin
 
-ENV PG_VERSION 16.4-1.pgdg110+1
+ENV PG_VERSION 17.0-1.pgdg110+1
 
 RUN set -ex; \
 	\

Relevant Maintainers:

@tianon tianon merged commit df2b853 into docker-library:master Sep 26, 2024
29 checks passed
@tianon tianon deleted the postgres branch September 26, 2024 23:14
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.

2 participants