Update postgres #14653
Merged
Update postgres #14653
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@18c1bef: Merge pull request docker-library/postgres#1077 from infosiftr/llvm-fix - docker-library/postgres@a3b0bb6: Downgrade llvm to 15 to fix jit support - docker-library/postgres@1c1e4ff: Add the ability for us to manually trigger GitHub tests
Diff for 91a9880:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 801b696..254fb26 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -3,7 +3,7 @@ GitRepo: https://github.com/docker-library/postgres.git
Tags: 11.20-alpine, 11-alpine, 11.20-alpine3.18, 11-alpine3.18
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: ee629b1e31754d3aeed529a1a3610ac180f20e0b
+GitCommit: a3b0bb68faed03c6edd3978b8dd34ca67881f7c7
Directory: 11/alpine
Tags: 11.20-bullseye, 11-bullseye
@@ -18,7 +18,7 @@ Directory: 12/bullseye
Tags: 12.15-alpine, 12-alpine, 12.15-alpine3.18, 12-alpine3.18
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: d681c1da2faebccc790fffd3e71514548b458d50
+GitCommit: a3b0bb68faed03c6edd3978b8dd34ca67881f7c7
Directory: 12/alpine
Tags: 13.11, 13, 13.11-bullseye, 13-bullseye
@@ -28,7 +28,7 @@ Directory: 13/bullseye
Tags: 13.11-alpine, 13-alpine, 13.11-alpine3.18, 13-alpine3.18
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 43d17d5ced92f230fa8c196e746f2e2aa288e5e8
+GitCommit: a3b0bb68faed03c6edd3978b8dd34ca67881f7c7
Directory: 13/alpine
Tags: 14.8, 14, 14.8-bullseye, 14-bullseye
@@ -38,7 +38,7 @@ Directory: 14/bullseye
Tags: 14.8-alpine, 14-alpine, 14.8-alpine3.18, 14-alpine3.18
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 8ff11cd5ae43e73fd84d0b2bc8aa88537fe18649
+GitCommit: a3b0bb68faed03c6edd3978b8dd34ca67881f7c7
Directory: 14/alpine
Tags: 15.3, 15, latest, 15.3-bullseye, 15-bullseye, bullseye
@@ -48,5 +48,5 @@ Directory: 15/bullseye
Tags: 15.3-alpine, 15-alpine, alpine, 15.3-alpine3.18, 15-alpine3.18, alpine3.18
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: a23c0e97980edae5be2cd4eb68ff1f0762d031cd
+GitCommit: a3b0bb68faed03c6edd3978b8dd34ca67881f7c7
Directory: 15/alpine
diff --git a/postgres_11-alpine3.18/Dockerfile b/postgres_11-alpine3.18/Dockerfile
index 94dc99c..6dad831 100644
--- a/postgres_11-alpine3.18/Dockerfile
+++ b/postgres_11-alpine3.18/Dockerfile
@@ -26,6 +26,10 @@ ENV PG_MAJOR 11
ENV PG_VERSION 11.20
ENV PG_SHA256 3d7c8882f64a7e98534a044257dfee7abad77a5b7da12508d85d722b98b5acce
+ENV DOCKER_PG_LLVM_DEPS \
+ llvm15-dev \
+ clang15
+
RUN set -eux; \
\
wget -O postgresql.tar.bz2 "https://ftp.postgresql.org/pub/source/v$PG_VERSION/postgresql-$PG_VERSION.tar.bz2"; \
@@ -40,10 +44,12 @@ RUN set -eux; \
rm postgresql.tar.bz2; \
\
apk add --no-cache --virtual .build-deps \
+ $DOCKER_PG_LLVM_DEPS \
bison \
coreutils \
dpkg-dev dpkg \
flex \
+ g++ \
gcc \
krb5-dev \
libc-dev \
@@ -51,7 +57,6 @@ RUN set -eux; \
libxml2-dev \
libxslt-dev \
linux-headers \
- llvm-dev clang g++ \
make \
openldap-dev \
openssl-dev \
@@ -76,6 +81,12 @@ RUN set -eux; \
# explicitly update autoconf config.guess and config.sub so they support more arches/libcs
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; \
+ \
# configure options taken from:
# https://anonscm.debian.org/cgit/pkg-postgresql/postgresql.git/tree/debian/rules?h=9.5
./configure \
diff --git a/postgres_12-alpine3.18/Dockerfile b/postgres_12-alpine3.18/Dockerfile
index 110257f..4698d75 100644
--- a/postgres_12-alpine3.18/Dockerfile
+++ b/postgres_12-alpine3.18/Dockerfile
@@ -26,6 +26,10 @@ ENV PG_MAJOR 12
ENV PG_VERSION 12.15
ENV PG_SHA256 bb5206e2864c1c4579938b96ea6096d155f22abf2d2cc2aa57571e3c4cb12b36
+ENV DOCKER_PG_LLVM_DEPS \
+ llvm15-dev \
+ clang15
+
RUN set -eux; \
\
wget -O postgresql.tar.bz2 "https://ftp.postgresql.org/pub/source/v$PG_VERSION/postgresql-$PG_VERSION.tar.bz2"; \
@@ -40,10 +44,12 @@ RUN set -eux; \
rm postgresql.tar.bz2; \
\
apk add --no-cache --virtual .build-deps \
+ $DOCKER_PG_LLVM_DEPS \
bison \
coreutils \
dpkg-dev dpkg \
flex \
+ g++ \
gcc \
krb5-dev \
libc-dev \
@@ -51,7 +57,6 @@ RUN set -eux; \
libxml2-dev \
libxslt-dev \
linux-headers \
- llvm-dev clang g++ \
make \
openldap-dev \
openssl-dev \
@@ -76,6 +81,12 @@ RUN set -eux; \
# explicitly update autoconf config.guess and config.sub so they support more arches/libcs
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; \
+ \
# configure options taken from:
# https://anonscm.debian.org/cgit/pkg-postgresql/postgresql.git/tree/debian/rules?h=9.5
./configure \
diff --git a/postgres_13-alpine3.18/Dockerfile b/postgres_13-alpine3.18/Dockerfile
index c8d8063..2926247 100644
--- a/postgres_13-alpine3.18/Dockerfile
+++ b/postgres_13-alpine3.18/Dockerfile
@@ -26,6 +26,10 @@ ENV PG_MAJOR 13
ENV PG_VERSION 13.11
ENV PG_SHA256 4992ff647203566b670d4e54dc5317499a26856c93576d0ea951bdf6bee50bfb
+ENV DOCKER_PG_LLVM_DEPS \
+ llvm15-dev \
+ clang15
+
RUN set -eux; \
\
wget -O postgresql.tar.bz2 "https://ftp.postgresql.org/pub/source/v$PG_VERSION/postgresql-$PG_VERSION.tar.bz2"; \
@@ -40,10 +44,12 @@ RUN set -eux; \
rm postgresql.tar.bz2; \
\
apk add --no-cache --virtual .build-deps \
+ $DOCKER_PG_LLVM_DEPS \
bison \
coreutils \
dpkg-dev dpkg \
flex \
+ g++ \
gcc \
krb5-dev \
libc-dev \
@@ -51,7 +57,6 @@ RUN set -eux; \
libxml2-dev \
libxslt-dev \
linux-headers \
- llvm-dev clang g++ \
make \
openldap-dev \
openssl-dev \
@@ -76,6 +81,12 @@ RUN set -eux; \
# explicitly update autoconf config.guess and config.sub so they support more arches/libcs
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; \
+ \
# configure options taken from:
# https://anonscm.debian.org/cgit/pkg-postgresql/postgresql.git/tree/debian/rules?h=9.5
./configure \
diff --git a/postgres_14-alpine3.18/Dockerfile b/postgres_14-alpine3.18/Dockerfile
index 0d0dd7f..5c21654 100644
--- a/postgres_14-alpine3.18/Dockerfile
+++ b/postgres_14-alpine3.18/Dockerfile
@@ -26,6 +26,10 @@ ENV PG_MAJOR 14
ENV PG_VERSION 14.8
ENV PG_SHA256 39d38f0030737ed03835debeefee3b37d335462ce4995e2497bc38d621ebe45a
+ENV DOCKER_PG_LLVM_DEPS \
+ llvm15-dev \
+ clang15
+
RUN set -eux; \
\
wget -O postgresql.tar.bz2 "https://ftp.postgresql.org/pub/source/v$PG_VERSION/postgresql-$PG_VERSION.tar.bz2"; \
@@ -40,10 +44,12 @@ RUN set -eux; \
rm postgresql.tar.bz2; \
\
apk add --no-cache --virtual .build-deps \
+ $DOCKER_PG_LLVM_DEPS \
bison \
coreutils \
dpkg-dev dpkg \
flex \
+ g++ \
gcc \
krb5-dev \
libc-dev \
@@ -51,7 +57,6 @@ RUN set -eux; \
libxml2-dev \
libxslt-dev \
linux-headers \
- llvm-dev clang g++ \
make \
openldap-dev \
openssl-dev \
@@ -78,6 +83,12 @@ RUN set -eux; \
# explicitly update autoconf config.guess and config.sub so they support more arches/libcs
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; \
+ \
# configure options taken from:
# https://anonscm.debian.org/cgit/pkg-postgresql/postgresql.git/tree/debian/rules?h=9.5
./configure \
diff --git a/postgres_alpine3.18/Dockerfile b/postgres_alpine3.18/Dockerfile
index eaa64bc..ef886cc 100644
--- a/postgres_alpine3.18/Dockerfile
+++ b/postgres_alpine3.18/Dockerfile
@@ -26,6 +26,10 @@ ENV PG_MAJOR 15
ENV PG_VERSION 15.3
ENV PG_SHA256 ffc7d4891f00ffbf5c3f4eab7fbbced8460b8c0ee63c5a5167133b9e6599d932
+ENV DOCKER_PG_LLVM_DEPS \
+ llvm15-dev \
+ clang15
+
RUN set -eux; \
\
wget -O postgresql.tar.bz2 "https://ftp.postgresql.org/pub/source/v$PG_VERSION/postgresql-$PG_VERSION.tar.bz2"; \
@@ -40,10 +44,12 @@ RUN set -eux; \
rm postgresql.tar.bz2; \
\
apk add --no-cache --virtual .build-deps \
+ $DOCKER_PG_LLVM_DEPS \
bison \
coreutils \
dpkg-dev dpkg \
flex \
+ g++ \
gcc \
krb5-dev \
libc-dev \
@@ -51,7 +57,6 @@ RUN set -eux; \
libxml2-dev \
libxslt-dev \
linux-headers \
- llvm-dev clang g++ \
make \
openldap-dev \
openssl-dev \
@@ -80,6 +85,12 @@ RUN set -eux; \
# explicitly update autoconf config.guess and config.sub so they support more arches/libcs
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; \
+ \
# configure options taken from:
# https://anonscm.debian.org/cgit/pkg-postgresql/postgresql.git/tree/debian/rules?h=9.5
./configure \Relevant Maintainers: |
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: