Update postgres #16904
Merged
Update postgres #16904
Conversation
This file contains 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@29d4a29: Merge pull request docker-library/postgres#1244 from LaurentGoderre/v17 - docker-library/postgres@3a7be2f: fixup - docker-library/postgres@41402ac: Add 17 beta1 - docker-library/postgres@1bdb411: Merge pull request docker-library/postgres#1241 from Earlopain/update-actions
Diff for ff27f10:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 810c130..cad263c 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -8,12 +8,12 @@ Directory: 12/bookworm
Tags: 12.19-alpine3.19, 12-alpine3.19
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: ccf4f2289a1e59ddf74a5d1e6eb7693b7f464b54
+GitCommit: 3a7be2f3213ce6e0f13f6a01b927d86aa53d9539
Directory: 12/alpine3.19
Tags: 12.19-alpine3.20, 12-alpine3.20, 12.19-alpine, 12-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 930acaf01ff536090a3bb304cf823a8cc777b658
+GitCommit: 3a7be2f3213ce6e0f13f6a01b927d86aa53d9539
Directory: 12/alpine3.20
Tags: 12.19-bullseye, 12-bullseye
@@ -28,12 +28,12 @@ Directory: 13/bookworm
Tags: 13.15-alpine3.19, 13-alpine3.19
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: f3ab8c6db63e2986453e0a4fae2c5f372dd4f05e
+GitCommit: 3a7be2f3213ce6e0f13f6a01b927d86aa53d9539
Directory: 13/alpine3.19
Tags: 13.15-alpine3.20, 13-alpine3.20, 13.15-alpine, 13-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 930acaf01ff536090a3bb304cf823a8cc777b658
+GitCommit: 3a7be2f3213ce6e0f13f6a01b927d86aa53d9539
Directory: 13/alpine3.20
Tags: 13.15-bullseye, 13-bullseye
@@ -48,12 +48,12 @@ Directory: 14/bookworm
Tags: 14.12-alpine3.19, 14-alpine3.19
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 662dbe5225f4d404364bdcf5e49dd5d88357ed31
+GitCommit: 3a7be2f3213ce6e0f13f6a01b927d86aa53d9539
Directory: 14/alpine3.19
Tags: 14.12-alpine3.20, 14-alpine3.20, 14.12-alpine, 14-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 930acaf01ff536090a3bb304cf823a8cc777b658
+GitCommit: 3a7be2f3213ce6e0f13f6a01b927d86aa53d9539
Directory: 14/alpine3.20
Tags: 14.12-bullseye, 14-bullseye
@@ -68,12 +68,12 @@ Directory: 15/bookworm
Tags: 15.7-alpine3.19, 15-alpine3.19
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 8a0b96710d917d1c3b32a5fe5b66687ad83827da
+GitCommit: 3a7be2f3213ce6e0f13f6a01b927d86aa53d9539
Directory: 15/alpine3.19
Tags: 15.7-alpine3.20, 15-alpine3.20, 15.7-alpine, 15-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 930acaf01ff536090a3bb304cf823a8cc777b658
+GitCommit: 3a7be2f3213ce6e0f13f6a01b927d86aa53d9539
Directory: 15/alpine3.20
Tags: 15.7-bullseye, 15-bullseye
@@ -88,15 +88,35 @@ Directory: 16/bookworm
Tags: 16.3-alpine3.19, 16-alpine3.19, alpine3.19
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: d08757ccb56ee047efd76c41dbc148e2e2c4f68f
+GitCommit: 3a7be2f3213ce6e0f13f6a01b927d86aa53d9539
Directory: 16/alpine3.19
Tags: 16.3-alpine3.20, 16-alpine3.20, alpine3.20, 16.3-alpine, 16-alpine, alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 930acaf01ff536090a3bb304cf823a8cc777b658
+GitCommit: 3a7be2f3213ce6e0f13f6a01b927d86aa53d9539
Directory: 16/alpine3.20
Tags: 16.3-bullseye, 16-bullseye, bullseye
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
GitCommit: d08757ccb56ee047efd76c41dbc148e2e2c4f68f
Directory: 16/bullseye
+
+Tags: 17beta1, 17beta1-bookworm
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: 41402ac3d12b84453127eaac54b45b300bf30d9a
+Directory: 17/bookworm
+
+Tags: 17beta1-alpine3.19
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: 3a7be2f3213ce6e0f13f6a01b927d86aa53d9539
+Directory: 17/alpine3.19
+
+Tags: 17beta1-alpine3.20, 17beta1-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 3a7be2f3213ce6e0f13f6a01b927d86aa53d9539
+Directory: 17/alpine3.20
+
+Tags: 17beta1-bullseye
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: 41402ac3d12b84453127eaac54b45b300bf30d9a
+Directory: 17/bullseye
diff --git a/_bashbrew-list b/_bashbrew-list
index 6aa38cc..3d0b53a 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -58,6 +58,12 @@ postgres:16.3-alpine3.19
postgres:16.3-alpine3.20
postgres:16.3-bookworm
postgres:16.3-bullseye
+postgres:17beta1
+postgres:17beta1-alpine
+postgres:17beta1-alpine3.19
+postgres:17beta1-alpine3.20
+postgres:17beta1-bookworm
+postgres:17beta1-bullseye
postgres:alpine
postgres:alpine3.19
postgres:alpine3.20
diff --git a/postgres_12-alpine/Dockerfile b/postgres_12-alpine/Dockerfile
index e68037b..74d5277 100644
--- a/postgres_12-alpine/Dockerfile
+++ b/postgres_12-alpine/Dockerfile
@@ -119,8 +119,8 @@ RUN set -eux; \
--with-icu \
--with-llvm \
; \
- make -j "$(nproc)" world; \
- make install-world; \
+ make -j "$(nproc)" world-bin; \
+ make install-world-bin; \
make -C contrib install; \
\
runDeps="$( \
diff --git a/postgres_12-alpine3.19/Dockerfile b/postgres_12-alpine3.19/Dockerfile
index b146ec3..ecc8522 100644
--- a/postgres_12-alpine3.19/Dockerfile
+++ b/postgres_12-alpine3.19/Dockerfile
@@ -119,8 +119,8 @@ RUN set -eux; \
--with-icu \
--with-llvm \
; \
- make -j "$(nproc)" world; \
- make install-world; \
+ make -j "$(nproc)" world-bin; \
+ make install-world-bin; \
make -C contrib install; \
\
runDeps="$( \
diff --git a/postgres_13-alpine/Dockerfile b/postgres_13-alpine/Dockerfile
index 43fa0ea..eb373d2 100644
--- a/postgres_13-alpine/Dockerfile
+++ b/postgres_13-alpine/Dockerfile
@@ -119,8 +119,8 @@ RUN set -eux; \
--with-icu \
--with-llvm \
; \
- make -j "$(nproc)" world; \
- make install-world; \
+ make -j "$(nproc)" world-bin; \
+ make install-world-bin; \
make -C contrib install; \
\
runDeps="$( \
diff --git a/postgres_13-alpine3.19/Dockerfile b/postgres_13-alpine3.19/Dockerfile
index 2320c0b..962b528 100644
--- a/postgres_13-alpine3.19/Dockerfile
+++ b/postgres_13-alpine3.19/Dockerfile
@@ -119,8 +119,8 @@ RUN set -eux; \
--with-icu \
--with-llvm \
; \
- make -j "$(nproc)" world; \
- make install-world; \
+ make -j "$(nproc)" world-bin; \
+ make install-world-bin; \
make -C contrib install; \
\
runDeps="$( \
diff --git a/postgres_14-alpine/Dockerfile b/postgres_14-alpine/Dockerfile
index 0ea12b0..a577a1f 100644
--- a/postgres_14-alpine/Dockerfile
+++ b/postgres_14-alpine/Dockerfile
@@ -122,8 +122,8 @@ RUN set -eux; \
--with-llvm \
--with-lz4 \
; \
- make -j "$(nproc)" world; \
- make install-world; \
+ make -j "$(nproc)" world-bin; \
+ make install-world-bin; \
make -C contrib install; \
\
runDeps="$( \
diff --git a/postgres_14-alpine3.19/Dockerfile b/postgres_14-alpine3.19/Dockerfile
index 3666022..74f2c53 100644
--- a/postgres_14-alpine3.19/Dockerfile
+++ b/postgres_14-alpine3.19/Dockerfile
@@ -122,8 +122,8 @@ RUN set -eux; \
--with-llvm \
--with-lz4 \
; \
- make -j "$(nproc)" world; \
- make install-world; \
+ make -j "$(nproc)" world-bin; \
+ make install-world-bin; \
make -C contrib install; \
\
runDeps="$( \
diff --git a/postgres_15-alpine/Dockerfile b/postgres_15-alpine/Dockerfile
index 8c67066..1fac96c 100644
--- a/postgres_15-alpine/Dockerfile
+++ b/postgres_15-alpine/Dockerfile
@@ -125,8 +125,8 @@ RUN set -eux; \
--with-lz4 \
--with-zstd \
; \
- make -j "$(nproc)" world; \
- make install-world; \
+ make -j "$(nproc)" world-bin; \
+ make install-world-bin; \
make -C contrib install; \
\
runDeps="$( \
diff --git a/postgres_15-alpine3.19/Dockerfile b/postgres_15-alpine3.19/Dockerfile
index 37a1034..0a34e0d 100644
--- a/postgres_15-alpine3.19/Dockerfile
+++ b/postgres_15-alpine3.19/Dockerfile
@@ -125,8 +125,8 @@ RUN set -eux; \
--with-lz4 \
--with-zstd \
; \
- make -j "$(nproc)" world; \
- make install-world; \
+ make -j "$(nproc)" world-bin; \
+ make install-world-bin; \
make -C contrib install; \
\
runDeps="$( \
diff --git a/postgres_alpine/Dockerfile b/postgres_17beta1-alpine/Dockerfile
similarity index 97%
copy from postgres_alpine/Dockerfile
copy to postgres_17beta1-alpine/Dockerfile
index d07b848..39375a0 100644
--- a/postgres_alpine/Dockerfile
+++ b/postgres_17beta1-alpine/Dockerfile
@@ -22,9 +22,9 @@ ENV LANG en_US.utf8
RUN mkdir /docker-entrypoint-initdb.d
-ENV PG_MAJOR 16
-ENV PG_VERSION 16.3
-ENV PG_SHA256 331963d5d3dc4caf4216a049fa40b66d6bcb8c730615859411b9518764e60585
+ENV PG_MAJOR 17
+ENV PG_VERSION 17beta1
+ENV PG_SHA256 089e8854fecd0ca1ec5cd8b29526938f9ef5e91cc331f5d6e118d13468f08f50
ENV DOCKER_PG_LLVM_DEPS \
llvm15-dev \
@@ -99,7 +99,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 \
@@ -124,8 +123,8 @@ RUN set -eux; \
--with-lz4 \
--with-zstd \
; \
- make -j "$(nproc)" world; \
- make install-world; \
+ make -j "$(nproc)" world-bin; \
+ make install-world-bin; \
make -C contrib install; \
\
runDeps="$( \
diff --git a/postgres_12-alpine/docker-ensure-initdb.sh b/postgres_17beta1-alpine/docker-ensure-initdb.sh
similarity index 100%
copy from postgres_12-alpine/docker-ensure-initdb.sh
copy to postgres_17beta1-alpine/docker-ensure-initdb.sh
diff --git a/postgres_12-alpine/docker-entrypoint.sh b/postgres_17beta1-alpine/docker-entrypoint.sh
similarity index 100%
copy from postgres_12-alpine/docker-entrypoint.sh
copy to postgres_17beta1-alpine/docker-entrypoint.sh
diff --git a/postgres_alpine3.19/Dockerfile b/postgres_17beta1-alpine3.19/Dockerfile
similarity index 97%
copy from postgres_alpine3.19/Dockerfile
copy to postgres_17beta1-alpine3.19/Dockerfile
index 89aab48..4d6c3d6 100644
--- a/postgres_alpine3.19/Dockerfile
+++ b/postgres_17beta1-alpine3.19/Dockerfile
@@ -22,9 +22,9 @@ ENV LANG en_US.utf8
RUN mkdir /docker-entrypoint-initdb.d
-ENV PG_MAJOR 16
-ENV PG_VERSION 16.3
-ENV PG_SHA256 331963d5d3dc4caf4216a049fa40b66d6bcb8c730615859411b9518764e60585
+ENV PG_MAJOR 17
+ENV PG_VERSION 17beta1
+ENV PG_SHA256 089e8854fecd0ca1ec5cd8b29526938f9ef5e91cc331f5d6e118d13468f08f50
ENV DOCKER_PG_LLVM_DEPS \
llvm15-dev \
@@ -99,7 +99,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 \
@@ -124,8 +123,8 @@ RUN set -eux; \
--with-lz4 \
--with-zstd \
; \
- make -j "$(nproc)" world; \
- make install-world; \
+ make -j "$(nproc)" world-bin; \
+ make install-world-bin; \
make -C contrib install; \
\
runDeps="$( \
diff --git a/postgres_12-alpine/docker-ensure-initdb.sh b/postgres_17beta1-alpine3.19/docker-ensure-initdb.sh
similarity index 100%
copy from postgres_12-alpine/docker-ensure-initdb.sh
copy to postgres_17beta1-alpine3.19/docker-ensure-initdb.sh
diff --git a/postgres_12-alpine/docker-entrypoint.sh b/postgres_17beta1-alpine3.19/docker-entrypoint.sh
similarity index 100%
copy from postgres_12-alpine/docker-entrypoint.sh
copy to postgres_17beta1-alpine3.19/docker-entrypoint.sh
diff --git a/postgres_15-bookworm/Dockerfile b/postgres_17beta1-bookworm/Dockerfile
similarity index 99%
copy from postgres_15-bookworm/Dockerfile
copy to postgres_17beta1-bookworm/Dockerfile
index 20dc81d..8bf86b6 100644
--- a/postgres_15-bookworm/Dockerfile
+++ b/postgres_17beta1-bookworm/Dockerfile
@@ -87,10 +87,10 @@ RUN set -ex; \
gpgconf --kill all; \
rm -rf "$GNUPGHOME"
-ENV PG_MAJOR 15
+ENV PG_MAJOR 17
ENV PATH $PATH:/usr/lib/postgresql/$PG_MAJOR/bin
-ENV PG_VERSION 15.7-1.pgdg120+1
+ENV PG_VERSION 17~beta1-1.pgdg120+1
RUN set -ex; \
\
diff --git a/postgres_12-bookworm/docker-ensure-initdb.sh b/postgres_17beta1-bookworm/docker-ensure-initdb.sh
similarity index 100%
copy from postgres_12-bookworm/docker-ensure-initdb.sh
copy to postgres_17beta1-bookworm/docker-ensure-initdb.sh
diff --git a/postgres_12-bookworm/docker-entrypoint.sh b/postgres_17beta1-bookworm/docker-entrypoint.sh
similarity index 100%
copy from postgres_12-bookworm/docker-entrypoint.sh
copy to postgres_17beta1-bookworm/docker-entrypoint.sh
diff --git a/postgres_15-bullseye/Dockerfile b/postgres_17beta1-bullseye/Dockerfile
similarity index 99%
copy from postgres_15-bullseye/Dockerfile
copy to postgres_17beta1-bullseye/Dockerfile
index a8a5689..dd4ac0d 100644
--- a/postgres_15-bullseye/Dockerfile
+++ b/postgres_17beta1-bullseye/Dockerfile
@@ -87,10 +87,10 @@ RUN set -ex; \
gpgconf --kill all; \
rm -rf "$GNUPGHOME"
-ENV PG_MAJOR 15
+ENV PG_MAJOR 17
ENV PATH $PATH:/usr/lib/postgresql/$PG_MAJOR/bin
-ENV PG_VERSION 15.7-1.pgdg110+1
+ENV PG_VERSION 17~beta1-1.pgdg110+1
RUN set -ex; \
\
diff --git a/postgres_12-bookworm/docker-ensure-initdb.sh b/postgres_17beta1-bullseye/docker-ensure-initdb.sh
similarity index 100%
copy from postgres_12-bookworm/docker-ensure-initdb.sh
copy to postgres_17beta1-bullseye/docker-ensure-initdb.sh
diff --git a/postgres_12-bookworm/docker-entrypoint.sh b/postgres_17beta1-bullseye/docker-entrypoint.sh
similarity index 100%
copy from postgres_12-bookworm/docker-entrypoint.sh
copy to postgres_17beta1-bullseye/docker-entrypoint.sh
diff --git a/postgres_alpine/Dockerfile b/postgres_alpine/Dockerfile
index d07b848..1620037 100644
--- a/postgres_alpine/Dockerfile
+++ b/postgres_alpine/Dockerfile
@@ -124,8 +124,8 @@ RUN set -eux; \
--with-lz4 \
--with-zstd \
; \
- make -j "$(nproc)" world; \
- make install-world; \
+ make -j "$(nproc)" world-bin; \
+ make install-world-bin; \
make -C contrib install; \
\
runDeps="$( \
diff --git a/postgres_alpine3.19/Dockerfile b/postgres_alpine3.19/Dockerfile
index 89aab48..09fb413 100644
--- a/postgres_alpine3.19/Dockerfile
+++ b/postgres_alpine3.19/Dockerfile
@@ -124,8 +124,8 @@ RUN set -eux; \
--with-lz4 \
--with-zstd \
; \
- make -j "$(nproc)" world; \
- make install-world; \
+ make -j "$(nproc)" world-bin; \
+ make install-world-bin; \
make -C contrib install; \
\
runDeps="$( \Relevant Maintainers: |
yosifkit
approved these changes
Jun 3, 2024
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:
actions/checkoutto v4 postgres#1241 from Earlopain/update-actions