From 4f80b305f3f2d822afb000c4f6fa15751d480ddb Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Fri, 3 Aug 2018 14:00:17 -0700 Subject: [PATCH] Add more whitespace and comments in update.sh --- update.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/update.sh b/update.sh index f68c4e3b1..ec9dfffba 100755 --- a/update.sh +++ b/update.sh @@ -172,11 +172,13 @@ for version in "${versions[@]}"; do 3.7*/alpine3.7 | 3.5*/alpine3.8) sed -ri -e 's/libressl-dev/openssl-dev/g' "$dir/Dockerfile" ;;& # (3.5*/alpine* needs to match the next block too) + # Libraries to build the nis module only available in Alpine 3.7+. # Also require this patch https://bugs.python.org/issue32521 only available in Python 2.7, 3.6+. 3.[4-5]*/alpine* | */alpine3.6) sed -ri -e '/libnsl-dev/d' -e '/libtirpc-dev/d' "$dir/Dockerfile" ;;& # (3.4*/alpine* and 3.5*/alpine* need to match the next block too) + # https://bugs.python.org/issue11063, https://bugs.python.org/issue20519 (Python 3.7.0+) # A new native _uuid module improves uuid import time and avoids using ctypes. # This requires the development libuuid headers. @@ -186,11 +188,13 @@ for version in "${versions[@]}"; do 3.[4-6]*) sed -ri -e '/uuid-dev/d' "$dir/Dockerfile" ;;& # (other Debian variants need to match later blocks) + 3.4/stretch*) + # older Python needs older OpenSSL sed -ri -e 's/libssl-dev/libssl1.0-dev/g' "$dir/Dockerfile" ;; - */slim) ;; */stretch | */jessie | */wheezy) + # buildpack-deps already includes libssl-dev sed -ri -e '/libssl-dev/d' "$dir/Dockerfile" ;; esac