From e48c9718ef52d14df2ac46e674b0fb55523d8284 Mon Sep 17 00:00:00 2001 From: Jamie Hewland Date: Thu, 29 Mar 2018 22:59:03 +0200 Subject: [PATCH] 3.6/alpine3.7: Build nis module now that 3.6.5 is patched --- 3.6/alpine3.7/Dockerfile | 2 ++ update.sh | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/3.6/alpine3.7/Dockerfile b/3.6/alpine3.7/Dockerfile index 4beaeabf7..bd54150e2 100644 --- a/3.6/alpine3.7/Dockerfile +++ b/3.6/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/update.sh b/update.sh index 427be67ca..47d6bcc50 100755 --- a/update.sh +++ b/update.sh @@ -160,8 +160,7 @@ for version in "${versions[@]}"; do # 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 + if [[ "$variant" == alpine* ]] && [[ "$variant" != alpine3.7 ]]; then sed -ri -e '/libnsl-dev/d' -e '/libtirpc-dev/d' "$dir/Dockerfile" fi