Update php #12021

tianon · 2022-03-10T23:54:19Z

Changes:

docker-library/php@399ed12: Merge pull request Use gnu-libiconv on alpine only for php iconv extension php#1264 from msierks-pcln/alpine-gnu-libiconv
docker-library/php@b62fa33: Use gnu-libiconv for php iconv extension on alpine
docker-library/php@7fcdbf3: Merge pull request Update iconv extension to be shared, so it can be disabled if necessary php#1262 from msierks-pcln/shared-iconv
docker-library/php@85143a1: Update iconv extension to be shared, so it can be disabled if necessary

Changes: - docker-library/php@399ed12: Merge pull request docker-library/php#1264 from msierks-pcln/alpine-gnu-libiconv - docker-library/php@b62fa33: Use gnu-libiconv for php iconv extension on alpine - docker-library/php@7fcdbf3: Merge pull request docker-library/php#1262 from msierks-pcln/shared-iconv - docker-library/php@85143a1: Update iconv extension to be shared, so it can be disabled if necessary

github-actions · 2022-03-10T23:56:48Z

Diff for d32c6c5:

diff --git a/_bashbrew-cat b/_bashbrew-cat
index 3d37756..f5c4f0e 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -3,380 +3,380 @@ GitRepo: https://github.com/docker-library/php.git
 
 Tags: 7.3.33-apache-bullseye, 7.3-apache-bullseye, 7.3.33-apache, 7.3-apache
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: c1d608310dcc10f419f2b344f57609162797f1eb
+GitCommit: b62fa33a7198244ea296e5f1845f99ff6363743c
 Directory: 7.3/bullseye/apache
 
 Tags: 7.3.33-apache-buster, 7.3-apache-buster
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: c1d608310dcc10f419f2b344f57609162797f1eb
+GitCommit: b62fa33a7198244ea296e5f1845f99ff6363743c
 Directory: 7.3/buster/apache
 
 Tags: 7.3.33-cli-alpine3.14, 7.3-cli-alpine3.14, 7.3.33-alpine3.14, 7.3-alpine3.14
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: c1d608310dcc10f419f2b344f57609162797f1eb
+GitCommit: b62fa33a7198244ea296e5f1845f99ff6363743c
 Directory: 7.3/alpine3.14/cli
 
 Tags: 7.3.33-cli-alpine3.15, 7.3-cli-alpine3.15, 7.3.33-alpine3.15, 7.3-alpine3.15, 7.3.33-cli-alpine, 7.3-cli-alpine, 7.3.33-alpine, 7.3-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: c1d608310dcc10f419f2b344f57609162797f1eb
+GitCommit: b62fa33a7198244ea296e5f1845f99ff6363743c
 Directory: 7.3/alpine3.15/cli
 
 Tags: 7.3.33-cli-bullseye, 7.3-cli-bullseye, 7.3.33-bullseye, 7.3-bullseye, 7.3.33-cli, 7.3-cli, 7.3.33, 7.3
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: c1d608310dcc10f419f2b344f57609162797f1eb
+GitCommit: b62fa33a7198244ea296e5f1845f99ff6363743c
 Directory: 7.3/bullseye/cli
 
 Tags: 7.3.33-cli-buster, 7.3-cli-buster, 7.3.33-buster, 7.3-buster
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: c1d608310dcc10f419f2b344f57609162797f1eb
+GitCommit: b62fa33a7198244ea296e5f1845f99ff6363743c
 Directory: 7.3/buster/cli
 
 Tags: 7.3.33-fpm-alpine3.14, 7.3-fpm-alpine3.14
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: c1d608310dcc10f419f2b344f57609162797f1eb
+GitCommit: b62fa33a7198244ea296e5f1845f99ff6363743c
 Directory: 7.3/alpine3.14/fpm
 
 Tags: 7.3.33-fpm-alpine3.15, 7.3-fpm-alpine3.15, 7.3.33-fpm-alpine, 7.3-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: c1d608310dcc10f419f2b344f57609162797f1eb
+GitCommit: b62fa33a7198244ea296e5f1845f99ff6363743c
 Directory: 7.3/alpine3.15/fpm
 
 Tags: 7.3.33-fpm-bullseye, 7.3-fpm-bullseye, 7.3.33-fpm, 7.3-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: c1d608310dcc10f419f2b344f57609162797f1eb
+GitCommit: b62fa33a7198244ea296e5f1845f99ff6363743c
 Directory: 7.3/bullseye/fpm
 
 Tags: 7.3.33-fpm-buster, 7.3-fpm-buster
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: c1d608310dcc10f419f2b344f57609162797f1eb
+GitCommit: b62fa33a7198244ea296e5f1845f99ff6363743c
 Directory: 7.3/buster/fpm
 
 Tags: 7.3.33-zts-alpine3.14, 7.3-zts-alpine3.14
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: c1d608310dcc10f419f2b344f57609162797f1eb
+GitCommit: b62fa33a7198244ea296e5f1845f99ff6363743c
 Directory: 7.3/alpine3.14/zts
 
 Tags: 7.3.33-zts-alpine3.15, 7.3-zts-alpine3.15, 7.3.33-zts-alpine, 7.3-zts-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: c1d608310dcc10f419f2b344f57609162797f1eb
+GitCommit: b62fa33a7198244ea296e5f1845f99ff6363743c
 Directory: 7.3/alpine3.15/zts
 
 Tags: 7.3.33-zts-bullseye, 7.3-zts-bullseye, 7.3.33-zts, 7.3-zts
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: c1d608310dcc10f419f2b344f57609162797f1eb
+GitCommit: b62fa33a7198244ea296e5f1845f99ff6363743c
 Directory: 7.3/bullseye/zts
 
 Tags: 7.3.33-zts-buster, 7.3-zts-buster
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: c1d608310dcc10f419f2b344f57609162797f1eb
+GitCommit: b62fa33a7198244ea296e5f1845f99ff6363743c
 Directory: 7.3/buster/zts
 
 Tags: 7.4.28-apache-bullseye, 7.4-apache-bullseye, 7-apache-bullseye, 7.4.28-apache, 7.4-apache, 7-apache
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: c1d608310dcc10f419f2b344f57609162797f1eb
+GitCommit: b62fa33a7198244ea296e5f1845f99ff6363743c
 Directory: 7.4/bullseye/apache
 
 Tags: 7.4.28-apache-buster, 7.4-apache-buster, 7-apache-buster
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: c1d608310dcc10f419f2b344f57609162797f1eb
+GitCommit: b62fa33a7198244ea296e5f1845f99ff6363743c
 Directory: 7.4/buster/apache
 
 Tags: 7.4.28-cli-alpine3.14, 7.4-cli-alpine3.14, 7-cli-alpine3.14, 7.4.28-alpine3.14, 7.4-alpine3.14, 7-alpine3.14
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: c1d608310dcc10f419f2b344f57609162797f1eb
+GitCommit: b62fa33a7198244ea296e5f1845f99ff6363743c
 Directory: 7.4/alpine3.14/cli
 
 Tags: 7.4.28-cli-alpine3.15, 7.4-cli-alpine3.15, 7-cli-alpine3.15, 7.4.28-alpine3.15, 7.4-alpine3.15, 7-alpine3.15, 7.4.28-cli-alpine, 7.4-cli-alpine, 7-cli-alpine, 7.4.28-alpine, 7.4-alpine, 7-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: c1d608310dcc10f419f2b344f57609162797f1eb
+GitCommit: b62fa33a7198244ea296e5f1845f99ff6363743c
 Directory: 7.4/alpine3.15/cli
 
 Tags: 7.4.28-cli-bullseye, 7.4-cli-bullseye, 7-cli-bullseye, 7.4.28-bullseye, 7.4-bullseye, 7-bullseye, 7.4.28-cli, 7.4-cli, 7-cli, 7.4.28, 7.4, 7
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: c1d608310dcc10f419f2b344f57609162797f1eb
+GitCommit: b62fa33a7198244ea296e5f1845f99ff6363743c
 Directory: 7.4/bullseye/cli
 
 Tags: 7.4.28-cli-buster, 7.4-cli-buster, 7-cli-buster, 7.4.28-buster, 7.4-buster, 7-buster
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: c1d608310dcc10f419f2b344f57609162797f1eb
+GitCommit: b62fa33a7198244ea296e5f1845f99ff6363743c
 Directory: 7.4/buster/cli
 
 Tags: 7.4.28-fpm-alpine3.14, 7.4-fpm-alpine3.14, 7-fpm-alpine3.14
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: c1d608310dcc10f419f2b344f57609162797f1eb
+GitCommit: b62fa33a7198244ea296e5f1845f99ff6363743c
 Directory: 7.4/alpine3.14/fpm
 
 Tags: 7.4.28-fpm-alpine3.15, 7.4-fpm-alpine3.15, 7-fpm-alpine3.15, 7.4.28-fpm-alpine, 7.4-fpm-alpine, 7-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: c1d608310dcc10f419f2b344f57609162797f1eb
+GitCommit: b62fa33a7198244ea296e5f1845f99ff6363743c
 Directory: 7.4/alpine3.15/fpm
 
 Tags: 7.4.28-fpm-bullseye, 7.4-fpm-bullseye, 7-fpm-bullseye, 7.4.28-fpm, 7.4-fpm, 7-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: c1d608310dcc10f419f2b344f57609162797f1eb
+GitCommit: b62fa33a7198244ea296e5f1845f99ff6363743c
 Directory: 7.4/bullseye/fpm
 
 Tags: 7.4.28-fpm-buster, 7.4-fpm-buster, 7-fpm-buster
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: c1d608310dcc10f419f2b344f57609162797f1eb
+GitCommit: b62fa33a7198244ea296e5f1845f99ff6363743c
 Directory: 7.4/buster/fpm
 
 Tags: 7.4.28-zts-alpine3.14, 7.4-zts-alpine3.14, 7-zts-alpine3.14
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: c1d608310dcc10f419f2b344f57609162797f1eb
+GitCommit: b62fa33a7198244ea296e5f1845f99ff6363743c
 Directory: 7.4/alpine3.14/zts
 
 Tags: 7.4.28-zts-alpine3.15, 7.4-zts-alpine3.15, 7-zts-alpine3.15, 7.4.28-zts-alpine, 7.4-zts-alpine, 7-zts-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: c1d608310dcc10f419f2b344f57609162797f1eb
+GitCommit: b62fa33a7198244ea296e5f1845f99ff6363743c
 Directory: 7.4/alpine3.15/zts
 
 Tags: 7.4.28-zts-bullseye, 7.4-zts-bullseye, 7-zts-bullseye, 7.4.28-zts, 7.4-zts, 7-zts
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: c1d608310dcc10f419f2b344f57609162797f1eb
+GitCommit: b62fa33a7198244ea296e5f1845f99ff6363743c
 Directory: 7.4/bullseye/zts
 
 Tags: 7.4.28-zts-buster, 7.4-zts-buster, 7-zts-buster
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: c1d608310dcc10f419f2b344f57609162797f1eb
+GitCommit: b62fa33a7198244ea296e5f1845f99ff6363743c
 Directory: 7.4/buster/zts
 
 Tags: 8.0.16-apache-bullseye, 8.0-apache-bullseye, 8.0.16-apache, 8.0-apache
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: c1d608310dcc10f419f2b344f57609162797f1eb
+GitCommit: b62fa33a7198244ea296e5f1845f99ff6363743c
 Directory: 8.0/bullseye/apache
 
 Tags: 8.0.16-apache-buster, 8.0-apache-buster
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: c1d608310dcc10f419f2b344f57609162797f1eb
+GitCommit: b62fa33a7198244ea296e5f1845f99ff6363743c
 Directory: 8.0/buster/apache
 
 Tags: 8.0.16-cli-alpine3.14, 8.0-cli-alpine3.14, 8.0.16-alpine3.14, 8.0-alpine3.14
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: c1d608310dcc10f419f2b344f57609162797f1eb
+GitCommit: b62fa33a7198244ea296e5f1845f99ff6363743c
 Directory: 8.0/alpine3.14/cli
 
 Tags: 8.0.16-cli-alpine3.15, 8.0-cli-alpine3.15, 8.0.16-alpine3.15, 8.0-alpine3.15, 8.0.16-cli-alpine, 8.0-cli-alpine, 8.0.16-alpine, 8.0-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: c1d608310dcc10f419f2b344f57609162797f1eb
+GitCommit: b62fa33a7198244ea296e5f1845f99ff6363743c
 Directory: 8.0/alpine3.15/cli
 
 Tags: 8.0.16-cli-bullseye, 8.0-cli-bullseye, 8.0.16-bullseye, 8.0-bullseye, 8.0.16-cli, 8.0-cli, 8.0.16, 8.0
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: c1d608310dcc10f419f2b344f57609162797f1eb
+GitCommit: b62fa33a7198244ea296e5f1845f99ff6363743c
 Directory: 8.0/bullseye/cli
 
 Tags: 8.0.16-cli-buster, 8.0-cli-buster, 8.0.16-buster, 8.0-buster
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: c1d608310dcc10f419f2b344f57609162797f1eb
+GitCommit: b62fa33a7198244ea296e5f1845f99ff6363743c
 Directory: 8.0/buster/cli
 
 Tags: 8.0.16-fpm-alpine3.14, 8.0-fpm-alpine3.14
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: c1d608310dcc10f419f2b344f57609162797f1eb
+GitCommit: b62fa33a7198244ea296e5f1845f99ff6363743c
 Directory: 8.0/alpine3.14/fpm
 
 Tags: 8.0.16-fpm-alpine3.15, 8.0-fpm-alpine3.15, 8.0.16-fpm-alpine, 8.0-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: c1d608310dcc10f419f2b344f57609162797f1eb
+GitCommit: b62fa33a7198244ea296e5f1845f99ff6363743c
 Directory: 8.0/alpine3.15/fpm
 
 Tags: 8.0.16-fpm-bullseye, 8.0-fpm-bullseye, 8.0.16-fpm, 8.0-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: c1d608310dcc10f419f2b344f57609162797f1eb
+GitCommit: b62fa33a7198244ea296e5f1845f99ff6363743c
 Directory: 8.0/bullseye/fpm
 
 Tags: 8.0.16-fpm-buster, 8.0-fpm-buster
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: c1d608310dcc10f419f2b344f57609162797f1eb
+GitCommit: b62fa33a7198244ea296e5f1845f99ff6363743c
 Directory: 8.0/buster/fpm
 
 Tags: 8.0.16-zts-bullseye, 8.0-zts-bullseye, 8.0.16-zts, 8.0-zts
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: c1d608310dcc10f419f2b344f57609162797f1eb
+GitCommit: b62fa33a7198244ea296e5f1845f99ff6363743c
 Directory: 8.0/bullseye/zts
 
 Tags: 8.0.16-zts-buster, 8.0-zts-buster
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: c1d608310dcc10f419f2b344f57609162797f1eb
+GitCommit: b62fa33a7198244ea296e5f1845f99ff6363743c
 Directory: 8.0/buster/zts
 
 Tags: 8.0.17RC1-apache-bullseye, 8.0-rc-apache-bullseye, 8.0.17RC1-apache, 8.0-rc-apache
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 65ec3ff84e1020a4fd9de9969aa7356c75b7bf83
+GitCommit: b62fa33a7198244ea296e5f1845f99ff6363743c
 Directory: 8.0-rc/bullseye/apache
 
 Tags: 8.0.17RC1-apache-buster, 8.0-rc-apache-buster
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 65ec3ff84e1020a4fd9de9969aa7356c75b7bf83
+GitCommit: b62fa33a7198244ea296e5f1845f99ff6363743c
 Directory: 8.0-rc/buster/apache
 
 Tags: 8.0.17RC1-cli-alpine3.14, 8.0-rc-cli-alpine3.14, 8.0.17RC1-alpine3.14, 8.0-rc-alpine3.14
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 65ec3ff84e1020a4fd9de9969aa7356c75b7bf83
+GitCommit: b62fa33a7198244ea296e5f1845f99ff6363743c
 Directory: 8.0-rc/alpine3.14/cli
 
 Tags: 8.0.17RC1-cli-alpine3.15, 8.0-rc-cli-alpine3.15, 8.0.17RC1-alpine3.15, 8.0-rc-alpine3.15, 8.0.17RC1-cli-alpine, 8.0-rc-cli-alpine, 8.0.17RC1-alpine, 8.0-rc-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 65ec3ff84e1020a4fd9de9969aa7356c75b7bf83
+GitCommit: b62fa33a7198244ea296e5f1845f99ff6363743c
 Directory: 8.0-rc/alpine3.15/cli
 
 Tags: 8.0.17RC1-cli-bullseye, 8.0-rc-cli-bullseye, 8.0.17RC1-bullseye, 8.0-rc-bullseye, 8.0.17RC1-cli, 8.0-rc-cli, 8.0.17RC1, 8.0-rc
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 65ec3ff84e1020a4fd9de9969aa7356c75b7bf83
+GitCommit: b62fa33a7198244ea296e5f1845f99ff6363743c
 Directory: 8.0-rc/bullseye/cli
 
 Tags: 8.0.17RC1-cli-buster, 8.0-rc-cli-buster, 8.0.17RC1-buster, 8.0-rc-buster
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 65ec3ff84e1020a4fd9de9969aa7356c75b7bf83
+GitCommit: b62fa33a7198244ea296e5f1845f99ff6363743c
 Directory: 8.0-rc/buster/cli
 
 Tags: 8.0.17RC1-fpm-alpine3.14, 8.0-rc-fpm-alpine3.14
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 65ec3ff84e1020a4fd9de9969aa7356c75b7bf83
+GitCommit: b62fa33a7198244ea296e5f1845f99ff6363743c
 Directory: 8.0-rc/alpine3.14/fpm
 
 Tags: 8.0.17RC1-fpm-alpine3.15, 8.0-rc-fpm-alpine3.15, 8.0.17RC1-fpm-alpine, 8.0-rc-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 65ec3ff84e1020a4fd9de9969aa7356c75b7bf83
+GitCommit: b62fa33a7198244ea296e5f1845f99ff6363743c
 Directory: 8.0-rc/alpine3.15/fpm
 
 Tags: 8.0.17RC1-fpm-bullseye, 8.0-rc-fpm-bullseye, 8.0.17RC1-fpm, 8.0-rc-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 65ec3ff84e1020a4fd9de9969aa7356c75b7bf83
+GitCommit: b62fa33a7198244ea296e5f1845f99ff6363743c
 Directory: 8.0-rc/bullseye/fpm
 
 Tags: 8.0.17RC1-fpm-buster, 8.0-rc-fpm-buster
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 65ec3ff84e1020a4fd9de9969aa7356c75b7bf83
+GitCommit: b62fa33a7198244ea296e5f1845f99ff6363743c
 Directory: 8.0-rc/buster/fpm
 
 Tags: 8.0.17RC1-zts-bullseye, 8.0-rc-zts-bullseye, 8.0.17RC1-zts, 8.0-rc-zts
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 65ec3ff84e1020a4fd9de9969aa7356c75b7bf83
+GitCommit: b62fa33a7198244ea296e5f1845f99ff6363743c
 Directory: 8.0-rc/bullseye/zts
 
 Tags: 8.0.17RC1-zts-buster, 8.0-rc-zts-buster
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 65ec3ff84e1020a4fd9de9969aa7356c75b7bf83
+GitCommit: b62fa33a7198244ea296e5f1845f99ff6363743c
 Directory: 8.0-rc/buster/zts
 
 Tags: 8.1.3-apache-bullseye, 8.1-apache-bullseye, 8-apache-bullseye, apache-bullseye, 8.1.3-apache, 8.1-apache, 8-apache, apache
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: c1d608310dcc10f419f2b344f57609162797f1eb
+GitCommit: b62fa33a7198244ea296e5f1845f99ff6363743c
 Directory: 8.1/bullseye/apache
 
 Tags: 8.1.3-apache-buster, 8.1-apache-buster, 8-apache-buster, apache-buster
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: c1d608310dcc10f419f2b344f57609162797f1eb
+GitCommit: b62fa33a7198244ea296e5f1845f99ff6363743c
 Directory: 8.1/buster/apache
 
 Tags: 8.1.3-cli-alpine3.14, 8.1-cli-alpine3.14, 8-cli-alpine3.14, cli-alpine3.14, 8.1.3-alpine3.14, 8.1-alpine3.14, 8-alpine3.14, alpine3.14
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: c1d608310dcc10f419f2b344f57609162797f1eb
+GitCommit: b62fa33a7198244ea296e5f1845f99ff6363743c
 Directory: 8.1/alpine3.14/cli
 
 Tags: 8.1.3-cli-alpine3.15, 8.1-cli-alpine3.15, 8-cli-alpine3.15, cli-alpine3.15, 8.1.3-alpine3.15, 8.1-alpine3.15, 8-alpine3.15, alpine3.15, 8.1.3-cli-alpine, 8.1-cli-alpine, 8-cli-alpine, cli-alpine, 8.1.3-alpine, 8.1-alpine, 8-alpine, alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: c1d608310dcc10f419f2b344f57609162797f1eb
+GitCommit: b62fa33a7198244ea296e5f1845f99ff6363743c
 Directory: 8.1/alpine3.15/cli
 
 Tags: 8.1.3-cli-bullseye, 8.1-cli-bullseye, 8-cli-bullseye, cli-bullseye, 8.1.3-bullseye, 8.1-bullseye, 8-bullseye, bullseye, 8.1.3-cli, 8.1-cli, 8-cli, cli, 8.1.3, 8.1, 8, latest
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: c1d608310dcc10f419f2b344f57609162797f1eb
+GitCommit: b62fa33a7198244ea296e5f1845f99ff6363743c
 Directory: 8.1/bullseye/cli
 
 Tags: 8.1.3-cli-buster, 8.1-cli-buster, 8-cli-buster, cli-buster, 8.1.3-buster, 8.1-buster, 8-buster, buster
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: c1d608310dcc10f419f2b344f57609162797f1eb
+GitCommit: b62fa33a7198244ea296e5f1845f99ff6363743c
 Directory: 8.1/buster/cli
 
 Tags: 8.1.3-fpm-alpine3.14, 8.1-fpm-alpine3.14, 8-fpm-alpine3.14, fpm-alpine3.14
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: c1d608310dcc10f419f2b344f57609162797f1eb
+GitCommit: b62fa33a7198244ea296e5f1845f99ff6363743c
 Directory: 8.1/alpine3.14/fpm
 
 Tags: 8.1.3-fpm-alpine3.15, 8.1-fpm-alpine3.15, 8-fpm-alpine3.15, fpm-alpine3.15, 8.1.3-fpm-alpine, 8.1-fpm-alpine, 8-fpm-alpine, fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: c1d608310dcc10f419f2b344f57609162797f1eb
+GitCommit: b62fa33a7198244ea296e5f1845f99ff6363743c
 Directory: 8.1/alpine3.15/fpm
 
 Tags: 8.1.3-fpm-bullseye, 8.1-fpm-bullseye, 8-fpm-bullseye, fpm-bullseye, 8.1.3-fpm, 8.1-fpm, 8-fpm, fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: c1d608310dcc10f419f2b344f57609162797f1eb
+GitCommit: b62fa33a7198244ea296e5f1845f99ff6363743c
 Directory: 8.1/bullseye/fpm
 
 Tags: 8.1.3-fpm-buster, 8.1-fpm-buster, 8-fpm-buster, fpm-buster
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: c1d608310dcc10f419f2b344f57609162797f1eb
+GitCommit: b62fa33a7198244ea296e5f1845f99ff6363743c
 Directory: 8.1/buster/fpm
 
 Tags: 8.1.3-zts-bullseye, 8.1-zts-bullseye, 8-zts-bullseye, zts-bullseye, 8.1.3-zts, 8.1-zts, 8-zts, zts
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: c1d608310dcc10f419f2b344f57609162797f1eb
+GitCommit: b62fa33a7198244ea296e5f1845f99ff6363743c
 Directory: 8.1/bullseye/zts
 
 Tags: 8.1.3-zts-buster, 8.1-zts-buster, 8-zts-buster, zts-buster
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: c1d608310dcc10f419f2b344f57609162797f1eb
+GitCommit: b62fa33a7198244ea296e5f1845f99ff6363743c
 Directory: 8.1/buster/zts
 
 Tags: 8.1.4RC1-apache-bullseye, 8.1-rc-apache-bullseye, 8.1.4RC1-apache, 8.1-rc-apache
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: b3e617367771db15eeafabc6a52209c0b24ea823
+GitCommit: b62fa33a7198244ea296e5f1845f99ff6363743c
 Directory: 8.1-rc/bullseye/apache
 
 Tags: 8.1.4RC1-apache-buster, 8.1-rc-apache-buster
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: b3e617367771db15eeafabc6a52209c0b24ea823
+GitCommit: b62fa33a7198244ea296e5f1845f99ff6363743c
 Directory: 8.1-rc/buster/apache
 
 Tags: 8.1.4RC1-cli-alpine3.14, 8.1-rc-cli-alpine3.14, 8.1.4RC1-alpine3.14, 8.1-rc-alpine3.14
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: b3e617367771db15eeafabc6a52209c0b24ea823
+GitCommit: b62fa33a7198244ea296e5f1845f99ff6363743c
 Directory: 8.1-rc/alpine3.14/cli
 
 Tags: 8.1.4RC1-cli-alpine3.15, 8.1-rc-cli-alpine3.15, 8.1.4RC1-alpine3.15, 8.1-rc-alpine3.15, 8.1.4RC1-cli-alpine, 8.1-rc-cli-alpine, 8.1.4RC1-alpine, 8.1-rc-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: b3e617367771db15eeafabc6a52209c0b24ea823
+GitCommit: b62fa33a7198244ea296e5f1845f99ff6363743c
 Directory: 8.1-rc/alpine3.15/cli
 
 Tags: 8.1.4RC1-cli-bullseye, 8.1-rc-cli-bullseye, 8.1.4RC1-bullseye, 8.1-rc-bullseye, 8.1.4RC1-cli, 8.1-rc-cli, 8.1.4RC1, 8.1-rc
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: b3e617367771db15eeafabc6a52209c0b24ea823
+GitCommit: b62fa33a7198244ea296e5f1845f99ff6363743c
 Directory: 8.1-rc/bullseye/cli
 
 Tags: 8.1.4RC1-cli-buster, 8.1-rc-cli-buster, 8.1.4RC1-buster, 8.1-rc-buster
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: b3e617367771db15eeafabc6a52209c0b24ea823
+GitCommit: b62fa33a7198244ea296e5f1845f99ff6363743c
 Directory: 8.1-rc/buster/cli
 
 Tags: 8.1.4RC1-fpm-alpine3.14, 8.1-rc-fpm-alpine3.14
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: b3e617367771db15eeafabc6a52209c0b24ea823
+GitCommit: b62fa33a7198244ea296e5f1845f99ff6363743c
 Directory: 8.1-rc/alpine3.14/fpm
 
 Tags: 8.1.4RC1-fpm-alpine3.15, 8.1-rc-fpm-alpine3.15, 8.1.4RC1-fpm-alpine, 8.1-rc-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: b3e617367771db15eeafabc6a52209c0b24ea823
+GitCommit: b62fa33a7198244ea296e5f1845f99ff6363743c
 Directory: 8.1-rc/alpine3.15/fpm
 
 Tags: 8.1.4RC1-fpm-bullseye, 8.1-rc-fpm-bullseye, 8.1.4RC1-fpm, 8.1-rc-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: b3e617367771db15eeafabc6a52209c0b24ea823
+GitCommit: b62fa33a7198244ea296e5f1845f99ff6363743c
 Directory: 8.1-rc/bullseye/fpm
 
 Tags: 8.1.4RC1-fpm-buster, 8.1-rc-fpm-buster
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: b3e617367771db15eeafabc6a52209c0b24ea823
+GitCommit: b62fa33a7198244ea296e5f1845f99ff6363743c
 Directory: 8.1-rc/buster/fpm
 
 Tags: 8.1.4RC1-zts-bullseye, 8.1-rc-zts-bullseye, 8.1.4RC1-zts, 8.1-rc-zts
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: b3e617367771db15eeafabc6a52209c0b24ea823
+GitCommit: b62fa33a7198244ea296e5f1845f99ff6363743c
 Directory: 8.1-rc/bullseye/zts
 
 Tags: 8.1.4RC1-zts-buster, 8.1-rc-zts-buster
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: b3e617367771db15eeafabc6a52209c0b24ea823
+GitCommit: b62fa33a7198244ea296e5f1845f99ff6363743c
 Directory: 8.1-rc/buster/zts
diff --git a/php_7-alpine/Dockerfile b/php_7-alpine/Dockerfile
index 40ce8e8..ecf98da 100644
--- a/php_7-alpine/Dockerfile
+++ b/php_7-alpine/Dockerfile
@@ -95,6 +95,7 @@ RUN set -eux; \
 		argon2-dev \
 		coreutils \
 		curl-dev \
+		gnu-libiconv-dev \
 		libsodium-dev \
 		libxml2-dev \
 		linux-headers \
@@ -104,6 +105,11 @@ RUN set -eux; \
 		sqlite-dev \
 	; \
 	\
+# make sure musl's iconv doesn't get used (https://www.php.net/manual/en/intro.iconv.php)
+	rm -vf /usr/include/iconv.h; \
+# PHP < 8 doesn't know to look deeper for GNU libiconv: https://github.com/php/php-src/commit/b480e6841ecd5317faa136647a2b8253a4c2d0df
+	ln -sv /usr/include/gnu-libiconv/*.h /usr/include/; \
+	\
 	export \
 		CFLAGS="$PHP_CFLAGS" \
 		CPPFLAGS="$PHP_CPPFLAGS" \
@@ -141,6 +147,7 @@ RUN set -eux; \
 		--with-sqlite3=/usr \
 		\
 		--with-curl \
+		--with-iconv=/usr \
 		--with-openssl \
 		--with-readline \
 		--with-zlib \
diff --git a/php_7-alpine3.14/Dockerfile b/php_7-alpine3.14/Dockerfile
index b685bf4..713d6b7 100644
--- a/php_7-alpine3.14/Dockerfile
+++ b/php_7-alpine3.14/Dockerfile
@@ -95,6 +95,7 @@ RUN set -eux; \
 		argon2-dev \
 		coreutils \
 		curl-dev \
+		gnu-libiconv-dev \
 		libsodium-dev \
 		libxml2-dev \
 		linux-headers \
@@ -104,6 +105,11 @@ RUN set -eux; \
 		sqlite-dev \
 	; \
 	\
+# make sure musl's iconv doesn't get used (https://www.php.net/manual/en/intro.iconv.php)
+	rm -vf /usr/include/iconv.h; \
+# PHP < 8 doesn't know to look deeper for GNU libiconv: https://github.com/php/php-src/commit/b480e6841ecd5317faa136647a2b8253a4c2d0df
+	ln -sv /usr/include/gnu-libiconv/*.h /usr/include/; \
+	\
 	export \
 		CFLAGS="$PHP_CFLAGS" \
 		CPPFLAGS="$PHP_CPPFLAGS" \
@@ -141,6 +147,7 @@ RUN set -eux; \
 		--with-sqlite3=/usr \
 		\
 		--with-curl \
+		--with-iconv=/usr \
 		--with-openssl \
 		--with-readline \
 		--with-zlib \
diff --git a/php_7-apache-buster/Dockerfile b/php_7-apache-buster/Dockerfile
index 34fd2cb..726cf09 100644
--- a/php_7-apache-buster/Dockerfile
+++ b/php_7-apache-buster/Dockerfile
@@ -214,6 +214,7 @@ RUN set -eux; \
 		--with-sqlite3=/usr \
 		\
 		--with-curl \
+		--with-iconv \
 		--with-openssl \
 		--with-readline \
 		--with-zlib \
diff --git a/php_7-apache/Dockerfile b/php_7-apache/Dockerfile
index e81a7ca..deeefcf 100644
--- a/php_7-apache/Dockerfile
+++ b/php_7-apache/Dockerfile
@@ -214,6 +214,7 @@ RUN set -eux; \
 		--with-sqlite3=/usr \
 		\
 		--with-curl \
+		--with-iconv \
 		--with-openssl \
 		--with-readline \
 		--with-zlib \
diff --git a/php_7-buster/Dockerfile b/php_7-buster/Dockerfile
index 0d2823a..811f21a 100644
--- a/php_7-buster/Dockerfile
+++ b/php_7-buster/Dockerfile
@@ -155,6 +155,7 @@ RUN set -eux; \
 		--with-sqlite3=/usr \
 		\
 		--with-curl \
+		--with-iconv \
 		--with-openssl \
 		--with-readline \
 		--with-zlib \
diff --git a/php_7-fpm-alpine/Dockerfile b/php_7-fpm-alpine/Dockerfile
index 7521c94..5768aac 100644
--- a/php_7-fpm-alpine/Dockerfile
+++ b/php_7-fpm-alpine/Dockerfile
@@ -95,6 +95,7 @@ RUN set -eux; \
 		argon2-dev \
 		coreutils \
 		curl-dev \
+		gnu-libiconv-dev \
 		libsodium-dev \
 		libxml2-dev \
 		linux-headers \
@@ -104,6 +105,11 @@ RUN set -eux; \
 		sqlite-dev \
 	; \
 	\
+# make sure musl's iconv doesn't get used (https://www.php.net/manual/en/intro.iconv.php)
+	rm -vf /usr/include/iconv.h; \
+# PHP < 8 doesn't know to look deeper for GNU libiconv: https://github.com/php/php-src/commit/b480e6841ecd5317faa136647a2b8253a4c2d0df
+	ln -sv /usr/include/gnu-libiconv/*.h /usr/include/; \
+	\
 	export \
 		CFLAGS="$PHP_CFLAGS" \
 		CPPFLAGS="$PHP_CPPFLAGS" \
@@ -141,6 +147,7 @@ RUN set -eux; \
 		--with-sqlite3=/usr \
 		\
 		--with-curl \
+		--with-iconv=/usr \
 		--with-openssl \
 		--with-readline \
 		--with-zlib \
diff --git a/php_7-fpm-alpine3.14/Dockerfile b/php_7-fpm-alpine3.14/Dockerfile
index 20deecb..4089e92 100644
--- a/php_7-fpm-alpine3.14/Dockerfile
+++ b/php_7-fpm-alpine3.14/Dockerfile
@@ -95,6 +95,7 @@ RUN set -eux; \
 		argon2-dev \
 		coreutils \
 		curl-dev \
+		gnu-libiconv-dev \
 		libsodium-dev \
 		libxml2-dev \
 		linux-headers \
@@ -104,6 +105,11 @@ RUN set -eux; \
 		sqlite-dev \
 	; \
 	\
+# make sure musl's iconv doesn't get used (https://www.php.net/manual/en/intro.iconv.php)
+	rm -vf /usr/include/iconv.h; \
+# PHP < 8 doesn't know to look deeper for GNU libiconv: https://github.com/php/php-src/commit/b480e6841ecd5317faa136647a2b8253a4c2d0df
+	ln -sv /usr/include/gnu-libiconv/*.h /usr/include/; \
+	\
 	export \
 		CFLAGS="$PHP_CFLAGS" \
 		CPPFLAGS="$PHP_CPPFLAGS" \
@@ -141,6 +147,7 @@ RUN set -eux; \
 		--with-sqlite3=/usr \
 		\
 		--with-curl \
+		--with-iconv=/usr \
 		--with-openssl \
 		--with-readline \
 		--with-zlib \
diff --git a/php_7-fpm-buster/Dockerfile b/php_7-fpm-buster/Dockerfile
index 429c9fe..dfbb537 100644
--- a/php_7-fpm-buster/Dockerfile
+++ b/php_7-fpm-buster/Dockerfile
@@ -155,6 +155,7 @@ RUN set -eux; \
 		--with-sqlite3=/usr \
 		\
 		--with-curl \
+		--with-iconv \
 		--with-openssl \
 		--with-readline \
 		--with-zlib \
diff --git a/php_7-fpm/Dockerfile b/php_7-fpm/Dockerfile
index 11731e4..68f05e4 100644
--- a/php_7-fpm/Dockerfile
+++ b/php_7-fpm/Dockerfile
@@ -155,6 +155,7 @@ RUN set -eux; \
 		--with-sqlite3=/usr \
 		\
 		--with-curl \
+		--with-iconv \
 		--with-openssl \
 		--with-readline \
 		--with-zlib \
diff --git a/php_7-zts-alpine/Dockerfile b/php_7-zts-alpine/Dockerfile
index 232d1c5..3598e41 100644
--- a/php_7-zts-alpine/Dockerfile
+++ b/php_7-zts-alpine/Dockerfile
@@ -95,6 +95,7 @@ RUN set -eux; \
 		argon2-dev \
 		coreutils \
 		curl-dev \
+		gnu-libiconv-dev \
 		libsodium-dev \
 		libxml2-dev \
 		linux-headers \
@@ -104,6 +105,11 @@ RUN set -eux; \
 		sqlite-dev \
 	; \
 	\
+# make sure musl's iconv doesn't get used (https://www.php.net/manual/en/intro.iconv.php)
+	rm -vf /usr/include/iconv.h; \
+# PHP < 8 doesn't know to look deeper for GNU libiconv: https://github.com/php/php-src/commit/b480e6841ecd5317faa136647a2b8253a4c2d0df
+	ln -sv /usr/include/gnu-libiconv/*.h /usr/include/; \
+	\
 	export \
 		CFLAGS="$PHP_CFLAGS" \
 		CPPFLAGS="$PHP_CPPFLAGS" \
@@ -141,6 +147,7 @@ RUN set -eux; \
 		--with-sqlite3=/usr \
 		\
 		--with-curl \
+		--with-iconv=/usr \
 		--with-openssl \
 		--with-readline \
 		--with-zlib \
diff --git a/php_7-zts-alpine3.14/Dockerfile b/php_7-zts-alpine3.14/Dockerfile
index 34ec637..3aed583 100644
--- a/php_7-zts-alpine3.14/Dockerfile
+++ b/php_7-zts-alpine3.14/Dockerfile
@@ -95,6 +95,7 @@ RUN set -eux; \
 		argon2-dev \
 		coreutils \
 		curl-dev \
+		gnu-libiconv-dev \
 		libsodium-dev \
 		libxml2-dev \
 		linux-headers \
@@ -104,6 +105,11 @@ RUN set -eux; \
 		sqlite-dev \
 	; \
 	\
+# make sure musl's iconv doesn't get used (https://www.php.net/manual/en/intro.iconv.php)
+	rm -vf /usr/include/iconv.h; \
+# PHP < 8 doesn't know to look deeper for GNU libiconv: https://github.com/php/php-src/commit/b480e6841ecd5317faa136647a2b8253a4c2d0df
+	ln -sv /usr/include/gnu-libiconv/*.h /usr/include/; \
+	\
 	export \
 		CFLAGS="$PHP_CFLAGS" \
 		CPPFLAGS="$PHP_CPPFLAGS" \
@@ -141,6 +147,7 @@ RUN set -eux; \
 		--with-sqlite3=/usr \
 		\
 		--with-curl \
+		--with-iconv=/usr \
 		--with-openssl \
 		--with-readline \
 		--with-zlib \
diff --git a/php_7-zts-buster/Dockerfile b/php_7-zts-buster/Dockerfile
index fe5f867..ff3eb31 100644
--- a/php_7-zts-buster/Dockerfile
+++ b/php_7-zts-buster/Dockerfile
@@ -155,6 +155,7 @@ RUN set -eux; \
 		--with-sqlite3=/usr \
 		\
 		--with-curl \
+		--with-iconv \
 		--with-openssl \
 		--with-readline \
 		--with-zlib \
diff --git a/php_7-zts/Dockerfile b/php_7-zts/Dockerfile
index 8ae5161..c4230aa 100644
--- a/php_7-zts/Dockerfile
+++ b/php_7-zts/Dockerfile
@@ -155,6 +155,7 @@ RUN set -eux; \
 		--with-sqlite3=/usr \
 		\
 		--with-curl \
+		--with-iconv \
 		--with-openssl \
 		--with-readline \
 		--with-zlib \
diff --git a/php_7.3-alpine/Dockerfile b/php_7.3-alpine/Dockerfile
index dd34b99..1fb20b1 100644
--- a/php_7.3-alpine/Dockerfile
+++ b/php_7.3-alpine/Dockerfile
@@ -95,6 +95,7 @@ RUN set -eux; \
 		argon2-dev \
 		coreutils \
 		curl-dev \
+		gnu-libiconv-dev \
 		libsodium-dev \
 		libxml2-dev \
 		openssl-dev \
@@ -102,6 +103,11 @@ RUN set -eux; \
 		sqlite-dev \
 	; \
 	\
+# make sure musl's iconv doesn't get used (https://www.php.net/manual/en/intro.iconv.php)
+	rm -vf /usr/include/iconv.h; \
+# PHP < 8 doesn't know to look deeper for GNU libiconv: https://github.com/php/php-src/commit/b480e6841ecd5317faa136647a2b8253a4c2d0df
+	ln -sv /usr/include/gnu-libiconv/*.h /usr/include/; \
+	\
 	export \
 		CFLAGS="$PHP_CFLAGS" \
 		CPPFLAGS="$PHP_CPPFLAGS" \
@@ -139,6 +145,7 @@ RUN set -eux; \
 		--with-sqlite3=/usr \
 		\
 		--with-curl \
+		--with-iconv=/usr \
 		--with-openssl \
 		--with-readline \
 		--with-zlib \
diff --git a/php_7.3-alpine3.14/Dockerfile b/php_7.3-alpine3.14/Dockerfile
index d95ebd6..1da61ce 100644
--- a/php_7.3-alpine3.14/Dockerfile
+++ b/php_7.3-alpine3.14/Dockerfile
@@ -95,6 +95,7 @@ RUN set -eux; \
 		argon2-dev \
 		coreutils \
 		curl-dev \
+		gnu-libiconv-dev \
 		libsodium-dev \
 		libxml2-dev \
 		openssl-dev \
@@ -102,6 +103,11 @@ RUN set -eux; \
 		sqlite-dev \
 	; \
 	\
+# make sure musl's iconv doesn't get used (https://www.php.net/manual/en/intro.iconv.php)
+	rm -vf /usr/include/iconv.h; \
+# PHP < 8 doesn't know to look deeper for GNU libiconv: https://github.com/php/php-src/commit/b480e6841ecd5317faa136647a2b8253a4c2d0df
+	ln -sv /usr/include/gnu-libiconv/*.h /usr/include/; \
+	\
 	export \
 		CFLAGS="$PHP_CFLAGS" \
 		CPPFLAGS="$PHP_CPPFLAGS" \
@@ -139,6 +145,7 @@ RUN set -eux; \
 		--with-sqlite3=/usr \
 		\
 		--with-curl \
+		--with-iconv=/usr \
 		--with-openssl \
 		--with-readline \
 		--with-zlib \
diff --git a/php_7.3-apache-buster/Dockerfile b/php_7.3-apache-buster/Dockerfile
index 381ec7d..0118654 100644
--- a/php_7.3-apache-buster/Dockerfile
+++ b/php_7.3-apache-buster/Dockerfile
@@ -213,6 +213,7 @@ RUN set -eux; \
 		--with-sqlite3=/usr \
 		\
 		--with-curl \
+		--with-iconv \
 		--with-openssl \
 		--with-readline \
 		--with-zlib \
diff --git a/php_7.3-apache/Dockerfile b/php_7.3-apache/Dockerfile
index 96b94b7..50e1ebe 100644
--- a/php_7.3-apache/Dockerfile
+++ b/php_7.3-apache/Dockerfile
@@ -213,6 +213,7 @@ RUN set -eux; \
 		--with-sqlite3=/usr \
 		\
 		--with-curl \
+		--with-iconv \
 		--with-openssl \
 		--with-readline \
 		--with-zlib \
diff --git a/php_7.3-buster/Dockerfile b/php_7.3-buster/Dockerfile
index ce3285b..913ccef 100644
--- a/php_7.3-buster/Dockerfile
+++ b/php_7.3-buster/Dockerfile
@@ -154,6 +154,7 @@ RUN set -eux; \
 		--with-sqlite3=/usr \
 		\
 		--with-curl \
+		--with-iconv \
 		--with-openssl \
 		--with-readline \
 		--with-zlib \
diff --git a/php_7.3-fpm-alpine/Dockerfile b/php_7.3-fpm-alpine/Dockerfile
index a93187e..546c6f9 100644
--- a/php_7.3-fpm-alpine/Dockerfile
+++ b/php_7.3-fpm-alpine/Dockerfile
@@ -95,6 +95,7 @@ RUN set -eux; \
 		argon2-dev \
 		coreutils \
 		curl-dev \
+		gnu-libiconv-dev \
 		libsodium-dev \
 		libxml2-dev \
 		openssl-dev \
@@ -102,6 +103,11 @@ RUN set -eux; \
 		sqlite-dev \
 	; \
 	\
+# make sure musl's iconv doesn't get used (https://www.php.net/manual/en/intro.iconv.php)
+	rm -vf /usr/include/iconv.h; \
+# PHP < 8 doesn't know to look deeper for GNU libiconv: https://github.com/php/php-src/commit/b480e6841ecd5317faa136647a2b8253a4c2d0df
+	ln -sv /usr/include/gnu-libiconv/*.h /usr/include/; \
+	\
 	export \
 		CFLAGS="$PHP_CFLAGS" \
 		CPPFLAGS="$PHP_CPPFLAGS" \
@@ -139,6 +145,7 @@ RUN set -eux; \
 		--with-sqlite3=/usr \
 		\
 		--with-curl \
+		--with-iconv=/usr \
 		--with-openssl \
 		--with-readline \
 		--with-zlib \
diff --git a/php_7.3-fpm-alpine3.14/Dockerfile b/php_7.3-fpm-alpine3.14/Dockerfile
index 5c28b0c..d9df058 100644
--- a/php_7.3-fpm-alpine3.14/Dockerfile
+++ b/php_7.3-fpm-alpine3.14/Dockerfile
@@ -95,6 +95,7 @@ RUN set -eux; \
 		argon2-dev \
 		coreutils \
 		curl-dev \
+		gnu-libiconv-dev \
 		libsodium-dev \
 		libxml2-dev \
 		openssl-dev \
@@ -102,6 +103,11 @@ RUN set -eux; \
 		sqlite-dev \
 	; \
 	\
+# make sure musl's iconv doesn't get used (https://www.php.net/manual/en/intro.iconv.php)
+	rm -vf /usr/include/iconv.h; \
+# PHP < 8 doesn't know to look deeper for GNU libiconv: https://github.com/php/php-src/commit/b480e6841ecd5317faa136647a2b8253a4c2d0df
+	ln -sv /usr/include/gnu-libiconv/*.h /usr/include/; \
+	\
 	export \
 		CFLAGS="$PHP_CFLAGS" \
 		CPPFLAGS="$PHP_CPPFLAGS" \
@@ -139,6 +145,7 @@ RUN set -eux; \
 		--with-sqlite3=/usr \
 		\
 		--with-curl \
+		--with-iconv=/usr \
 		--with-openssl \
 		--with-readline \
 		--with-zlib \
diff --git a/php_7.3-fpm-buster/Dockerfile b/php_7.3-fpm-buster/Dockerfile
index 91df8d3..44e84ae 100644
--- a/php_7.3-fpm-buster/Dockerfile
+++ b/php_7.3-fpm-buster/Dockerfile
@@ -154,6 +154,7 @@ RUN set -eux; \
 		--with-sqlite3=/usr \
 		\
 		--with-curl \
+		--with-iconv \
 		--with-openssl \
 		--with-readline \
 		--with-zlib \
diff --git a/php_7.3-fpm/Dockerfile b/php_7.3-fpm/Dockerfile
index 795af1d..289878f 100644
--- a/php_7.3-fpm/Dockerfile
+++ b/php_7.3-fpm/Dockerfile
@@ -154,6 +154,7 @@ RUN set -eux; \
 		--with-sqlite3=/usr \
 		\
 		--with-curl \
+		--with-iconv \
 		--with-openssl \
 		--with-readline \
 		--with-zlib \
diff --git a/php_7.3-zts-alpine/Dockerfile b/php_7.3-zts-alpine/Dockerfile
index ad11c65..07911b1 100644
--- a/php_7.3-zts-alpine/Dockerfile
+++ b/php_7.3-zts-alpine/Dockerfile
@@ -95,6 +95,7 @@ RUN set -eux; \
 		argon2-dev \
 		coreutils \
 		curl-dev \
+		gnu-libiconv-dev \
 		libsodium-dev \
 		libxml2-dev \
 		openssl-dev \
@@ -102,6 +103,11 @@ RUN set -eux; \
 		sqlite-dev \
 	; \
 	\
+# make sure musl's iconv doesn't get used (https://www.php.net/manual/en/intro.iconv.php)
+	rm -vf /usr/include/iconv.h; \
+# PHP < 8 doesn't know to look deeper for GNU libiconv: https://github.com/php/php-src/commit/b480e6841ecd5317faa136647a2b8253a4c2d0df
+	ln -sv /usr/include/gnu-libiconv/*.h /usr/include/; \
+	\
 	export \
 		CFLAGS="$PHP_CFLAGS" \
 		CPPFLAGS="$PHP_CPPFLAGS" \
@@ -139,6 +145,7 @@ RUN set -eux; \
 		--with-sqlite3=/usr \
 		\
 		--with-curl \
+		--with-iconv=/usr \
 		--with-openssl \
 		--with-readline \
 		--with-zlib \
diff --git a/php_7.3-zts-alpine3.14/Dockerfile b/php_7.3-zts-alpine3.14/Dockerfile
index ae6dc39..360342a 100644
--- a/php_7.3-zts-alpine3.14/Dockerfile
+++ b/php_7.3-zts-alpine3.14/Dockerfile
@@ -95,6 +95,7 @@ RUN set -eux; \
 		argon2-dev \
 		coreutils \
 		curl-dev \
+		gnu-libiconv-dev \
 		libsodium-dev \
 		libxml2-dev \
 		openssl-dev \
@@ -102,6 +103,11 @@ RUN set -eux; \
 		sqlite-dev \
 	; \
 	\
+# make sure musl's iconv doesn't get used (https://www.php.net/manual/en/intro.iconv.php)
+	rm -vf /usr/include/iconv.h; \
+# PHP < 8 doesn't know to look deeper for GNU libiconv: https://github.com/php/php-src/commit/b480e6841ecd5317faa136647a2b8253a4c2d0df
+	ln -sv /usr/include/gnu-libiconv/*.h /usr/include/; \
+	\
 	export \
 		CFLAGS="$PHP_CFLAGS" \
 		CPPFLAGS="$PHP_CPPFLAGS" \
@@ -139,6 +145,7 @@ RUN set -eux; \
 		--with-sqlite3=/usr \
 		\
 		--with-curl \
+		--with-iconv=/usr \
 		--with-openssl \
 		--with-readline \
 		--with-zlib \
diff --git a/php_7.3-zts-buster/Dockerfile b/php_7.3-zts-buster/Dockerfile
index 8dbe3ed..d048649 100644
--- a/php_7.3-zts-buster/Dockerfile
+++ b/php_7.3-zts-buster/Dockerfile
@@ -154,6 +154,7 @@ RUN set -eux; \
 		--with-sqlite3=/usr \
 		\
 		--with-curl \
+		--with-iconv \
 		--with-openssl \
 		--with-readline \
 		--with-zlib \
diff --git a/php_7.3-zts/Dockerfile b/php_7.3-zts/Dockerfile
index 2fa291c..7ea0c53 100644
--- a/php_7.3-zts/Dockerfile
+++ b/php_7.3-zts/Dockerfile
@@ -154,6 +154,7 @@ RUN set -eux; \
 		--with-sqlite3=/usr \
 		\
 		--with-curl \
+		--with-iconv \
 		--with-openssl \
 		--with-readline \
 		--with-zlib \
diff --git a/php_7.3/Dockerfile b/php_7.3/Dockerfile
index 3ad66d2..71bddbe 100644
--- a/php_7.3/Dockerfile
+++ b/php_7.3/Dockerfile
@@ -154,6 +154,7 @@ RUN set -eux; \
 		--with-sqlite3=/usr \
 		\
 		--with-curl \
+		--with-iconv \
 		--with-openssl \
 		--with-readline \
 		--with-zlib \
diff --git a/php_7/Dockerfile b/php_7/Dockerfile
index 886cb22..6f7ec5d 100644
--- a/php_7/Dockerfile
+++ b/php_7/Dockerfile
@@ -155,6 +155,7 @@ RUN set -eux; \
 		--with-sqlite3=/usr \
 		\
 		--with-curl \
+		--with-iconv \
 		--with-openssl \
 		--with-readline \
 		--with-zlib \
diff --git a/php_8.0-alpine/Dockerfile b/php_8.0-alpine/Dockerfile
index d98a85f..97ed342 100644
--- a/php_8.0-alpine/Dockerfile
+++ b/php_8.0-alpine/Dockerfile
@@ -95,6 +95,7 @@ RUN set -eux; \
 		argon2-dev \
 		coreutils \
 		curl-dev \
+		gnu-libiconv-dev \
 		libsodium-dev \
 		libxml2-dev \
 		linux-headers \
@@ -104,6 +105,9 @@ RUN set -eux; \
 		sqlite-dev \
 	; \
 	\
+# make sure musl's iconv doesn't get used (https://www.php.net/manual/en/intro.iconv.php)
+	rm -vf /usr/include/iconv.h; \
+	\
 	export \
 		CFLAGS="$PHP_CFLAGS" \
 		CPPFLAGS="$PHP_CPPFLAGS" \
@@ -141,6 +145,7 @@ RUN set -eux; \
 		--with-sqlite3=/usr \
 		\
 		--with-curl \
+		--with-iconv=/usr \
 		--with-openssl \
 		--with-readline \
 		--with-zlib \
diff --git a/php_8.0-alpine3.14/Dockerfile b/php_8.0-alpine3.14/Dockerfile
index 79b60ce..75517ba 100644
--- a/php_8.0-alpine3.14/Dockerfile
+++ b/php_8.0-alpine3.14/Dockerfile
@@ -95,6 +95,7 @@ RUN set -eux; \
 		argon2-dev \
 		coreutils \
 		curl-dev \
+		gnu-libiconv-dev \
 		libsodium-dev \
 		libxml2-dev \
 		linux-headers \
@@ -104,6 +105,9 @@ RUN set -eux; \
 		sqlite-dev \
 	; \
 	\
+# make sure musl's iconv doesn't get used (https://www.php.net/manual/en/intro.iconv.php)
+	rm -vf /usr/include/iconv.h; \
+	\
 	export \
 		CFLAGS="$PHP_CFLAGS" \
 		CPPFLAGS="$PHP_CPPFLAGS" \
@@ -141,6 +145,7 @@ RUN set -eux; \
 		--with-sqlite3=/usr \
 		\
 		--with-curl \
+		--with-iconv=/usr \
 		--with-openssl \
 		--with-readline \
 		--with-zlib \
diff --git a/php_8.0-apache-buster/Dockerfile b/php_8.0-apache-buster/Dockerfile
index 4a99389..66cef0e 100644
--- a/php_8.0-apache-buster/Dockerfile
+++ b/php_8.0-apache-buster/Dockerfile
@@ -214,6 +214,7 @@ RUN set -eux; \
 		--with-sqlite3=/usr \
 		\
 		--with-curl \
+		--with-iconv \
 		--with-openssl \
 		--with-readline \
 		--with-zlib \
diff --git a/php_8.0-apache/Dockerfile b/php_8.0-apache/Dockerfile
index dc573d6..332095e 100644
--- a/php_8.0-apache/Dockerfile
+++ b/php_8.0-apache/Dockerfile
@@ -214,6 +214,7 @@ RUN set -eux; \
 		--with-sqlite3=/usr \
 		\
 		--with-curl \
+		--with-iconv \
 		--with-openssl \
 		--with-readline \
 		--with-zlib \
diff --git a/php_8.0-buster/Dockerfile b/php_8.0-buster/Dockerfile
index f55f26c..06db4e1 100644
--- a/php_8.0-buster/Dockerfile
+++ b/php_8.0-buster/Dockerfile
@@ -155,6 +155,7 @@ RUN set -eux; \
 		--with-sqlite3=/usr \
 		\
 		--with-curl \
+		--with-iconv \
 		--with-openssl \
 		--with-readline \
 		--with-zlib \
diff --git a/php_8.0-fpm-alpine/Dockerfile b/php_8.0-fpm-alpine/Dockerfile
index 89ac4b4..b6992c2 100644
--- a/php_8.0-fpm-alpine/Dockerfile
+++ b/php_8.0-fpm-alpine/Dockerfile
@@ -95,6 +95,7 @@ RUN set -eux; \
 		argon2-dev \
 		coreutils \
 		curl-dev \
+		gnu-libiconv-dev \
 		libsodium-dev \
 		libxml2-dev \
 		linux-headers \
@@ -104,6 +105,9 @@ RUN set -eux; \
 		sqlite-dev \
 	; \
 	\
+# make sure musl's iconv doesn't get used (https://www.php.net/manual/en/intro.iconv.php)
+	rm -vf /usr/include/iconv.h; \
+	\
 	export \
 		CFLAGS="$PHP_CFLAGS" \
 		CPPFLAGS="$PHP_CPPFLAGS" \
@@ -141,6 +145,7 @@ RUN set -eux; \
 		--with-sqlite3=/usr \
 		\
 		--with-curl \
+		--with-iconv=/usr \
 		--with-openssl \
 		--with-readline \
 		--with-zlib \
diff --git a/php_8.0-fpm-alpine3.14/Dockerfile b/php_8.0-fpm-alpine3.14/Dockerfile
index 412d9d2..dfc7615 100644
--- a/php_8.0-fpm-alpine3.14/Dockerfile
+++ b/php_8.0-fpm-alpine3.14/Dockerfile
@@ -95,6 +95,7 @@ RUN set -eux; \
 		argon2-dev \
 		coreutils \
 		curl-dev \
+		gnu-libiconv-dev \
 		libsodium-dev \
 		libxml2-dev \
 		linux-headers \
@@ -104,6 +105,9 @@ RUN set -eux; \
 		sqlite-dev \
 	; \
 	\
+# make sure musl's iconv doesn't get used (https://www.php.net/manual/en/intro.iconv.php)
+	rm -vf /usr/include/iconv.h; \
+	\
 	export \
 		CFLAGS="$PHP_CFLAGS" \
 		CPPFLAGS="$PHP_CPPFLAGS" \
@@ -141,6 +145,7 @@ RUN set -eux; \
 		--with-sqlite3=/usr \
 		\
 		--with-curl \
+		--with-iconv=/usr \
 		--with-openssl \
 		--with-readline \
 		--with-zlib \
diff --git a/php_8.0-fpm-buster/Dockerfile b/php_8.0-fpm-buster/Dockerfile
index 3d9e07a..94921a1 100644
--- a/php_8.0-fpm-buster/Dockerfile
+++ b/php_8.0-fpm-buster/Dockerfile
@@ -155,6 +155,7 @@ RUN set -eux; \
 		--with-sqlite3=/usr \
 		\
 		--with-curl \
+		--with-iconv \
 		--with-openssl \
 		--with-readline \
 		--with-zlib \
diff --git a/php_8.0-fpm/Dockerfile b/php_8.0-fpm/Dockerfile
index f7d6c9a..1d53c0f 100644
--- a/php_8.0-fpm/Dockerfile
+++ b/php_8.0-fpm/Dockerfile
@@ -155,6 +155,7 @@ RUN set -eux; \
 		--with-sqlite3=/usr \
 		\
 		--with-curl \
+		--with-iconv \
 		--with-openssl \
 		--with-readline \
 		--with-zlib \
diff --git a/php_8.0-rc-alpine/Dockerfile b/php_8.0-rc-alpine/Dockerfile
index 58dd5e2..de7655c 100644
--- a/php_8.0-rc-alpine/Dockerfile
+++ b/php_8.0-rc-alpine/Dockerfile
@@ -95,6 +95,7 @@ RUN set -eux; \
 		argon2-dev \
 		coreutils \
 		curl-dev \
+		gnu-libiconv-dev \
 		libsodium-dev \
 		libxml2-dev \
 		linux-headers \
@@ -104,6 +105,9 @@ RUN set -eux; \
 		sqlite-dev \
 	; \
 	\
+# make sure musl's iconv doesn't get used (https://www.php.net/manual/en/intro.iconv.php)
+	rm -vf /usr/include/iconv.h; \
+	\
 	export \
 		CFLAGS="$PHP_CFLAGS" \
 		CPPFLAGS="$PHP_CPPFLAGS" \
@@ -141,6 +145,7 @@ RUN set -eux; \
 		--with-sqlite3=/usr \
 		\
 		--with-curl \
+		--with-iconv=/usr \
 		--with-openssl \
 		--with-readline \
 		--with-zlib \
diff --git a/php_8.0-rc-alpine3.14/Dockerfile b/php_8.0-rc-alpine3.14/Dockerfile
index 37053c4..66e3e19 100644
--- a/php_8.0-rc-alpine3.14/Dockerfile
+++ b/php_8.0-rc-alpine3.14/Dockerfile
@@ -95,6 +95,7 @@ RUN set -eux; \
 		argon2-dev \
 		coreutils \
 		curl-dev \
+		gnu-libiconv-dev \
 		libsodium-dev \
 		libxml2-dev \
 		linux-headers \
@@ -104,6 +105,9 @@ RUN set -eux; \
 		sqlite-dev \
 	; \
 	\
+# make sure musl's iconv doesn't get used (https://www.php.net/manual/en/intro.iconv.php)
+	rm -vf /usr/include/iconv.h; \
+	\
 	export \
 		CFLAGS="$PHP_CFLAGS" \
 		CPPFLAGS="$PHP_CPPFLAGS" \
@@ -141,6 +145,7 @@ RUN set -eux; \
 		--with-sqlite3=/usr \
 		\
 		--with-curl \
+		--with-iconv=/usr \
 		--with-openssl \
 		--with-readline \
 		--with-zlib \
diff --git a/php_8.0-rc-apache-buster/Dockerfile b/php_8.0-rc-apache-buster/Dockerfile
index b1de97d..c8e8a4c 100644
--- a/php_8.0-rc-apache-buster/Dockerfile
+++ b/php_8.0-rc-apache-buster/Dockerfile
@@ -214,6 +214,7 @@ RUN set -eux; \
 		--with-sqlite3=/usr \
 		\
 		--with-curl \
+		--with-iconv \
 		--with-openssl \
 		--with-readline \
 		--with-zlib \
diff --git a/php_8.0-rc-apache/Dockerfile b/php_8.0-rc-apache/Dockerfile
index e871e87..7824ab5 100644
--- a/php_8.0-rc-apache/Dockerfile
+++ b/php_8.0-rc-apache/Dockerfile
@@ -214,6 +214,7 @@ RUN set -eux; \
 		--with-sqlite3=/usr \
 		\
 		--with-curl \
+		--with-iconv \
 		--with-openssl \
 		--with-readline \
 		--with-zlib \
diff --git a/php_8.0-rc-buster/Dockerfile b/php_8.0-rc-buster/Dockerfile
index 461bbca..659c1cb 100644
--- a/php_8.0-rc-buster/Dockerfile
+++ b/php_8.0-rc-buster/Dockerfile
@@ -155,6 +155,7 @@ RUN set -eux; \
 		--with-sqlite3=/usr \
 		\
 		--with-curl \
+		--with-iconv \
 		--with-openssl \
 		--with-readline \
 		--with-zlib \
diff --git a/php_8.0-rc-fpm-alpine/Dockerfile b/php_8.0-rc-fpm-alpine/Dockerfile
index a3702d3..b9ed5dd 100644
--- a/php_8.0-rc-fpm-alpine/Dockerfile
+++ b/php_8.0-rc-fpm-alpine/Dockerfile
@@ -95,6 +95,7 @@ RUN set -eux; \
 		argon2-dev \
 		coreutils \
 		curl-dev \
+		gnu-libiconv-dev \
 		libsodium-dev \
 		libxml2-dev \
 		linux-headers \
@@ -104,6 +105,9 @@ RUN set -eux; \
 		sqlite-dev \
 	; \
 	\
+# make sure musl's iconv doesn't get used (https://www.php.net/manual/en/intro.iconv.php)
+	rm -vf /usr/include/iconv.h; \
+	\
 	export \
 		CFLAGS="$PHP_CFLAGS" \
 		CPPFLAGS="$PHP_CPPFLAGS" \
@@ -141,6 +145,7 @@ RUN set -eux; \
 		--with-sqlite3=/usr \
 		\
 		--with-curl \
+		--with-iconv=/usr \
 		--with-openssl \
 		--with-readline \
 		--with-zlib \
diff --git a/php_8.0-rc-fpm-alpine3.14/Dockerfile b/php_8.0-rc-fpm-alpine3.14/Dockerfile
index 8ddc6e3..fd60a75 100644
--- a/php_8.0-rc-fpm-alpine3.14/Dockerfile
+++ b/php_8.0-rc-fpm-alpine3.14/Dockerfile
@@ -95,6 +95,7 @@ RUN set -eux; \
 		argon2-dev \
 		coreutils \
 		curl-dev \
+		gnu-libiconv-dev \
 		libsodium-dev \
 		libxml2-dev \
 		linux-headers \
@@ -104,6 +105,9 @@ RUN set -eux; \
 		sqlite-dev \
 	; \
 	\
+# make sure musl's iconv doesn't get used (https://www.php.net/manual/en/intro.iconv.php)
+	rm -vf /usr/include/iconv.h; \
+	\
 	export \
 		CFLAGS="$PHP_CFLAGS" \
 		CPPFLAGS="$PHP_CPPFLAGS" \
@@ -141,6 +145,7 @@ RUN set -eux; \
 		--with-sqlite3=/usr \
 		\
 		--with-curl \
+		--with-iconv=/usr \
 		--with-openssl \
 		--with-readline \
 		--with-zlib \
diff --git a/php_8.0-rc-fpm-buster/Dockerfile b/php_8.0-rc-fpm-buster/Dockerfile
index 44f9f21..818bf6f 100644
--- a/php_8.0-rc-fpm-buster/Dockerfile
+++ b/php_8.0-rc-fpm-buster/Dockerfile
@@ -155,6 +155,7 @@ RUN set -eux; \
 		--with-sqlite3=/usr \
 		\
 		--with-curl \
+		--with-iconv \
 		--with-openssl \
 		--with-readline \
 		--with-zlib \
diff --git a/php_8.0-rc-fpm/Dockerfile b/php_8.0-rc-fpm/Dockerfile
index 722b9e6..ab1dea4 100644
--- a/php_8.0-rc-fpm/Dockerfile
+++ b/php_8.0-rc-fpm/Dockerfile
@@ -155,6 +155,7 @@ RUN set -eux; \
 		--with-sqlite3=/usr \
 		\
 		--with-curl \
+		--with-iconv \
 		--with-openssl \
 		--with-readline \
 		--with-zlib \
diff --git a/php_8.0-rc-zts-buster/Dockerfile b/php_8.0-rc-zts-buster/Dockerfile
index e891dc0..35ce175 100644
--- a/php_8.0-rc-zts-buster/Dockerfile
+++ b/php_8.0-rc-zts-buster/Dockerfile
@@ -155,6 +155,7 @@ RUN set -eux; \
 		--with-sqlite3=/usr \
 		\
 		--with-curl \
+		--with-iconv \
 		--with-openssl \
 		--with-readline \
 		--with-zlib \
diff --git a/php_8.0-rc-zts/Dockerfile b/php_8.0-rc-zts/Dockerfile
index bdcd3ee..eb682f8 100644
--- a/php_8.0-rc-zts/Dockerfile
+++ b/php_8.0-rc-zts/Dockerfile
@@ -155,6 +155,7 @@ RUN set -eux; \
 		--with-sqlite3=/usr \
 		\
 		--with-curl \
+		--with-iconv \
 		--with-openssl \
 		--with-readline \
 		--with-zlib \
diff --git a/php_8.0-rc/Dockerfile b/php_8.0-rc/Dockerfile
index 986e0be..e052d35 100644
--- a/php_8.0-rc/Dockerfile
+++ b/php_8.0-rc/Dockerfile
@@ -155,6 +155,7 @@ RUN set -eux; \
 		--with-sqlite3=/usr \
 		\
 		--with-curl \
+		--with-iconv \
 		--with-openssl \
 		--with-readline \
 		--with-zlib \
diff --git a/php_8.0-zts-buster/Dockerfile b/php_8.0-zts-buster/Dockerfile
index bc1f60d..cfbb752 100644
--- a/php_8.0-zts-buster/Dockerfile
+++ b/php_8.0-zts-buster/Dockerfile
@@ -155,6 +155,7 @@ RUN set -eux; \
 		--with-sqlite3=/usr \
 		\
 		--with-curl \
+		--with-iconv \
 		--with-openssl \
 		--with-readline \
 		--with-zlib \
diff --git a/php_8.0-zts/Dockerfile b/php_8.0-zts/Dockerfile
index 779b6f1..eab58da 100644
--- a/php_8.0-zts/Dockerfile
+++ b/php_8.0-zts/Dockerfile
@@ -155,6 +155,7 @@ RUN set -eux; \
 		--with-sqlite3=/usr \
 		\
 		--with-curl \
+		--with-iconv \
 		--with-openssl \
 		--with-readline \
 		--with-zlib \
diff --git a/php_8.0/Dockerfile b/php_8.0/Dockerfile
index d7eee24..c5dfb1f 100644
--- a/php_8.0/Dockerfile
+++ b/php_8.0/Dockerfile
@@ -155,6 +155,7 @@ RUN set -eux; \
 		--with-sqlite3=/usr \
 		\
 		--with-curl \
+		--with-iconv \
 		--with-openssl \
 		--with-readline \
 		--with-zlib \
diff --git a/php_8.1-rc-alpine/Dockerfile b/php_8.1-rc-alpine/Dockerfile
index 80941ff..69e68bb 100644
--- a/php_8.1-rc-alpine/Dockerfile
+++ b/php_8.1-rc-alpine/Dockerfile
@@ -95,6 +95,7 @@ RUN set -eux; \
 		argon2-dev \
 		coreutils \
 		curl-dev \
+		gnu-libiconv-dev \
 		libsodium-dev \
 		libxml2-dev \
 		linux-headers \
@@ -104,6 +105,9 @@ RUN set -eux; \
 		sqlite-dev \
 	; \
 	\
+# make sure musl's iconv doesn't get used (https://www.php.net/manual/en/intro.iconv.php)
+	rm -vf /usr/include/iconv.h; \
+	\
 	export \
 		CFLAGS="$PHP_CFLAGS" \
 		CPPFLAGS="$PHP_CPPFLAGS" \
@@ -141,6 +145,7 @@ RUN set -eux; \
 		--with-sqlite3=/usr \
 		\
 		--with-curl \
+		--with-iconv=/usr \
 		--with-openssl \
 		--with-readline \
 		--with-zlib \
diff --git a/php_8.1-rc-alpine3.14/Dockerfile b/php_8.1-rc-alpine3.14/Dockerfile
index 7a02d87..0618ae5 100644
--- a/php_8.1-rc-alpine3.14/Dockerfile
+++ b/php_8.1-rc-alpine3.14/Dockerfile
@@ -95,6 +95,7 @@ RUN set -eux; \
 		argon2-dev \
 		coreutils \
 		curl-dev \
+		gnu-libiconv-dev \
 		libsodium-dev \
 		libxml2-dev \
 		linux-headers \
@@ -104,6 +105,9 @@ RUN set -eux; \
 		sqlite-dev \
 	; \
 	\
+# make sure musl's iconv doesn't get used (https://www.php.net/manual/en/intro.iconv.php)
+	rm -vf /usr/include/iconv.h; \
+	\
 	export \
 		CFLAGS="$PHP_CFLAGS" \
 		CPPFLAGS="$PHP_CPPFLAGS" \
@@ -141,6 +145,7 @@ RUN set -eux; \
 		--with-sqlite3=/usr \
 		\
 		--with-curl \
+		--with-iconv=/usr \
 		--with-openssl \
 		--with-readline \
 		--with-zlib \
diff --git a/php_8.1-rc-apache-buster/Dockerfile b/php_8.1-rc-apache-buster/Dockerfile
index b702d4c..840781e 100644
--- a/php_8.1-rc-apache-buster/Dockerfile
+++ b/php_8.1-rc-apache-buster/Dockerfile
@@ -214,6 +214,7 @@ RUN set -eux; \
 		--with-sqlite3=/usr \
 		\
 		--with-curl \
+		--with-iconv \
 		--with-openssl \
 		--with-readline \
 		--with-zlib \
diff --git a/php_8.1-rc-apache/Dockerfile b/php_8.1-rc-apache/Dockerfile
index e7ff7f5..835b6e0 100644
--- a/php_8.1-rc-apache/Dockerfile
+++ b/php_8.1-rc-apache/Dockerfile
@@ -214,6 +214,7 @@ RUN set -eux; \
 		--with-sqlite3=/usr \
 		\
 		--with-curl \
+		--with-iconv \
 		--with-openssl \
 		--with-readline \
 		--with-zlib \
diff --git a/php_8.1-rc-buster/Dockerfile b/php_8.1-rc-buster/Dockerfile
index 07166c2..ce80faa 100644
--- a/php_8.1-rc-buster/Dockerfile
+++ b/php_8.1-rc-buster/Dockerfile
@@ -155,6 +155,7 @@ RUN set -eux; \
 		--with-sqlite3=/usr \
 		\
 		--with-curl \
+		--with-iconv \
 		--with-openssl \
 		--with-readline \
 		--with-zlib \
diff --git a/php_8.1-rc-fpm-alpine/Dockerfile b/php_8.1-rc-fpm-alpine/Dockerfile
index c9a6eda..a4db6b3 100644
--- a/php_8.1-rc-fpm-alpine/Dockerfile
+++ b/php_8.1-rc-fpm-alpine/Dockerfile
@@ -95,6 +95,7 @@ RUN set -eux; \
 		argon2-dev \
 		coreutils \
 		curl-dev \
+		gnu-libiconv-dev \
 		libsodium-dev \
 		libxml2-dev \
 		linux-headers \
@@ -104,6 +105,9 @@ RUN set -eux; \
 		sqlite-dev \
 	; \
 	\
+# make sure musl's iconv doesn't get used (https://www.php.net/manual/en/intro.iconv.php)
+	rm -vf /usr/include/iconv.h; \
+	\
 	export \
 		CFLAGS="$PHP_CFLAGS" \
 		CPPFLAGS="$PHP_CPPFLAGS" \
@@ -141,6 +145,7 @@ RUN set -eux; \
 		--with-sqlite3=/usr \
 		\
 		--with-curl \
+		--with-iconv=/usr \
 		--with-openssl \
 		--with-readline \
 		--with-zlib \
diff --git a/php_8.1-rc-fpm-alpine3.14/Dockerfile b/php_8.1-rc-fpm-alpine3.14/Dockerfile
index ed7ba10..4ea42a9 100644
--- a/php_8.1-rc-fpm-alpine3.14/Dockerfile
+++ b/php_8.1-rc-fpm-alpine3.14/Dockerfile
@@ -95,6 +95,7 @@ RUN set -eux; \
 		argon2-dev \
 		coreutils \
 		curl-dev \
+		gnu-libiconv-dev \
 		libsodium-dev \
 		libxml2-dev \
 		linux-headers \
@@ -104,6 +105,9 @@ RUN set -eux; \
 		sqlite-dev \
 	; \
 	\
+# make sure musl's iconv doesn't get used (https://www.php.net/manual/en/intro.iconv.php)
+	rm -vf /usr/include/iconv.h; \
+	\
 	export \
 		CFLAGS="$PHP_CFLAGS" \
 		CPPFLAGS="$PHP_CPPFLAGS" \
@@ -141,6 +145,7 @@ RUN set -eux; \
 		--with-sqlite3=/usr \
 		\
 		--with-curl \
+		--with-iconv=/usr \
 		--with-openssl \
 		--with-readline \
 		--with-zlib \
diff --git a/php_8.1-rc-fpm-buster/Dockerfile b/php_8.1-rc-fpm-buster/Dockerfile
index d60841e..8778e7c 100644
--- a/php_8.1-rc-fpm-buster/Dockerfile
+++ b/php_8.1-rc-fpm-buster/Dockerfile
@@ -155,6 +155,7 @@ RUN set -eux; \
 		--with-sqlite3=/usr \
 		\
 		--with-curl \
+		--with-iconv \
 		--with-openssl \
 		--with-readline \
 		--with-zlib \
diff --git a/php_8.1-rc-fpm/Dockerfile b/php_8.1-rc-fpm/Dockerfile
index 5f973d7..4a2ee0f 100644
--- a/php_8.1-rc-fpm/Dockerfile
+++ b/php_8.1-rc-fpm/Dockerfile
@@ -155,6 +155,7 @@ RUN set -eux; \
 		--with-sqlite3=/usr \
 		\
 		--with-curl \
+		--with-iconv \
 		--with-openssl \
 		--with-readline \
 		--with-zlib \
diff --git a/php_8.1-rc-zts-buster/Dockerfile b/php_8.1-rc-zts-buster/Dockerfile
index 059a852..3a0762c 100644
--- a/php_8.1-rc-zts-buster/Dockerfile
+++ b/php_8.1-rc-zts-buster/Dockerfile
@@ -155,6 +155,7 @@ RUN set -eux; \
 		--with-sqlite3=/usr \
 		\
 		--with-curl \
+		--with-iconv \
 		--with-openssl \
 		--with-readline \
 		--with-zlib \
diff --git a/php_8.1-rc-zts/Dockerfile b/php_8.1-rc-zts/Dockerfile
index 7040fdf..cd4a07d 100644
--- a/php_8.1-rc-zts/Dockerfile
+++ b/php_8.1-rc-zts/Dockerfile
@@ -155,6 +155,7 @@ RUN set -eux; \
 		--with-sqlite3=/usr \
 		\
 		--with-curl \
+		--with-iconv \
 		--with-openssl \
 		--with-readline \
 		--with-zlib \
diff --git a/php_8.1-rc/Dockerfile b/php_8.1-rc/Dockerfile
index 3f5500d..1aecf5d 100644
--- a/php_8.1-rc/Dockerfile
+++ b/php_8.1-rc/Dockerfile
@@ -155,6 +155,7 @@ RUN set -eux; \
 		--with-sqlite3=/usr \
 		\
 		--with-curl \
+		--with-iconv \
 		--with-openssl \
 		--with-readline \
 		--with-zlib \
diff --git a/php_alpine/Dockerfile b/php_alpine/Dockerfile
index 6cc3a43..9b2cb71 100644
--- a/php_alpine/Dockerfile
+++ b/php_alpine/Dockerfile
@@ -95,6 +95,7 @@ RUN set -eux; \
 		argon2-dev \
 		coreutils \
 		curl-dev \
+		gnu-libiconv-dev \
 		libsodium-dev \
 		libxml2-dev \
 		linux-headers \
@@ -104,6 +105,9 @@ RUN set -eux; \
 		sqlite-dev \
 	; \
 	\
+# make sure musl's iconv doesn't get used (https://www.php.net/manual/en/intro.iconv.php)
+	rm -vf /usr/include/iconv.h; \
+	\
 	export \
 		CFLAGS="$PHP_CFLAGS" \
 		CPPFLAGS="$PHP_CPPFLAGS" \
@@ -141,6 +145,7 @@ RUN set -eux; \
 		--with-sqlite3=/usr \
 		\
 		--with-curl \
+		--with-iconv=/usr \
 		--with-openssl \
 		--with-readline \
 		--with-zlib \
diff --git a/php_alpine3.14/Dockerfile b/php_alpine3.14/Dockerfile
index 646fedf..b38e8c5 100644
--- a/php_alpine3.14/Dockerfile
+++ b/php_alpine3.14/Dockerfile
@@ -95,6 +95,7 @@ RUN set -eux; \
 		argon2-dev \
 		coreutils \
 		curl-dev \
+		gnu-libiconv-dev \
 		libsodium-dev \
 		libxml2-dev \
 		linux-headers \
@@ -104,6 +105,9 @@ RUN set -eux; \
 		sqlite-dev \
 	; \
 	\
+# make sure musl's iconv doesn't get used (https://www.php.net/manual/en/intro.iconv.php)
+	rm -vf /usr/include/iconv.h; \
+	\
 	export \
 		CFLAGS="$PHP_CFLAGS" \
 		CPPFLAGS="$PHP_CPPFLAGS" \
@@ -141,6 +145,7 @@ RUN set -eux; \
 		--with-sqlite3=/usr \
 		\
 		--with-curl \
+		--with-iconv=/usr \
 		--with-openssl \
 		--with-readline \
 		--with-zlib \
diff --git a/php_apache-buster/Dockerfile b/php_apache-buster/Dockerfile
index 45da64f..c168839 100644
--- a/php_apache-buster/Dockerfile
+++ b/php_apache-buster/Dockerfile
@@ -214,6 +214,7 @@ RUN set -eux; \
 		--with-sqlite3=/usr \
 		\
 		--with-curl \
+		--with-iconv \
 		--with-openssl \
 		--with-readline \
 		--with-zlib \
diff --git a/php_apache/Dockerfile b/php_apache/Dockerfile
index fb0d680..d2191cc 100644
--- a/php_apache/Dockerfile
+++ b/php_apache/Dockerfile
@@ -214,6 +214,7 @@ RUN set -eux; \
 		--with-sqlite3=/usr \
 		\
 		--with-curl \
+		--with-iconv \
 		--with-openssl \
 		--with-readline \
 		--with-zlib \
diff --git a/php_buster/Dockerfile b/php_buster/Dockerfile
index 2e35d2e..3a19084 100644
--- a/php_buster/Dockerfile
+++ b/php_buster/Dockerfile
@@ -155,6 +155,7 @@ RUN set -eux; \
 		--with-sqlite3=/usr \
 		\
 		--with-curl \
+		--with-iconv \
 		--with-openssl \
 		--with-readline \
 		--with-zlib \
diff --git a/php_fpm-alpine/Dockerfile b/php_fpm-alpine/Dockerfile
index 69cc206..91f4945 100644
--- a/php_fpm-alpine/Dockerfile
+++ b/php_fpm-alpine/Dockerfile
@@ -95,6 +95,7 @@ RUN set -eux; \
 		argon2-dev \
 		coreutils \
 		curl-dev \
+		gnu-libiconv-dev \
 		libsodium-dev \
 		libxml2-dev \
 		linux-headers \
@@ -104,6 +105,9 @@ RUN set -eux; \
 		sqlite-dev \
 	; \
 	\
+# make sure musl's iconv doesn't get used (https://www.php.net/manual/en/intro.iconv.php)
+	rm -vf /usr/include/iconv.h; \
+	\
 	export \
 		CFLAGS="$PHP_CFLAGS" \
 		CPPFLAGS="$PHP_CPPFLAGS" \
@@ -141,6 +145,7 @@ RUN set -eux; \
 		--with-sqlite3=/usr \
 		\
 		--with-curl \
+		--with-iconv=/usr \
 		--with-openssl \
 		--with-readline \
 		--with-zlib \
diff --git a/php_fpm-alpine3.14/Dockerfile b/php_fpm-alpine3.14/Dockerfile
index b193d00..d824fa1 100644
--- a/php_fpm-alpine3.14/Dockerfile
+++ b/php_fpm-alpine3.14/Dockerfile
@@ -95,6 +95,7 @@ RUN set -eux; \
 		argon2-dev \
 		coreutils \
 		curl-dev \
+		gnu-libiconv-dev \
 		libsodium-dev \
 		libxml2-dev \
 		linux-headers \
@@ -104,6 +105,9 @@ RUN set -eux; \
 		sqlite-dev \
 	; \
 	\
+# make sure musl's iconv doesn't get used (https://www.php.net/manual/en/intro.iconv.php)
+	rm -vf /usr/include/iconv.h; \
+	\
 	export \
 		CFLAGS="$PHP_CFLAGS" \
 		CPPFLAGS="$PHP_CPPFLAGS" \
@@ -141,6 +145,7 @@ RUN set -eux; \
 		--with-sqlite3=/usr \
 		\
 		--with-curl \
+		--with-iconv=/usr \
 		--with-openssl \
 		--with-readline \
 		--with-zlib \
diff --git a/php_fpm-buster/Dockerfile b/php_fpm-buster/Dockerfile
index df33250..df8feec 100644
--- a/php_fpm-buster/Dockerfile
+++ b/php_fpm-buster/Dockerfile
@@ -155,6 +155,7 @@ RUN set -eux; \
 		--with-sqlite3=/usr \
 		\
 		--with-curl \
+		--with-iconv \
 		--with-openssl \
 		--with-readline \
 		--with-zlib \
diff --git a/php_fpm/Dockerfile b/php_fpm/Dockerfile
index 0b3b84d..6b0d53b 100644
--- a/php_fpm/Dockerfile
+++ b/php_fpm/Dockerfile
@@ -155,6 +155,7 @@ RUN set -eux; \
 		--with-sqlite3=/usr \
 		\
 		--with-curl \
+		--with-iconv \
 		--with-openssl \
 		--with-readline \
 		--with-zlib \
diff --git a/php_latest/Dockerfile b/php_latest/Dockerfile
index be231ee..30118fb 100644
--- a/php_latest/Dockerfile
+++ b/php_latest/Dockerfile
@@ -155,6 +155,7 @@ RUN set -eux; \
 		--with-sqlite3=/usr \
 		\
 		--with-curl \
+		--with-iconv \
 		--with-openssl \
 		--with-readline \
 		--with-zlib \
diff --git a/php_zts-buster/Dockerfile b/php_zts-buster/Dockerfile
index 351d6c1..54d4281 100644
--- a/php_zts-buster/Dockerfile
+++ b/php_zts-buster/Dockerfile
@@ -155,6 +155,7 @@ RUN set -eux; \
 		--with-sqlite3=/usr \
 		\
 		--with-curl \
+		--with-iconv \
 		--with-openssl \
 		--with-readline \
 		--with-zlib \
diff --git a/php_zts/Dockerfile b/php_zts/Dockerfile
index 4b13a18..e7a60a5 100644
--- a/php_zts/Dockerfile
+++ b/php_zts/Dockerfile
@@ -155,6 +155,7 @@ RUN set -eux; \
 		--with-sqlite3=/usr \
 		\
 		--with-curl \
+		--with-iconv \
 		--with-openssl \
 		--with-readline \
 		--with-zlib \

Relevant Maintainers:

php: @tianon @yosifkit

github-actions bot added the library/php label Mar 10, 2022

yosifkit merged commit 9fdcd72 into docker-library:master Mar 11, 2022

yosifkit deleted the php branch March 11, 2022 00:25

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Update php #12021

Update php #12021

Uh oh!

tianon commented Mar 10, 2022

Uh oh!

github-actions bot commented Mar 10, 2022

Uh oh!

Uh oh!

Update php #12021

Update php #12021

Uh oh!

Conversation

tianon commented Mar 10, 2022

Uh oh!

github-actions bot commented Mar 10, 2022

Uh oh!

Uh oh!