Skip to content

Commit c249a89

Browse files
authored
Merge pull request docker-library#327 from infosiftr/update-whitespace
Add more whitespace and comments in update.sh
2 parents 491da1c + 4f80b30 commit c249a89

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

update.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,11 +172,13 @@ for version in "${versions[@]}"; do
172172
3.7*/alpine3.7 | 3.5*/alpine3.8)
173173
sed -ri -e 's/libressl-dev/openssl-dev/g' "$dir/Dockerfile"
174174
;;& # (3.5*/alpine* needs to match the next block too)
175+
175176
# Libraries to build the nis module only available in Alpine 3.7+.
176177
# Also require this patch https://bugs.python.org/issue32521 only available in Python 2.7, 3.6+.
177178
3.[4-5]*/alpine* | */alpine3.6)
178179
sed -ri -e '/libnsl-dev/d' -e '/libtirpc-dev/d' "$dir/Dockerfile"
179180
;;& # (3.4*/alpine* and 3.5*/alpine* need to match the next block too)
181+
180182
# https://bugs.python.org/issue11063, https://bugs.python.org/issue20519 (Python 3.7.0+)
181183
# A new native _uuid module improves uuid import time and avoids using ctypes.
182184
# This requires the development libuuid headers.
@@ -186,11 +188,13 @@ for version in "${versions[@]}"; do
186188
3.[4-6]*)
187189
sed -ri -e '/uuid-dev/d' "$dir/Dockerfile"
188190
;;& # (other Debian variants need to match later blocks)
191+
189192
3.4/stretch*)
193+
# older Python needs older OpenSSL
190194
sed -ri -e 's/libssl-dev/libssl1.0-dev/g' "$dir/Dockerfile"
191195
;;
192-
*/slim) ;;
193196
*/stretch | */jessie | */wheezy)
197+
# buildpack-deps already includes libssl-dev
194198
sed -ri -e '/libssl-dev/d' "$dir/Dockerfile"
195199
;;
196200
esac

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy