From e1900dbb63610e54fadd2c2fea6a88b52bb98813 Mon Sep 17 00:00:00 2001 From: Jamie Hewland Date: Thu, 1 Mar 2018 09:23:41 +0200 Subject: [PATCH] Alpine: Add libs for nis module (Alpine 3.7/Python 3.7 only) --- 3.7-rc/alpine3.7/Dockerfile | 2 ++ Dockerfile-alpine.template | 2 ++ update.sh | 7 +++++++ 3 files changed, 11 insertions(+) diff --git a/3.7-rc/alpine3.7/Dockerfile b/3.7-rc/alpine3.7/Dockerfile index e6d111eec..8b57b214b 100644 --- a/3.7-rc/alpine3.7/Dockerfile +++ b/3.7-rc/alpine3.7/Dockerfile @@ -46,6 +46,8 @@ RUN set -ex \ gdbm-dev \ libc-dev \ libffi-dev \ + libnsl-dev \ + libtirpc-dev \ linux-headers \ make \ ncurses-dev \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 1d9dc3247..f2b12c510 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -40,6 +40,8 @@ RUN set -ex \ gdbm-dev \ libc-dev \ libffi-dev \ + libnsl-dev \ + libtirpc-dev \ linux-headers \ make \ ncurses-dev \ diff --git a/update.sh b/update.sh index 6264c53ba..427be67ca 100755 --- a/update.sh +++ b/update.sh @@ -158,6 +158,13 @@ for version in "${versions[@]}"; do sed -ri -e 's/libressl/openssl/g' "$dir/Dockerfile" fi + # Libraries to build the nis module available in Alpine 3.7, but also require this patch: + # https://bugs.python.org/issue32521 + # TODO: Remove Python version check once 2.7 and 3.6 have the patch + if [[ "$variant" == alpine* ]] && [[ "$variant" != alpine3.7 || "$version" != 3.7* ]]; then + sed -ri -e '/libnsl-dev/d' -e '/libtirpc-dev/d' "$dir/Dockerfile" + fi + case "$v" in wheezy/slim|jessie/slim) sed -ri \