Update postgres #13791
Merged
Update postgres #13791
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@a510f13: Merge pull request docker-library/postgres#1027 from infosiftr/fix-power - docker-library/postgres@6ee0f28: Skip unavailable nss_wrapper on ppc64le
Diff for 7325b0d:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 7dc3981..40b4b45 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -3,7 +3,7 @@ GitRepo: https://github.com/docker-library/postgres.git
Tags: 11.18-alpine, 11-alpine, 11.18-alpine3.17, 11-alpine3.17
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 41bd7bf3f487e6dc0036fd73efaff6ccb6fbbacd
+GitCommit: 6ee0f2865b23484fefb785ba70b9d404f2bb0cd4
Directory: 11/alpine
Tags: 11.18-bullseye, 11-bullseye
@@ -18,7 +18,7 @@ Directory: 12/bullseye
Tags: 12.13-alpine, 12-alpine, 12.13-alpine3.17, 12-alpine3.17
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 41bd7bf3f487e6dc0036fd73efaff6ccb6fbbacd
+GitCommit: 6ee0f2865b23484fefb785ba70b9d404f2bb0cd4
Directory: 12/alpine
Tags: 13.9, 13, 13.9-bullseye, 13-bullseye
@@ -28,7 +28,7 @@ Directory: 13/bullseye
Tags: 13.9-alpine, 13-alpine, 13.9-alpine3.17, 13-alpine3.17
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 41bd7bf3f487e6dc0036fd73efaff6ccb6fbbacd
+GitCommit: 6ee0f2865b23484fefb785ba70b9d404f2bb0cd4
Directory: 13/alpine
Tags: 14.6, 14, 14.6-bullseye, 14-bullseye
@@ -38,7 +38,7 @@ Directory: 14/bullseye
Tags: 14.6-alpine, 14-alpine, 14.6-alpine3.17, 14-alpine3.17
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 41bd7bf3f487e6dc0036fd73efaff6ccb6fbbacd
+GitCommit: 6ee0f2865b23484fefb785ba70b9d404f2bb0cd4
Directory: 14/alpine
Tags: 15.1, 15, latest, 15.1-bullseye, 15-bullseye, bullseye
@@ -48,5 +48,5 @@ Directory: 15/bullseye
Tags: 15.1-alpine, 15-alpine, alpine, 15.1-alpine3.17, 15-alpine3.17, alpine3.17
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 41bd7bf3f487e6dc0036fd73efaff6ccb6fbbacd
+GitCommit: 6ee0f2865b23484fefb785ba70b9d404f2bb0cd4
Directory: 15/alpine
diff --git a/postgres_11-alpine3.17/Dockerfile b/postgres_11-alpine3.17/Dockerfile
index 3aeba17..787c3b5 100644
--- a/postgres_11-alpine3.17/Dockerfile
+++ b/postgres_11-alpine3.17/Dockerfile
@@ -124,12 +124,14 @@ RUN set -eux; \
apk add --no-cache --virtual .postgresql-rundeps \
$runDeps \
bash \
- nss_wrapper \
su-exec \
tzdata \
zstd \
# https://wiki.alpinelinux.org/wiki/Release_Notes_for_Alpine_3.16.0#ICU_data_split
icu-data-full \
+# nss_wrapper is not availble on ppc64le: "test case segfaults in ppc64le"
+# https://git.alpinelinux.org/aports/commit/testing/nss_wrapper/APKBUILD?h=3.17-stable&id=94d81ceeb58cff448d489bbcbe9a6d40c9991663
+ $([ "$(apk --print-arch)" != 'ppc64le' ] && echo 'nss_wrapper') \
; \
apk del --no-network .build-deps; \
cd /; \
diff --git a/postgres_12-alpine3.17/Dockerfile b/postgres_12-alpine3.17/Dockerfile
index 49c6075..d529dd6 100644
--- a/postgres_12-alpine3.17/Dockerfile
+++ b/postgres_12-alpine3.17/Dockerfile
@@ -124,12 +124,14 @@ RUN set -eux; \
apk add --no-cache --virtual .postgresql-rundeps \
$runDeps \
bash \
- nss_wrapper \
su-exec \
tzdata \
zstd \
# https://wiki.alpinelinux.org/wiki/Release_Notes_for_Alpine_3.16.0#ICU_data_split
icu-data-full \
+# nss_wrapper is not availble on ppc64le: "test case segfaults in ppc64le"
+# https://git.alpinelinux.org/aports/commit/testing/nss_wrapper/APKBUILD?h=3.17-stable&id=94d81ceeb58cff448d489bbcbe9a6d40c9991663
+ $([ "$(apk --print-arch)" != 'ppc64le' ] && echo 'nss_wrapper') \
; \
apk del --no-network .build-deps; \
cd /; \
diff --git a/postgres_13-alpine3.17/Dockerfile b/postgres_13-alpine3.17/Dockerfile
index 267ba27..a65d5d0 100644
--- a/postgres_13-alpine3.17/Dockerfile
+++ b/postgres_13-alpine3.17/Dockerfile
@@ -124,12 +124,14 @@ RUN set -eux; \
apk add --no-cache --virtual .postgresql-rundeps \
$runDeps \
bash \
- nss_wrapper \
su-exec \
tzdata \
zstd \
# https://wiki.alpinelinux.org/wiki/Release_Notes_for_Alpine_3.16.0#ICU_data_split
icu-data-full \
+# nss_wrapper is not availble on ppc64le: "test case segfaults in ppc64le"
+# https://git.alpinelinux.org/aports/commit/testing/nss_wrapper/APKBUILD?h=3.17-stable&id=94d81ceeb58cff448d489bbcbe9a6d40c9991663
+ $([ "$(apk --print-arch)" != 'ppc64le' ] && echo 'nss_wrapper') \
; \
apk del --no-network .build-deps; \
cd /; \
diff --git a/postgres_14-alpine3.17/Dockerfile b/postgres_14-alpine3.17/Dockerfile
index 41f118e..e007530 100644
--- a/postgres_14-alpine3.17/Dockerfile
+++ b/postgres_14-alpine3.17/Dockerfile
@@ -127,12 +127,14 @@ RUN set -eux; \
apk add --no-cache --virtual .postgresql-rundeps \
$runDeps \
bash \
- nss_wrapper \
su-exec \
tzdata \
zstd \
# https://wiki.alpinelinux.org/wiki/Release_Notes_for_Alpine_3.16.0#ICU_data_split
icu-data-full \
+# nss_wrapper is not availble on ppc64le: "test case segfaults in ppc64le"
+# https://git.alpinelinux.org/aports/commit/testing/nss_wrapper/APKBUILD?h=3.17-stable&id=94d81ceeb58cff448d489bbcbe9a6d40c9991663
+ $([ "$(apk --print-arch)" != 'ppc64le' ] && echo 'nss_wrapper') \
; \
apk del --no-network .build-deps; \
cd /; \
diff --git a/postgres_alpine3.17/Dockerfile b/postgres_alpine3.17/Dockerfile
index af78dac..009a3d0 100644
--- a/postgres_alpine3.17/Dockerfile
+++ b/postgres_alpine3.17/Dockerfile
@@ -130,12 +130,14 @@ RUN set -eux; \
apk add --no-cache --virtual .postgresql-rundeps \
$runDeps \
bash \
- nss_wrapper \
su-exec \
tzdata \
zstd \
# https://wiki.alpinelinux.org/wiki/Release_Notes_for_Alpine_3.16.0#ICU_data_split
icu-data-full \
+# nss_wrapper is not availble on ppc64le: "test case segfaults in ppc64le"
+# https://git.alpinelinux.org/aports/commit/testing/nss_wrapper/APKBUILD?h=3.17-stable&id=94d81ceeb58cff448d489bbcbe9a6d40c9991663
+ $([ "$(apk --print-arch)" != 'ppc64le' ] && echo 'nss_wrapper') \
; \
apk del --no-network .build-deps; \
cd /; \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: