From 6ee0f2865b23484fefb785ba70b9d404f2bb0cd4 Mon Sep 17 00:00:00 2001 From: Joe Ferguson Date: Thu, 22 Dec 2022 14:28:39 -0800 Subject: [PATCH] Skip unavailable nss_wrapper on ppc64le --- 11/alpine/Dockerfile | 4 +++- 12/alpine/Dockerfile | 4 +++- 13/alpine/Dockerfile | 4 +++- 14/alpine/Dockerfile | 4 +++- 15/alpine/Dockerfile | 4 +++- Dockerfile-alpine.template | 4 +++- 6 files changed, 18 insertions(+), 6 deletions(-) diff --git a/11/alpine/Dockerfile b/11/alpine/Dockerfile index 3aeba17f4d..787c3b58e4 100644 --- a/11/alpine/Dockerfile +++ b/11/alpine/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/12/alpine/Dockerfile b/12/alpine/Dockerfile index 49c6075c27..d529dd6f55 100644 --- a/12/alpine/Dockerfile +++ b/12/alpine/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/13/alpine/Dockerfile b/13/alpine/Dockerfile index 267ba279b3..a65d5d067f 100644 --- a/13/alpine/Dockerfile +++ b/13/alpine/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/14/alpine/Dockerfile b/14/alpine/Dockerfile index 41f118eba9..e0075306e4 100644 --- a/14/alpine/Dockerfile +++ b/14/alpine/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/15/alpine/Dockerfile b/15/alpine/Dockerfile index af78dacb31..009a3d06cc 100644 --- a/15/alpine/Dockerfile +++ b/15/alpine/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 /; \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 853d1de137..84769baef9 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -136,12 +136,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 /; \