Remove the Alpine argon2 library fix

The fix has been patched upstream in Alpine and upcoming
PHP 7.4.0alpha2.

Author: principlesoftware-dev

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; \

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; \

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; \

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; \

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; \

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; \

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; \