Skip to content

Commit

Permalink
Also remove "update.sh" bits for ARGON2 hack removal
Browse files Browse the repository at this point in the history
  • Loading branch information
tianon committed Jun 25, 2019
1 parent 894ee59 commit 820403d
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions update.sh
Original file line number Diff line number Diff line change
Expand Up @@ -162,10 +162,8 @@ for version in "${versions[@]}"; do
fi
if [ "$majorVersion" = '7' -a "$minorVersion" -lt '4' ]; then
# oniguruma is part of mbstring in php 7.4+
# ARGON2 is a hack only required for alpha1: https://github.com/docker-library/php/pull/840#pullrequestreview-249660894
sed -ri \
-e '/oniguruma-dev|libonig-dev/d' \
-e '/ARGON2/d' \
"$version/$suite/$variant/Dockerfile"
else
# 7.4 and above no longer include pecl/pear: https://github.com/php/php-src/pull/3781
Expand Down

0 comments on commit 820403d

Please sign in to comment.