Skip to content

Add more whitespace and comments in update.sh #327

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tianon merged 1 commit into from
Aug 3, 2018
Merged

Add more whitespace and comments in update.sh #327

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion update.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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
Expand Down