From 410f5c54816c9818e2e814082439f93f5a655471 Mon Sep 17 00:00:00 2001 From: Terror Date: Thu, 17 Jan 2019 10:18:29 +1300 Subject: [PATCH 1/2] Add support for nss_wrapper Support nss_wrapper to align with the Debian based images. --- 11/alpine/Dockerfile | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/11/alpine/Dockerfile b/11/alpine/Dockerfile index 550f2b8981..7ff6dee88f 100644 --- a/11/alpine/Dockerfile +++ b/11/alpine/Dockerfile @@ -25,6 +25,8 @@ ENV PG_MAJOR 11 ENV PG_VERSION 11.1 ENV PG_SHA256 90815e812874831e9a4bf6e1136bf73bc2c5a0464ef142e2dfea40cda206db08 +ARG NSS_WRAPPER_VERSION=1.1.5 + RUN set -ex \ \ && apk add --no-cache --virtual .fetch-deps \ @@ -120,6 +122,18 @@ RUN set -ex \ | sort -u \ | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ )" \ +# Add nss_wrapper + && echo -e "#ifndef NSS__H\n#define NSS__H\n\nenum nss_status\n{\n\tNSS_STATUS_TRYAGAIN = -2,\n\tNSS_STATUS_UNAVAIL = -1,\n\tNSS_STATUS_NOTFOUND = 0,\n\tNSS_STATUS_SUCCESS = 1,\n\tNSS_STATUS_RETURN = 2\n};\n\n#endif" > /usr/local/include/nss.h \ + && apk add --no-cache --virtual .nss_wrapper-build-deps build-base cmake cmocka-dev \ + && wget -O- https://ftp.samba.org/pub/cwrap/nss_wrapper-${NSS_WRAPPER_VERSION}.tar.gz | tar xzf - \ + && mkdir nss_wrapper-${NSS_WRAPPER_VERSION}/build && \ + (cd nss_wrapper-${NSS_WRAPPER_VERSION}/build \ + && cmake .. -DUNIT_TESTING:BOOL=ON \ + && make -j "$(nproc)" \ + && make -j "$(nproc)" CTEST_OUTPUT_ON_FAILURE=TRUE test \ + && make install) \ + && ln -s /usr/local/lib/libnss_wrapper.so /usr/lib/libnss_wrapper.so \ + && rm -rf nss_wrapper-${NSS_WRAPPER_VERSION} /usr/local/include/nss.h \ && apk add --no-cache --virtual .postgresql-rundeps \ $runDeps \ bash \ @@ -127,7 +141,7 @@ RUN set -ex \ # tzdata is optional, but only adds around 1Mb to image size and is recommended by Django documentation: # https://docs.djangoproject.com/en/1.10/ref/databases/#optimizing-postgresql-s-configuration tzdata \ - && apk del .fetch-deps .build-deps \ + && apk -q del .fetch-deps .build-deps .nss_wrapper-build-deps\ && cd / \ && rm -rf \ /usr/src/postgresql \ From 2237ae37af65d5245356af0b3258e4324f2efe24 Mon Sep 17 00:00:00 2001 From: Terror Date: Thu, 17 Jan 2019 10:50:45 +1300 Subject: [PATCH 2/2] Add nss_wrapper Add nss_wrapper to align with the Debian based images --- Dockerfile-alpine.template | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 170316abc6..6f9e47937e 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -25,6 +25,9 @@ ENV PG_MAJOR %%PG_MAJOR%% ENV PG_VERSION %%PG_VERSION%% ENV PG_SHA256 %%PG_SHA256%% +# ARG NSS_WRAPPER_VERSION=%%NSS_WRAPPER_VERSION%% +ARG NSS_WRAPPER_VERSION=1.1.5 + %%OSSP_UUID_ENV_VARS%% RUN set -ex \ \ @@ -116,6 +119,18 @@ RUN set -ex \ && make install-world \ && make -C contrib install \ \ +# Add nss_wrapper + && echo -e "#ifndef NSS__H\n#define NSS__H\n\nenum nss_status\n{\n\tNSS_STATUS_TRYAGAIN = -2,\n\tNSS_STATUS_UNAVAIL = -1,\n\tNSS_STATUS_NOTFOUND = 0,\n\tNSS_STATUS_SUCCESS = 1,\n\tNSS_STATUS_RETURN = 2\n};\n\n#endif" > /usr/local/include/nss.h \ + && apk add --no-cache --virtual .nss_wrapper-build-deps build-base cmake cmocka-dev \ + && wget -O- https://ftp.samba.org/pub/cwrap/nss_wrapper-${NSS_WRAPPER_VERSION}.tar.gz | tar xzf - \ + && mkdir nss_wrapper-${NSS_WRAPPER_VERSION}/build && \ + (cd nss_wrapper-${NSS_WRAPPER_VERSION}/build \ + && cmake .. -DUNIT_TESTING:BOOL=ON \ + && make -j "$(nproc)" \ + && make -j "$(nproc)" CTEST_OUTPUT_ON_FAILURE=TRUE test \ + && make install) \ + && ln -s /usr/local/lib/libnss_wrapper.so /usr/lib/libnss_wrapper.so \ + && rm -rf nss_wrapper-${NSS_WRAPPER_VERSION} /usr/local/include/nss.h \ && runDeps="$( \ scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ | tr ',' '\n' \ @@ -129,7 +144,7 @@ RUN set -ex \ # tzdata is optional, but only adds around 1Mb to image size and is recommended by Django documentation: # https://docs.djangoproject.com/en/1.10/ref/databases/#optimizing-postgresql-s-configuration tzdata \ - && apk del .fetch-deps .build-deps \ + && apk del .fetch-deps .build-deps .nss_wrapper-build-deps \ && cd / \ && rm -rf \ /usr/src/postgresql \