Merge pull request #850 from petk/patch-php-7.4-alpha

Remove the Alpine argon2 library fix
docker-library · Jun 26, 2019 · 04e67dc · 04e67dc
2 parents 2e2df06 + 820403d
commit 04e67dc
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 23 deletions.
diff --git a/7.4-rc/alpine3.10/cli/Dockerfile b/7.4-rc/alpine3.10/cli/Dockerfile
@@ -113,9 +113,6 @@ RUN set -eux; \
 	export CFLAGS="$PHP_CFLAGS" \
 		CPPFLAGS="$PHP_CPPFLAGS" \
 		LDFLAGS="$PHP_LDFLAGS" \
-		# fix ARGON2 detection for 7.4-alpha1 https://github.com/docker-library/php/pull/840#pullrequestreview-249660894
-		ARGON2_LIBS="-largon2" \
-		ARGON2_CFLAGS="-I/usr/include" \
 	; \
 	docker-php-source extract; \
 	cd /usr/src/php; \

diff --git a/7.4-rc/alpine3.10/fpm/Dockerfile b/7.4-rc/alpine3.10/fpm/Dockerfile
@@ -114,9 +114,6 @@ RUN set -eux; \
 	export CFLAGS="$PHP_CFLAGS" \
 		CPPFLAGS="$PHP_CPPFLAGS" \
 		LDFLAGS="$PHP_LDFLAGS" \
-		# fix ARGON2 detection for 7.4-alpha1 https://github.com/docker-library/php/pull/840#pullrequestreview-249660894
-		ARGON2_LIBS="-largon2" \
-		ARGON2_CFLAGS="-I/usr/include" \
 	; \
 	docker-php-source extract; \
 	cd /usr/src/php; \

diff --git a/7.4-rc/alpine3.10/zts/Dockerfile b/7.4-rc/alpine3.10/zts/Dockerfile
@@ -114,9 +114,6 @@ RUN set -eux; \
 	export CFLAGS="$PHP_CFLAGS" \
 		CPPFLAGS="$PHP_CPPFLAGS" \
 		LDFLAGS="$PHP_LDFLAGS" \
-		# fix ARGON2 detection for 7.4-alpha1 https://github.com/docker-library/php/pull/840#pullrequestreview-249660894
-		ARGON2_LIBS="-largon2" \
-		ARGON2_CFLAGS="-I/usr/include" \
 	; \
 	docker-php-source extract; \
 	cd /usr/src/php; \

diff --git a/7.4-rc/alpine3.9/cli/Dockerfile b/7.4-rc/alpine3.9/cli/Dockerfile
@@ -113,9 +113,6 @@ RUN set -eux; \
 	export CFLAGS="$PHP_CFLAGS" \
 		CPPFLAGS="$PHP_CPPFLAGS" \
 		LDFLAGS="$PHP_LDFLAGS" \
-		# fix ARGON2 detection for 7.4-alpha1 https://github.com/docker-library/php/pull/840#pullrequestreview-249660894
-		ARGON2_LIBS="-largon2" \
-		ARGON2_CFLAGS="-I/usr/include" \
 	; \
 	docker-php-source extract; \
 	cd /usr/src/php; \

diff --git a/7.4-rc/alpine3.9/fpm/Dockerfile b/7.4-rc/alpine3.9/fpm/Dockerfile
@@ -114,9 +114,6 @@ RUN set -eux; \
 	export CFLAGS="$PHP_CFLAGS" \
 		CPPFLAGS="$PHP_CPPFLAGS" \
 		LDFLAGS="$PHP_LDFLAGS" \
-		# fix ARGON2 detection for 7.4-alpha1 https://github.com/docker-library/php/pull/840#pullrequestreview-249660894
-		ARGON2_LIBS="-largon2" \
-		ARGON2_CFLAGS="-I/usr/include" \
 	; \
 	docker-php-source extract; \
 	cd /usr/src/php; \

diff --git a/7.4-rc/alpine3.9/zts/Dockerfile b/7.4-rc/alpine3.9/zts/Dockerfile
@@ -114,9 +114,6 @@ RUN set -eux; \
 	export CFLAGS="$PHP_CFLAGS" \
 		CPPFLAGS="$PHP_CPPFLAGS" \
 		LDFLAGS="$PHP_LDFLAGS" \
-		# fix ARGON2 detection for 7.4-alpha1 https://github.com/docker-library/php/pull/840#pullrequestreview-249660894
-		ARGON2_LIBS="-largon2" \
-		ARGON2_CFLAGS="-I/usr/include" \
 	; \
 	docker-php-source extract; \
 	cd /usr/src/php; \

diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
@@ -107,9 +107,6 @@ RUN set -eux; \
 	export CFLAGS="$PHP_CFLAGS" \
 		CPPFLAGS="$PHP_CPPFLAGS" \
 		LDFLAGS="$PHP_LDFLAGS" \
-		# fix ARGON2 detection for 7.4-alpha1 https://github.com/docker-library/php/pull/840#pullrequestreview-249660894
-		ARGON2_LIBS="-largon2" \
-		ARGON2_CFLAGS="-I/usr/include" \
 	; \
 	docker-php-source extract; \
 	cd /usr/src/php; \

diff --git a/update.sh b/update.sh
@@ -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