From 75fd70a6a971916e02ffc52a4c10596312c978bc Mon Sep 17 00:00:00 2001 From: Michael Sierks Date: Thu, 10 Mar 2022 10:16:52 -0600 Subject: [PATCH] Use gnu-libiconv on alpine only for php iconv extension --- 7.3/alpine3.14/cli/Dockerfile | 9 +++++---- 7.3/alpine3.14/fpm/Dockerfile | 9 +++++---- 7.3/alpine3.14/zts/Dockerfile | 9 +++++---- 7.3/alpine3.15/cli/Dockerfile | 9 +++++---- 7.3/alpine3.15/fpm/Dockerfile | 9 +++++---- 7.3/alpine3.15/zts/Dockerfile | 9 +++++---- 7.3/bullseye/apache/Dockerfile | 4 ---- 7.3/bullseye/cli/Dockerfile | 4 ---- 7.3/bullseye/fpm/Dockerfile | 4 ---- 7.3/bullseye/zts/Dockerfile | 4 ---- 7.3/buster/apache/Dockerfile | 4 ---- 7.3/buster/cli/Dockerfile | 4 ---- 7.3/buster/fpm/Dockerfile | 4 ---- 7.3/buster/zts/Dockerfile | 4 ---- 7.4/alpine3.14/cli/Dockerfile | 9 +++++---- 7.4/alpine3.14/fpm/Dockerfile | 9 +++++---- 7.4/alpine3.14/zts/Dockerfile | 9 +++++---- 7.4/alpine3.15/cli/Dockerfile | 9 +++++---- 7.4/alpine3.15/fpm/Dockerfile | 9 +++++---- 7.4/alpine3.15/zts/Dockerfile | 9 +++++---- 7.4/bullseye/apache/Dockerfile | 4 ---- 7.4/bullseye/cli/Dockerfile | 4 ---- 7.4/bullseye/fpm/Dockerfile | 4 ---- 7.4/bullseye/zts/Dockerfile | 4 ---- 7.4/buster/apache/Dockerfile | 4 ---- 7.4/buster/cli/Dockerfile | 4 ---- 7.4/buster/fpm/Dockerfile | 4 ---- 7.4/buster/zts/Dockerfile | 4 ---- 8.0-rc/alpine3.14/cli/Dockerfile | 6 ++---- 8.0-rc/alpine3.14/fpm/Dockerfile | 6 ++---- 8.0-rc/alpine3.15/cli/Dockerfile | 6 ++---- 8.0-rc/alpine3.15/fpm/Dockerfile | 6 ++---- 8.0-rc/bullseye/apache/Dockerfile | 4 ---- 8.0-rc/bullseye/cli/Dockerfile | 4 ---- 8.0-rc/bullseye/fpm/Dockerfile | 4 ---- 8.0-rc/bullseye/zts/Dockerfile | 4 ---- 8.0-rc/buster/apache/Dockerfile | 4 ---- 8.0-rc/buster/cli/Dockerfile | 4 ---- 8.0-rc/buster/fpm/Dockerfile | 4 ---- 8.0-rc/buster/zts/Dockerfile | 4 ---- 8.0/alpine3.14/cli/Dockerfile | 6 ++---- 8.0/alpine3.14/fpm/Dockerfile | 6 ++---- 8.0/alpine3.15/cli/Dockerfile | 6 ++---- 8.0/alpine3.15/fpm/Dockerfile | 6 ++---- 8.0/bullseye/apache/Dockerfile | 4 ---- 8.0/bullseye/cli/Dockerfile | 4 ---- 8.0/bullseye/fpm/Dockerfile | 4 ---- 8.0/bullseye/zts/Dockerfile | 4 ---- 8.0/buster/apache/Dockerfile | 4 ---- 8.0/buster/cli/Dockerfile | 4 ---- 8.0/buster/fpm/Dockerfile | 4 ---- 8.0/buster/zts/Dockerfile | 4 ---- 8.1-rc/alpine3.14/cli/Dockerfile | 6 ++---- 8.1-rc/alpine3.14/fpm/Dockerfile | 6 ++---- 8.1-rc/alpine3.15/cli/Dockerfile | 6 ++---- 8.1-rc/alpine3.15/fpm/Dockerfile | 6 ++---- 8.1-rc/bullseye/apache/Dockerfile | 4 ---- 8.1-rc/bullseye/cli/Dockerfile | 4 ---- 8.1-rc/bullseye/fpm/Dockerfile | 4 ---- 8.1-rc/bullseye/zts/Dockerfile | 4 ---- 8.1-rc/buster/apache/Dockerfile | 4 ---- 8.1-rc/buster/cli/Dockerfile | 4 ---- 8.1-rc/buster/fpm/Dockerfile | 4 ---- 8.1-rc/buster/zts/Dockerfile | 4 ---- 8.1/alpine3.14/cli/Dockerfile | 6 ++---- 8.1/alpine3.14/fpm/Dockerfile | 6 ++---- 8.1/alpine3.15/cli/Dockerfile | 6 ++---- 8.1/alpine3.15/fpm/Dockerfile | 6 ++---- 8.1/bullseye/apache/Dockerfile | 4 ---- 8.1/bullseye/cli/Dockerfile | 4 ---- 8.1/bullseye/fpm/Dockerfile | 4 ---- 8.1/bullseye/zts/Dockerfile | 4 ---- 8.1/buster/apache/Dockerfile | 4 ---- 8.1/buster/cli/Dockerfile | 4 ---- 8.1/buster/fpm/Dockerfile | 4 ---- 8.1/buster/zts/Dockerfile | 4 ---- Dockerfile-linux.template | 13 +++++++++---- 77 files changed, 101 insertions(+), 308 deletions(-) diff --git a/7.3/alpine3.14/cli/Dockerfile b/7.3/alpine3.14/cli/Dockerfile index 984b514af9..f4747b9e20 100644 --- a/7.3/alpine3.14/cli/Dockerfile +++ b/7.3/alpine3.14/cli/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,9 @@ RUN set -eux; \ sqlite-dev \ ; \ \ +# Replace musl iconv headers with gnu, only necessary for PHP < 8 + cp /usr/include/gnu-libiconv/*.h /usr/include; \ + \ export \ CFLAGS="$PHP_CFLAGS" \ CPPFLAGS="$PHP_CPPFLAGS" \ @@ -139,7 +143,7 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-iconv=shared \ + --with-iconv=/usr \ --with-openssl \ --with-readline \ --with-zlib \ @@ -193,8 +197,5 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) RUN docker-php-ext-enable sodium -# iconv was built as a shared module (so it can be disabled later if desired) -RUN docker-php-ext-enable iconv - ENTRYPOINT ["docker-php-entrypoint"] CMD ["php", "-a"] diff --git a/7.3/alpine3.14/fpm/Dockerfile b/7.3/alpine3.14/fpm/Dockerfile index 9b46e9b937..73670ea694 100644 --- a/7.3/alpine3.14/fpm/Dockerfile +++ b/7.3/alpine3.14/fpm/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,9 @@ RUN set -eux; \ sqlite-dev \ ; \ \ +# Replace musl iconv headers with gnu, only necessary for PHP < 8 + cp /usr/include/gnu-libiconv/*.h /usr/include; \ + \ export \ CFLAGS="$PHP_CFLAGS" \ CPPFLAGS="$PHP_CPPFLAGS" \ @@ -139,7 +143,7 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-iconv=shared \ + --with-iconv=/usr \ --with-openssl \ --with-readline \ --with-zlib \ @@ -198,9 +202,6 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) RUN docker-php-ext-enable sodium -# iconv was built as a shared module (so it can be disabled later if desired) -RUN docker-php-ext-enable iconv - ENTRYPOINT ["docker-php-entrypoint"] WORKDIR /var/www/html diff --git a/7.3/alpine3.14/zts/Dockerfile b/7.3/alpine3.14/zts/Dockerfile index b19ebfe591..4ac85af75a 100644 --- a/7.3/alpine3.14/zts/Dockerfile +++ b/7.3/alpine3.14/zts/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,9 @@ RUN set -eux; \ sqlite-dev \ ; \ \ +# Replace musl iconv headers with gnu, only necessary for PHP < 8 + cp /usr/include/gnu-libiconv/*.h /usr/include; \ + \ export \ CFLAGS="$PHP_CFLAGS" \ CPPFLAGS="$PHP_CPPFLAGS" \ @@ -139,7 +143,7 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-iconv=shared \ + --with-iconv=/usr \ --with-openssl \ --with-readline \ --with-zlib \ @@ -196,8 +200,5 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) RUN docker-php-ext-enable sodium -# iconv was built as a shared module (so it can be disabled later if desired) -RUN docker-php-ext-enable iconv - ENTRYPOINT ["docker-php-entrypoint"] CMD ["php", "-a"] diff --git a/7.3/alpine3.15/cli/Dockerfile b/7.3/alpine3.15/cli/Dockerfile index b9ed783d8f..a610d01eb1 100644 --- a/7.3/alpine3.15/cli/Dockerfile +++ b/7.3/alpine3.15/cli/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,9 @@ RUN set -eux; \ sqlite-dev \ ; \ \ +# Replace musl iconv headers with gnu, only necessary for PHP < 8 + cp /usr/include/gnu-libiconv/*.h /usr/include; \ + \ export \ CFLAGS="$PHP_CFLAGS" \ CPPFLAGS="$PHP_CPPFLAGS" \ @@ -139,7 +143,7 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-iconv=shared \ + --with-iconv=/usr \ --with-openssl \ --with-readline \ --with-zlib \ @@ -193,8 +197,5 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) RUN docker-php-ext-enable sodium -# iconv was built as a shared module (so it can be disabled later if desired) -RUN docker-php-ext-enable iconv - ENTRYPOINT ["docker-php-entrypoint"] CMD ["php", "-a"] diff --git a/7.3/alpine3.15/fpm/Dockerfile b/7.3/alpine3.15/fpm/Dockerfile index c1273fe3f8..6974d92a01 100644 --- a/7.3/alpine3.15/fpm/Dockerfile +++ b/7.3/alpine3.15/fpm/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,9 @@ RUN set -eux; \ sqlite-dev \ ; \ \ +# Replace musl iconv headers with gnu, only necessary for PHP < 8 + cp /usr/include/gnu-libiconv/*.h /usr/include; \ + \ export \ CFLAGS="$PHP_CFLAGS" \ CPPFLAGS="$PHP_CPPFLAGS" \ @@ -139,7 +143,7 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-iconv=shared \ + --with-iconv=/usr \ --with-openssl \ --with-readline \ --with-zlib \ @@ -198,9 +202,6 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) RUN docker-php-ext-enable sodium -# iconv was built as a shared module (so it can be disabled later if desired) -RUN docker-php-ext-enable iconv - ENTRYPOINT ["docker-php-entrypoint"] WORKDIR /var/www/html diff --git a/7.3/alpine3.15/zts/Dockerfile b/7.3/alpine3.15/zts/Dockerfile index 8bfbcc0b1e..f242689327 100644 --- a/7.3/alpine3.15/zts/Dockerfile +++ b/7.3/alpine3.15/zts/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,9 @@ RUN set -eux; \ sqlite-dev \ ; \ \ +# Replace musl iconv headers with gnu, only necessary for PHP < 8 + cp /usr/include/gnu-libiconv/*.h /usr/include; \ + \ export \ CFLAGS="$PHP_CFLAGS" \ CPPFLAGS="$PHP_CPPFLAGS" \ @@ -139,7 +143,7 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-iconv=shared \ + --with-iconv=/usr \ --with-openssl \ --with-readline \ --with-zlib \ @@ -196,8 +200,5 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) RUN docker-php-ext-enable sodium -# iconv was built as a shared module (so it can be disabled later if desired) -RUN docker-php-ext-enable iconv - ENTRYPOINT ["docker-php-entrypoint"] CMD ["php", "-a"] diff --git a/7.3/bullseye/apache/Dockerfile b/7.3/bullseye/apache/Dockerfile index 4cd73cf5eb..96b94b7bfe 100644 --- a/7.3/bullseye/apache/Dockerfile +++ b/7.3/bullseye/apache/Dockerfile @@ -213,7 +213,6 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-iconv=shared \ --with-openssl \ --with-readline \ --with-zlib \ @@ -275,9 +274,6 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) RUN docker-php-ext-enable sodium -# iconv was built as a shared module (so it can be disabled later if desired) -RUN docker-php-ext-enable iconv - # temporary "freetype-config" workaround for https://github.com/docker-library/php/issues/865 (https://bugs.php.net/bug.php?id=76324) RUN { echo '#!/bin/sh'; echo 'exec pkg-config "$@" freetype2'; } > /usr/local/bin/freetype-config && chmod +x /usr/local/bin/freetype-config diff --git a/7.3/bullseye/cli/Dockerfile b/7.3/bullseye/cli/Dockerfile index a29b57621f..3ad66d284d 100644 --- a/7.3/bullseye/cli/Dockerfile +++ b/7.3/bullseye/cli/Dockerfile @@ -154,7 +154,6 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-iconv=shared \ --with-openssl \ --with-readline \ --with-zlib \ @@ -216,9 +215,6 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) RUN docker-php-ext-enable sodium -# iconv was built as a shared module (so it can be disabled later if desired) -RUN docker-php-ext-enable iconv - # temporary "freetype-config" workaround for https://github.com/docker-library/php/issues/865 (https://bugs.php.net/bug.php?id=76324) RUN { echo '#!/bin/sh'; echo 'exec pkg-config "$@" freetype2'; } > /usr/local/bin/freetype-config && chmod +x /usr/local/bin/freetype-config diff --git a/7.3/bullseye/fpm/Dockerfile b/7.3/bullseye/fpm/Dockerfile index 9d0481e61b..795af1d9f8 100644 --- a/7.3/bullseye/fpm/Dockerfile +++ b/7.3/bullseye/fpm/Dockerfile @@ -154,7 +154,6 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-iconv=shared \ --with-openssl \ --with-readline \ --with-zlib \ @@ -218,9 +217,6 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) RUN docker-php-ext-enable sodium -# iconv was built as a shared module (so it can be disabled later if desired) -RUN docker-php-ext-enable iconv - # temporary "freetype-config" workaround for https://github.com/docker-library/php/issues/865 (https://bugs.php.net/bug.php?id=76324) RUN { echo '#!/bin/sh'; echo 'exec pkg-config "$@" freetype2'; } > /usr/local/bin/freetype-config && chmod +x /usr/local/bin/freetype-config diff --git a/7.3/bullseye/zts/Dockerfile b/7.3/bullseye/zts/Dockerfile index 8372b22d18..2fa291cd35 100644 --- a/7.3/bullseye/zts/Dockerfile +++ b/7.3/bullseye/zts/Dockerfile @@ -154,7 +154,6 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-iconv=shared \ --with-openssl \ --with-readline \ --with-zlib \ @@ -219,9 +218,6 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) RUN docker-php-ext-enable sodium -# iconv was built as a shared module (so it can be disabled later if desired) -RUN docker-php-ext-enable iconv - # temporary "freetype-config" workaround for https://github.com/docker-library/php/issues/865 (https://bugs.php.net/bug.php?id=76324) RUN { echo '#!/bin/sh'; echo 'exec pkg-config "$@" freetype2'; } > /usr/local/bin/freetype-config && chmod +x /usr/local/bin/freetype-config diff --git a/7.3/buster/apache/Dockerfile b/7.3/buster/apache/Dockerfile index ff72954317..381ec7de44 100644 --- a/7.3/buster/apache/Dockerfile +++ b/7.3/buster/apache/Dockerfile @@ -213,7 +213,6 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-iconv=shared \ --with-openssl \ --with-readline \ --with-zlib \ @@ -275,9 +274,6 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) RUN docker-php-ext-enable sodium -# iconv was built as a shared module (so it can be disabled later if desired) -RUN docker-php-ext-enable iconv - # temporary "freetype-config" workaround for https://github.com/docker-library/php/issues/865 (https://bugs.php.net/bug.php?id=76324) RUN { echo '#!/bin/sh'; echo 'exec pkg-config "$@" freetype2'; } > /usr/local/bin/freetype-config && chmod +x /usr/local/bin/freetype-config diff --git a/7.3/buster/cli/Dockerfile b/7.3/buster/cli/Dockerfile index b68544098e..ce3285b77f 100644 --- a/7.3/buster/cli/Dockerfile +++ b/7.3/buster/cli/Dockerfile @@ -154,7 +154,6 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-iconv=shared \ --with-openssl \ --with-readline \ --with-zlib \ @@ -216,9 +215,6 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) RUN docker-php-ext-enable sodium -# iconv was built as a shared module (so it can be disabled later if desired) -RUN docker-php-ext-enable iconv - # temporary "freetype-config" workaround for https://github.com/docker-library/php/issues/865 (https://bugs.php.net/bug.php?id=76324) RUN { echo '#!/bin/sh'; echo 'exec pkg-config "$@" freetype2'; } > /usr/local/bin/freetype-config && chmod +x /usr/local/bin/freetype-config diff --git a/7.3/buster/fpm/Dockerfile b/7.3/buster/fpm/Dockerfile index 2a4f0c7cf3..91df8d384d 100644 --- a/7.3/buster/fpm/Dockerfile +++ b/7.3/buster/fpm/Dockerfile @@ -154,7 +154,6 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-iconv=shared \ --with-openssl \ --with-readline \ --with-zlib \ @@ -218,9 +217,6 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) RUN docker-php-ext-enable sodium -# iconv was built as a shared module (so it can be disabled later if desired) -RUN docker-php-ext-enable iconv - # temporary "freetype-config" workaround for https://github.com/docker-library/php/issues/865 (https://bugs.php.net/bug.php?id=76324) RUN { echo '#!/bin/sh'; echo 'exec pkg-config "$@" freetype2'; } > /usr/local/bin/freetype-config && chmod +x /usr/local/bin/freetype-config diff --git a/7.3/buster/zts/Dockerfile b/7.3/buster/zts/Dockerfile index a8f5e21b98..8dbe3ed296 100644 --- a/7.3/buster/zts/Dockerfile +++ b/7.3/buster/zts/Dockerfile @@ -154,7 +154,6 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-iconv=shared \ --with-openssl \ --with-readline \ --with-zlib \ @@ -219,9 +218,6 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) RUN docker-php-ext-enable sodium -# iconv was built as a shared module (so it can be disabled later if desired) -RUN docker-php-ext-enable iconv - # temporary "freetype-config" workaround for https://github.com/docker-library/php/issues/865 (https://bugs.php.net/bug.php?id=76324) RUN { echo '#!/bin/sh'; echo 'exec pkg-config "$@" freetype2'; } > /usr/local/bin/freetype-config && chmod +x /usr/local/bin/freetype-config diff --git a/7.4/alpine3.14/cli/Dockerfile b/7.4/alpine3.14/cli/Dockerfile index 30cd6650a4..2b743ae619 100644 --- a/7.4/alpine3.14/cli/Dockerfile +++ b/7.4/alpine3.14/cli/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 \ ; \ \ +# Replace musl iconv headers with gnu, only necessary for PHP < 8 + cp /usr/include/gnu-libiconv/*.h /usr/include; \ + \ export \ CFLAGS="$PHP_CFLAGS" \ CPPFLAGS="$PHP_CPPFLAGS" \ @@ -141,7 +145,7 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-iconv=shared \ + --with-iconv=/usr \ --with-openssl \ --with-readline \ --with-zlib \ @@ -198,8 +202,5 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) RUN docker-php-ext-enable sodium -# iconv was built as a shared module (so it can be disabled later if desired) -RUN docker-php-ext-enable iconv - ENTRYPOINT ["docker-php-entrypoint"] CMD ["php", "-a"] diff --git a/7.4/alpine3.14/fpm/Dockerfile b/7.4/alpine3.14/fpm/Dockerfile index 68997f45dc..6cbab9f3b8 100644 --- a/7.4/alpine3.14/fpm/Dockerfile +++ b/7.4/alpine3.14/fpm/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 \ ; \ \ +# Replace musl iconv headers with gnu, only necessary for PHP < 8 + cp /usr/include/gnu-libiconv/*.h /usr/include; \ + \ export \ CFLAGS="$PHP_CFLAGS" \ CPPFLAGS="$PHP_CPPFLAGS" \ @@ -141,7 +145,7 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-iconv=shared \ + --with-iconv=/usr \ --with-openssl \ --with-readline \ --with-zlib \ @@ -203,9 +207,6 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) RUN docker-php-ext-enable sodium -# iconv was built as a shared module (so it can be disabled later if desired) -RUN docker-php-ext-enable iconv - ENTRYPOINT ["docker-php-entrypoint"] WORKDIR /var/www/html diff --git a/7.4/alpine3.14/zts/Dockerfile b/7.4/alpine3.14/zts/Dockerfile index 3c5695e26a..45c26bc617 100644 --- a/7.4/alpine3.14/zts/Dockerfile +++ b/7.4/alpine3.14/zts/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 \ ; \ \ +# Replace musl iconv headers with gnu, only necessary for PHP < 8 + cp /usr/include/gnu-libiconv/*.h /usr/include; \ + \ export \ CFLAGS="$PHP_CFLAGS" \ CPPFLAGS="$PHP_CPPFLAGS" \ @@ -141,7 +145,7 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-iconv=shared \ + --with-iconv=/usr \ --with-openssl \ --with-readline \ --with-zlib \ @@ -201,8 +205,5 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) RUN docker-php-ext-enable sodium -# iconv was built as a shared module (so it can be disabled later if desired) -RUN docker-php-ext-enable iconv - ENTRYPOINT ["docker-php-entrypoint"] CMD ["php", "-a"] diff --git a/7.4/alpine3.15/cli/Dockerfile b/7.4/alpine3.15/cli/Dockerfile index a378ba143c..004152fdfc 100644 --- a/7.4/alpine3.15/cli/Dockerfile +++ b/7.4/alpine3.15/cli/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 \ ; \ \ +# Replace musl iconv headers with gnu, only necessary for PHP < 8 + cp /usr/include/gnu-libiconv/*.h /usr/include; \ + \ export \ CFLAGS="$PHP_CFLAGS" \ CPPFLAGS="$PHP_CPPFLAGS" \ @@ -141,7 +145,7 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-iconv=shared \ + --with-iconv=/usr \ --with-openssl \ --with-readline \ --with-zlib \ @@ -198,8 +202,5 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) RUN docker-php-ext-enable sodium -# iconv was built as a shared module (so it can be disabled later if desired) -RUN docker-php-ext-enable iconv - ENTRYPOINT ["docker-php-entrypoint"] CMD ["php", "-a"] diff --git a/7.4/alpine3.15/fpm/Dockerfile b/7.4/alpine3.15/fpm/Dockerfile index c11cfccd4b..213f74ce95 100644 --- a/7.4/alpine3.15/fpm/Dockerfile +++ b/7.4/alpine3.15/fpm/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 \ ; \ \ +# Replace musl iconv headers with gnu, only necessary for PHP < 8 + cp /usr/include/gnu-libiconv/*.h /usr/include; \ + \ export \ CFLAGS="$PHP_CFLAGS" \ CPPFLAGS="$PHP_CPPFLAGS" \ @@ -141,7 +145,7 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-iconv=shared \ + --with-iconv=/usr \ --with-openssl \ --with-readline \ --with-zlib \ @@ -203,9 +207,6 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) RUN docker-php-ext-enable sodium -# iconv was built as a shared module (so it can be disabled later if desired) -RUN docker-php-ext-enable iconv - ENTRYPOINT ["docker-php-entrypoint"] WORKDIR /var/www/html diff --git a/7.4/alpine3.15/zts/Dockerfile b/7.4/alpine3.15/zts/Dockerfile index de8276db91..d31e18e1dd 100644 --- a/7.4/alpine3.15/zts/Dockerfile +++ b/7.4/alpine3.15/zts/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 \ ; \ \ +# Replace musl iconv headers with gnu, only necessary for PHP < 8 + cp /usr/include/gnu-libiconv/*.h /usr/include; \ + \ export \ CFLAGS="$PHP_CFLAGS" \ CPPFLAGS="$PHP_CPPFLAGS" \ @@ -141,7 +145,7 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-iconv=shared \ + --with-iconv=/usr \ --with-openssl \ --with-readline \ --with-zlib \ @@ -201,8 +205,5 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) RUN docker-php-ext-enable sodium -# iconv was built as a shared module (so it can be disabled later if desired) -RUN docker-php-ext-enable iconv - ENTRYPOINT ["docker-php-entrypoint"] CMD ["php", "-a"] diff --git a/7.4/bullseye/apache/Dockerfile b/7.4/bullseye/apache/Dockerfile index 381cefbcaf..e81a7caa41 100644 --- a/7.4/bullseye/apache/Dockerfile +++ b/7.4/bullseye/apache/Dockerfile @@ -214,7 +214,6 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-iconv=shared \ --with-openssl \ --with-readline \ --with-zlib \ @@ -279,9 +278,6 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) RUN docker-php-ext-enable sodium -# iconv was built as a shared module (so it can be disabled later if desired) -RUN docker-php-ext-enable iconv - ENTRYPOINT ["docker-php-entrypoint"] # https://httpd.apache.org/docs/2.4/stopping.html#gracefulstop STOPSIGNAL SIGWINCH diff --git a/7.4/bullseye/cli/Dockerfile b/7.4/bullseye/cli/Dockerfile index b36cdba084..886cb2296e 100644 --- a/7.4/bullseye/cli/Dockerfile +++ b/7.4/bullseye/cli/Dockerfile @@ -155,7 +155,6 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-iconv=shared \ --with-openssl \ --with-readline \ --with-zlib \ @@ -220,8 +219,5 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) RUN docker-php-ext-enable sodium -# iconv was built as a shared module (so it can be disabled later if desired) -RUN docker-php-ext-enable iconv - ENTRYPOINT ["docker-php-entrypoint"] CMD ["php", "-a"] diff --git a/7.4/bullseye/fpm/Dockerfile b/7.4/bullseye/fpm/Dockerfile index e8c60bc470..11731e438b 100644 --- a/7.4/bullseye/fpm/Dockerfile +++ b/7.4/bullseye/fpm/Dockerfile @@ -155,7 +155,6 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-iconv=shared \ --with-openssl \ --with-readline \ --with-zlib \ @@ -222,9 +221,6 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) RUN docker-php-ext-enable sodium -# iconv was built as a shared module (so it can be disabled later if desired) -RUN docker-php-ext-enable iconv - ENTRYPOINT ["docker-php-entrypoint"] WORKDIR /var/www/html diff --git a/7.4/bullseye/zts/Dockerfile b/7.4/bullseye/zts/Dockerfile index 38c14eeef8..8ae5161f0a 100644 --- a/7.4/bullseye/zts/Dockerfile +++ b/7.4/bullseye/zts/Dockerfile @@ -155,7 +155,6 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-iconv=shared \ --with-openssl \ --with-readline \ --with-zlib \ @@ -223,8 +222,5 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) RUN docker-php-ext-enable sodium -# iconv was built as a shared module (so it can be disabled later if desired) -RUN docker-php-ext-enable iconv - ENTRYPOINT ["docker-php-entrypoint"] CMD ["php", "-a"] diff --git a/7.4/buster/apache/Dockerfile b/7.4/buster/apache/Dockerfile index fb29bd0649..34fd2cbdcd 100644 --- a/7.4/buster/apache/Dockerfile +++ b/7.4/buster/apache/Dockerfile @@ -214,7 +214,6 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-iconv=shared \ --with-openssl \ --with-readline \ --with-zlib \ @@ -279,9 +278,6 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) RUN docker-php-ext-enable sodium -# iconv was built as a shared module (so it can be disabled later if desired) -RUN docker-php-ext-enable iconv - ENTRYPOINT ["docker-php-entrypoint"] # https://httpd.apache.org/docs/2.4/stopping.html#gracefulstop STOPSIGNAL SIGWINCH diff --git a/7.4/buster/cli/Dockerfile b/7.4/buster/cli/Dockerfile index 8ea267a361..0d2823a926 100644 --- a/7.4/buster/cli/Dockerfile +++ b/7.4/buster/cli/Dockerfile @@ -155,7 +155,6 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-iconv=shared \ --with-openssl \ --with-readline \ --with-zlib \ @@ -220,8 +219,5 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) RUN docker-php-ext-enable sodium -# iconv was built as a shared module (so it can be disabled later if desired) -RUN docker-php-ext-enable iconv - ENTRYPOINT ["docker-php-entrypoint"] CMD ["php", "-a"] diff --git a/7.4/buster/fpm/Dockerfile b/7.4/buster/fpm/Dockerfile index 525764b9a1..429c9fe6b9 100644 --- a/7.4/buster/fpm/Dockerfile +++ b/7.4/buster/fpm/Dockerfile @@ -155,7 +155,6 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-iconv=shared \ --with-openssl \ --with-readline \ --with-zlib \ @@ -222,9 +221,6 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) RUN docker-php-ext-enable sodium -# iconv was built as a shared module (so it can be disabled later if desired) -RUN docker-php-ext-enable iconv - ENTRYPOINT ["docker-php-entrypoint"] WORKDIR /var/www/html diff --git a/7.4/buster/zts/Dockerfile b/7.4/buster/zts/Dockerfile index a817d88ff8..fe5f86721c 100644 --- a/7.4/buster/zts/Dockerfile +++ b/7.4/buster/zts/Dockerfile @@ -155,7 +155,6 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-iconv=shared \ --with-openssl \ --with-readline \ --with-zlib \ @@ -223,8 +222,5 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) RUN docker-php-ext-enable sodium -# iconv was built as a shared module (so it can be disabled later if desired) -RUN docker-php-ext-enable iconv - ENTRYPOINT ["docker-php-entrypoint"] CMD ["php", "-a"] diff --git a/8.0-rc/alpine3.14/cli/Dockerfile b/8.0-rc/alpine3.14/cli/Dockerfile index 634d9a0fd8..ee4724327e 100644 --- a/8.0-rc/alpine3.14/cli/Dockerfile +++ b/8.0-rc/alpine3.14/cli/Dockerfile @@ -95,6 +95,7 @@ RUN set -eux; \ argon2-dev \ coreutils \ curl-dev \ + gnu-libiconv-dev \ libsodium-dev \ libxml2-dev \ linux-headers \ @@ -141,7 +142,7 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-iconv=shared \ + --with-iconv=/usr \ --with-openssl \ --with-readline \ --with-zlib \ @@ -198,8 +199,5 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) RUN docker-php-ext-enable sodium -# iconv was built as a shared module (so it can be disabled later if desired) -RUN docker-php-ext-enable iconv - ENTRYPOINT ["docker-php-entrypoint"] CMD ["php", "-a"] diff --git a/8.0-rc/alpine3.14/fpm/Dockerfile b/8.0-rc/alpine3.14/fpm/Dockerfile index a030b7fdd4..3e55292d09 100644 --- a/8.0-rc/alpine3.14/fpm/Dockerfile +++ b/8.0-rc/alpine3.14/fpm/Dockerfile @@ -95,6 +95,7 @@ RUN set -eux; \ argon2-dev \ coreutils \ curl-dev \ + gnu-libiconv-dev \ libsodium-dev \ libxml2-dev \ linux-headers \ @@ -141,7 +142,7 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-iconv=shared \ + --with-iconv=/usr \ --with-openssl \ --with-readline \ --with-zlib \ @@ -203,9 +204,6 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) RUN docker-php-ext-enable sodium -# iconv was built as a shared module (so it can be disabled later if desired) -RUN docker-php-ext-enable iconv - ENTRYPOINT ["docker-php-entrypoint"] WORKDIR /var/www/html diff --git a/8.0-rc/alpine3.15/cli/Dockerfile b/8.0-rc/alpine3.15/cli/Dockerfile index 460daee8e2..d74fc4a376 100644 --- a/8.0-rc/alpine3.15/cli/Dockerfile +++ b/8.0-rc/alpine3.15/cli/Dockerfile @@ -95,6 +95,7 @@ RUN set -eux; \ argon2-dev \ coreutils \ curl-dev \ + gnu-libiconv-dev \ libsodium-dev \ libxml2-dev \ linux-headers \ @@ -141,7 +142,7 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-iconv=shared \ + --with-iconv=/usr \ --with-openssl \ --with-readline \ --with-zlib \ @@ -198,8 +199,5 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) RUN docker-php-ext-enable sodium -# iconv was built as a shared module (so it can be disabled later if desired) -RUN docker-php-ext-enable iconv - ENTRYPOINT ["docker-php-entrypoint"] CMD ["php", "-a"] diff --git a/8.0-rc/alpine3.15/fpm/Dockerfile b/8.0-rc/alpine3.15/fpm/Dockerfile index ffbfa61800..15c8813c70 100644 --- a/8.0-rc/alpine3.15/fpm/Dockerfile +++ b/8.0-rc/alpine3.15/fpm/Dockerfile @@ -95,6 +95,7 @@ RUN set -eux; \ argon2-dev \ coreutils \ curl-dev \ + gnu-libiconv-dev \ libsodium-dev \ libxml2-dev \ linux-headers \ @@ -141,7 +142,7 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-iconv=shared \ + --with-iconv=/usr \ --with-openssl \ --with-readline \ --with-zlib \ @@ -203,9 +204,6 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) RUN docker-php-ext-enable sodium -# iconv was built as a shared module (so it can be disabled later if desired) -RUN docker-php-ext-enable iconv - ENTRYPOINT ["docker-php-entrypoint"] WORKDIR /var/www/html diff --git a/8.0-rc/bullseye/apache/Dockerfile b/8.0-rc/bullseye/apache/Dockerfile index 51da2606cc..e871e878ca 100644 --- a/8.0-rc/bullseye/apache/Dockerfile +++ b/8.0-rc/bullseye/apache/Dockerfile @@ -214,7 +214,6 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-iconv=shared \ --with-openssl \ --with-readline \ --with-zlib \ @@ -279,9 +278,6 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) RUN docker-php-ext-enable sodium -# iconv was built as a shared module (so it can be disabled later if desired) -RUN docker-php-ext-enable iconv - ENTRYPOINT ["docker-php-entrypoint"] # https://httpd.apache.org/docs/2.4/stopping.html#gracefulstop STOPSIGNAL SIGWINCH diff --git a/8.0-rc/bullseye/cli/Dockerfile b/8.0-rc/bullseye/cli/Dockerfile index 7a91fe45a0..986e0be2bc 100644 --- a/8.0-rc/bullseye/cli/Dockerfile +++ b/8.0-rc/bullseye/cli/Dockerfile @@ -155,7 +155,6 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-iconv=shared \ --with-openssl \ --with-readline \ --with-zlib \ @@ -220,8 +219,5 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) RUN docker-php-ext-enable sodium -# iconv was built as a shared module (so it can be disabled later if desired) -RUN docker-php-ext-enable iconv - ENTRYPOINT ["docker-php-entrypoint"] CMD ["php", "-a"] diff --git a/8.0-rc/bullseye/fpm/Dockerfile b/8.0-rc/bullseye/fpm/Dockerfile index 61e09e6d4f..722b9e6d85 100644 --- a/8.0-rc/bullseye/fpm/Dockerfile +++ b/8.0-rc/bullseye/fpm/Dockerfile @@ -155,7 +155,6 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-iconv=shared \ --with-openssl \ --with-readline \ --with-zlib \ @@ -222,9 +221,6 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) RUN docker-php-ext-enable sodium -# iconv was built as a shared module (so it can be disabled later if desired) -RUN docker-php-ext-enable iconv - ENTRYPOINT ["docker-php-entrypoint"] WORKDIR /var/www/html diff --git a/8.0-rc/bullseye/zts/Dockerfile b/8.0-rc/bullseye/zts/Dockerfile index 8b856eb783..bdcd3ee4d2 100644 --- a/8.0-rc/bullseye/zts/Dockerfile +++ b/8.0-rc/bullseye/zts/Dockerfile @@ -155,7 +155,6 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-iconv=shared \ --with-openssl \ --with-readline \ --with-zlib \ @@ -223,8 +222,5 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) RUN docker-php-ext-enable sodium -# iconv was built as a shared module (so it can be disabled later if desired) -RUN docker-php-ext-enable iconv - ENTRYPOINT ["docker-php-entrypoint"] CMD ["php", "-a"] diff --git a/8.0-rc/buster/apache/Dockerfile b/8.0-rc/buster/apache/Dockerfile index 0dcd3cfda5..b1de97d04f 100644 --- a/8.0-rc/buster/apache/Dockerfile +++ b/8.0-rc/buster/apache/Dockerfile @@ -214,7 +214,6 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-iconv=shared \ --with-openssl \ --with-readline \ --with-zlib \ @@ -279,9 +278,6 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) RUN docker-php-ext-enable sodium -# iconv was built as a shared module (so it can be disabled later if desired) -RUN docker-php-ext-enable iconv - ENTRYPOINT ["docker-php-entrypoint"] # https://httpd.apache.org/docs/2.4/stopping.html#gracefulstop STOPSIGNAL SIGWINCH diff --git a/8.0-rc/buster/cli/Dockerfile b/8.0-rc/buster/cli/Dockerfile index 22cbda41ac..461bbcab46 100644 --- a/8.0-rc/buster/cli/Dockerfile +++ b/8.0-rc/buster/cli/Dockerfile @@ -155,7 +155,6 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-iconv=shared \ --with-openssl \ --with-readline \ --with-zlib \ @@ -220,8 +219,5 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) RUN docker-php-ext-enable sodium -# iconv was built as a shared module (so it can be disabled later if desired) -RUN docker-php-ext-enable iconv - ENTRYPOINT ["docker-php-entrypoint"] CMD ["php", "-a"] diff --git a/8.0-rc/buster/fpm/Dockerfile b/8.0-rc/buster/fpm/Dockerfile index 15bb0d8a9b..44f9f21e11 100644 --- a/8.0-rc/buster/fpm/Dockerfile +++ b/8.0-rc/buster/fpm/Dockerfile @@ -155,7 +155,6 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-iconv=shared \ --with-openssl \ --with-readline \ --with-zlib \ @@ -222,9 +221,6 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) RUN docker-php-ext-enable sodium -# iconv was built as a shared module (so it can be disabled later if desired) -RUN docker-php-ext-enable iconv - ENTRYPOINT ["docker-php-entrypoint"] WORKDIR /var/www/html diff --git a/8.0-rc/buster/zts/Dockerfile b/8.0-rc/buster/zts/Dockerfile index e0da844625..e891dc02dd 100644 --- a/8.0-rc/buster/zts/Dockerfile +++ b/8.0-rc/buster/zts/Dockerfile @@ -155,7 +155,6 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-iconv=shared \ --with-openssl \ --with-readline \ --with-zlib \ @@ -223,8 +222,5 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) RUN docker-php-ext-enable sodium -# iconv was built as a shared module (so it can be disabled later if desired) -RUN docker-php-ext-enable iconv - ENTRYPOINT ["docker-php-entrypoint"] CMD ["php", "-a"] diff --git a/8.0/alpine3.14/cli/Dockerfile b/8.0/alpine3.14/cli/Dockerfile index 7e6446d7a7..15774d7a3c 100644 --- a/8.0/alpine3.14/cli/Dockerfile +++ b/8.0/alpine3.14/cli/Dockerfile @@ -95,6 +95,7 @@ RUN set -eux; \ argon2-dev \ coreutils \ curl-dev \ + gnu-libiconv-dev \ libsodium-dev \ libxml2-dev \ linux-headers \ @@ -141,7 +142,7 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-iconv=shared \ + --with-iconv=/usr \ --with-openssl \ --with-readline \ --with-zlib \ @@ -198,8 +199,5 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) RUN docker-php-ext-enable sodium -# iconv was built as a shared module (so it can be disabled later if desired) -RUN docker-php-ext-enable iconv - ENTRYPOINT ["docker-php-entrypoint"] CMD ["php", "-a"] diff --git a/8.0/alpine3.14/fpm/Dockerfile b/8.0/alpine3.14/fpm/Dockerfile index 05dd77fa6d..25f72c0d88 100644 --- a/8.0/alpine3.14/fpm/Dockerfile +++ b/8.0/alpine3.14/fpm/Dockerfile @@ -95,6 +95,7 @@ RUN set -eux; \ argon2-dev \ coreutils \ curl-dev \ + gnu-libiconv-dev \ libsodium-dev \ libxml2-dev \ linux-headers \ @@ -141,7 +142,7 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-iconv=shared \ + --with-iconv=/usr \ --with-openssl \ --with-readline \ --with-zlib \ @@ -203,9 +204,6 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) RUN docker-php-ext-enable sodium -# iconv was built as a shared module (so it can be disabled later if desired) -RUN docker-php-ext-enable iconv - ENTRYPOINT ["docker-php-entrypoint"] WORKDIR /var/www/html diff --git a/8.0/alpine3.15/cli/Dockerfile b/8.0/alpine3.15/cli/Dockerfile index 3006dd894f..71c1ebcfa1 100644 --- a/8.0/alpine3.15/cli/Dockerfile +++ b/8.0/alpine3.15/cli/Dockerfile @@ -95,6 +95,7 @@ RUN set -eux; \ argon2-dev \ coreutils \ curl-dev \ + gnu-libiconv-dev \ libsodium-dev \ libxml2-dev \ linux-headers \ @@ -141,7 +142,7 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-iconv=shared \ + --with-iconv=/usr \ --with-openssl \ --with-readline \ --with-zlib \ @@ -198,8 +199,5 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) RUN docker-php-ext-enable sodium -# iconv was built as a shared module (so it can be disabled later if desired) -RUN docker-php-ext-enable iconv - ENTRYPOINT ["docker-php-entrypoint"] CMD ["php", "-a"] diff --git a/8.0/alpine3.15/fpm/Dockerfile b/8.0/alpine3.15/fpm/Dockerfile index 80bcbc125f..81a7489a17 100644 --- a/8.0/alpine3.15/fpm/Dockerfile +++ b/8.0/alpine3.15/fpm/Dockerfile @@ -95,6 +95,7 @@ RUN set -eux; \ argon2-dev \ coreutils \ curl-dev \ + gnu-libiconv-dev \ libsodium-dev \ libxml2-dev \ linux-headers \ @@ -141,7 +142,7 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-iconv=shared \ + --with-iconv=/usr \ --with-openssl \ --with-readline \ --with-zlib \ @@ -203,9 +204,6 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) RUN docker-php-ext-enable sodium -# iconv was built as a shared module (so it can be disabled later if desired) -RUN docker-php-ext-enable iconv - ENTRYPOINT ["docker-php-entrypoint"] WORKDIR /var/www/html diff --git a/8.0/bullseye/apache/Dockerfile b/8.0/bullseye/apache/Dockerfile index b4d3522331..dc573d622b 100644 --- a/8.0/bullseye/apache/Dockerfile +++ b/8.0/bullseye/apache/Dockerfile @@ -214,7 +214,6 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-iconv=shared \ --with-openssl \ --with-readline \ --with-zlib \ @@ -279,9 +278,6 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) RUN docker-php-ext-enable sodium -# iconv was built as a shared module (so it can be disabled later if desired) -RUN docker-php-ext-enable iconv - ENTRYPOINT ["docker-php-entrypoint"] # https://httpd.apache.org/docs/2.4/stopping.html#gracefulstop STOPSIGNAL SIGWINCH diff --git a/8.0/bullseye/cli/Dockerfile b/8.0/bullseye/cli/Dockerfile index 3a3ed2d27e..d7eee24c0e 100644 --- a/8.0/bullseye/cli/Dockerfile +++ b/8.0/bullseye/cli/Dockerfile @@ -155,7 +155,6 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-iconv=shared \ --with-openssl \ --with-readline \ --with-zlib \ @@ -220,8 +219,5 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) RUN docker-php-ext-enable sodium -# iconv was built as a shared module (so it can be disabled later if desired) -RUN docker-php-ext-enable iconv - ENTRYPOINT ["docker-php-entrypoint"] CMD ["php", "-a"] diff --git a/8.0/bullseye/fpm/Dockerfile b/8.0/bullseye/fpm/Dockerfile index 1902ff446a..f7d6c9addc 100644 --- a/8.0/bullseye/fpm/Dockerfile +++ b/8.0/bullseye/fpm/Dockerfile @@ -155,7 +155,6 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-iconv=shared \ --with-openssl \ --with-readline \ --with-zlib \ @@ -222,9 +221,6 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) RUN docker-php-ext-enable sodium -# iconv was built as a shared module (so it can be disabled later if desired) -RUN docker-php-ext-enable iconv - ENTRYPOINT ["docker-php-entrypoint"] WORKDIR /var/www/html diff --git a/8.0/bullseye/zts/Dockerfile b/8.0/bullseye/zts/Dockerfile index 0d604acd37..779b6f1f22 100644 --- a/8.0/bullseye/zts/Dockerfile +++ b/8.0/bullseye/zts/Dockerfile @@ -155,7 +155,6 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-iconv=shared \ --with-openssl \ --with-readline \ --with-zlib \ @@ -223,8 +222,5 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) RUN docker-php-ext-enable sodium -# iconv was built as a shared module (so it can be disabled later if desired) -RUN docker-php-ext-enable iconv - ENTRYPOINT ["docker-php-entrypoint"] CMD ["php", "-a"] diff --git a/8.0/buster/apache/Dockerfile b/8.0/buster/apache/Dockerfile index 93e5d894b2..4a99389700 100644 --- a/8.0/buster/apache/Dockerfile +++ b/8.0/buster/apache/Dockerfile @@ -214,7 +214,6 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-iconv=shared \ --with-openssl \ --with-readline \ --with-zlib \ @@ -279,9 +278,6 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) RUN docker-php-ext-enable sodium -# iconv was built as a shared module (so it can be disabled later if desired) -RUN docker-php-ext-enable iconv - ENTRYPOINT ["docker-php-entrypoint"] # https://httpd.apache.org/docs/2.4/stopping.html#gracefulstop STOPSIGNAL SIGWINCH diff --git a/8.0/buster/cli/Dockerfile b/8.0/buster/cli/Dockerfile index c9cf29e32b..f55f26c0bc 100644 --- a/8.0/buster/cli/Dockerfile +++ b/8.0/buster/cli/Dockerfile @@ -155,7 +155,6 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-iconv=shared \ --with-openssl \ --with-readline \ --with-zlib \ @@ -220,8 +219,5 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) RUN docker-php-ext-enable sodium -# iconv was built as a shared module (so it can be disabled later if desired) -RUN docker-php-ext-enable iconv - ENTRYPOINT ["docker-php-entrypoint"] CMD ["php", "-a"] diff --git a/8.0/buster/fpm/Dockerfile b/8.0/buster/fpm/Dockerfile index 4a2ff89270..3d9e07a30a 100644 --- a/8.0/buster/fpm/Dockerfile +++ b/8.0/buster/fpm/Dockerfile @@ -155,7 +155,6 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-iconv=shared \ --with-openssl \ --with-readline \ --with-zlib \ @@ -222,9 +221,6 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) RUN docker-php-ext-enable sodium -# iconv was built as a shared module (so it can be disabled later if desired) -RUN docker-php-ext-enable iconv - ENTRYPOINT ["docker-php-entrypoint"] WORKDIR /var/www/html diff --git a/8.0/buster/zts/Dockerfile b/8.0/buster/zts/Dockerfile index 59703854a5..bc1f60d4e8 100644 --- a/8.0/buster/zts/Dockerfile +++ b/8.0/buster/zts/Dockerfile @@ -155,7 +155,6 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-iconv=shared \ --with-openssl \ --with-readline \ --with-zlib \ @@ -223,8 +222,5 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) RUN docker-php-ext-enable sodium -# iconv was built as a shared module (so it can be disabled later if desired) -RUN docker-php-ext-enable iconv - ENTRYPOINT ["docker-php-entrypoint"] CMD ["php", "-a"] diff --git a/8.1-rc/alpine3.14/cli/Dockerfile b/8.1-rc/alpine3.14/cli/Dockerfile index 289a78abdb..235052ee7f 100644 --- a/8.1-rc/alpine3.14/cli/Dockerfile +++ b/8.1-rc/alpine3.14/cli/Dockerfile @@ -95,6 +95,7 @@ RUN set -eux; \ argon2-dev \ coreutils \ curl-dev \ + gnu-libiconv-dev \ libsodium-dev \ libxml2-dev \ linux-headers \ @@ -141,7 +142,7 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-iconv=shared \ + --with-iconv=/usr \ --with-openssl \ --with-readline \ --with-zlib \ @@ -198,8 +199,5 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) RUN docker-php-ext-enable sodium -# iconv was built as a shared module (so it can be disabled later if desired) -RUN docker-php-ext-enable iconv - ENTRYPOINT ["docker-php-entrypoint"] CMD ["php", "-a"] diff --git a/8.1-rc/alpine3.14/fpm/Dockerfile b/8.1-rc/alpine3.14/fpm/Dockerfile index 98179835d5..38772d3bb1 100644 --- a/8.1-rc/alpine3.14/fpm/Dockerfile +++ b/8.1-rc/alpine3.14/fpm/Dockerfile @@ -95,6 +95,7 @@ RUN set -eux; \ argon2-dev \ coreutils \ curl-dev \ + gnu-libiconv-dev \ libsodium-dev \ libxml2-dev \ linux-headers \ @@ -141,7 +142,7 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-iconv=shared \ + --with-iconv=/usr \ --with-openssl \ --with-readline \ --with-zlib \ @@ -203,9 +204,6 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) RUN docker-php-ext-enable sodium -# iconv was built as a shared module (so it can be disabled later if desired) -RUN docker-php-ext-enable iconv - ENTRYPOINT ["docker-php-entrypoint"] WORKDIR /var/www/html diff --git a/8.1-rc/alpine3.15/cli/Dockerfile b/8.1-rc/alpine3.15/cli/Dockerfile index 2e8e1d3d9b..6c4616c496 100644 --- a/8.1-rc/alpine3.15/cli/Dockerfile +++ b/8.1-rc/alpine3.15/cli/Dockerfile @@ -95,6 +95,7 @@ RUN set -eux; \ argon2-dev \ coreutils \ curl-dev \ + gnu-libiconv-dev \ libsodium-dev \ libxml2-dev \ linux-headers \ @@ -141,7 +142,7 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-iconv=shared \ + --with-iconv=/usr \ --with-openssl \ --with-readline \ --with-zlib \ @@ -198,8 +199,5 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) RUN docker-php-ext-enable sodium -# iconv was built as a shared module (so it can be disabled later if desired) -RUN docker-php-ext-enable iconv - ENTRYPOINT ["docker-php-entrypoint"] CMD ["php", "-a"] diff --git a/8.1-rc/alpine3.15/fpm/Dockerfile b/8.1-rc/alpine3.15/fpm/Dockerfile index fe98542b6e..8efc6667f1 100644 --- a/8.1-rc/alpine3.15/fpm/Dockerfile +++ b/8.1-rc/alpine3.15/fpm/Dockerfile @@ -95,6 +95,7 @@ RUN set -eux; \ argon2-dev \ coreutils \ curl-dev \ + gnu-libiconv-dev \ libsodium-dev \ libxml2-dev \ linux-headers \ @@ -141,7 +142,7 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-iconv=shared \ + --with-iconv=/usr \ --with-openssl \ --with-readline \ --with-zlib \ @@ -203,9 +204,6 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) RUN docker-php-ext-enable sodium -# iconv was built as a shared module (so it can be disabled later if desired) -RUN docker-php-ext-enable iconv - ENTRYPOINT ["docker-php-entrypoint"] WORKDIR /var/www/html diff --git a/8.1-rc/bullseye/apache/Dockerfile b/8.1-rc/bullseye/apache/Dockerfile index 2e788b3f7f..e7ff7f5c2e 100644 --- a/8.1-rc/bullseye/apache/Dockerfile +++ b/8.1-rc/bullseye/apache/Dockerfile @@ -214,7 +214,6 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-iconv=shared \ --with-openssl \ --with-readline \ --with-zlib \ @@ -279,9 +278,6 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) RUN docker-php-ext-enable sodium -# iconv was built as a shared module (so it can be disabled later if desired) -RUN docker-php-ext-enable iconv - ENTRYPOINT ["docker-php-entrypoint"] # https://httpd.apache.org/docs/2.4/stopping.html#gracefulstop STOPSIGNAL SIGWINCH diff --git a/8.1-rc/bullseye/cli/Dockerfile b/8.1-rc/bullseye/cli/Dockerfile index 8d043db4db..3f5500deb2 100644 --- a/8.1-rc/bullseye/cli/Dockerfile +++ b/8.1-rc/bullseye/cli/Dockerfile @@ -155,7 +155,6 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-iconv=shared \ --with-openssl \ --with-readline \ --with-zlib \ @@ -220,8 +219,5 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) RUN docker-php-ext-enable sodium -# iconv was built as a shared module (so it can be disabled later if desired) -RUN docker-php-ext-enable iconv - ENTRYPOINT ["docker-php-entrypoint"] CMD ["php", "-a"] diff --git a/8.1-rc/bullseye/fpm/Dockerfile b/8.1-rc/bullseye/fpm/Dockerfile index 837e113fdc..5f973d76ed 100644 --- a/8.1-rc/bullseye/fpm/Dockerfile +++ b/8.1-rc/bullseye/fpm/Dockerfile @@ -155,7 +155,6 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-iconv=shared \ --with-openssl \ --with-readline \ --with-zlib \ @@ -222,9 +221,6 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) RUN docker-php-ext-enable sodium -# iconv was built as a shared module (so it can be disabled later if desired) -RUN docker-php-ext-enable iconv - ENTRYPOINT ["docker-php-entrypoint"] WORKDIR /var/www/html diff --git a/8.1-rc/bullseye/zts/Dockerfile b/8.1-rc/bullseye/zts/Dockerfile index 3501b8b679..7040fdfb46 100644 --- a/8.1-rc/bullseye/zts/Dockerfile +++ b/8.1-rc/bullseye/zts/Dockerfile @@ -155,7 +155,6 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-iconv=shared \ --with-openssl \ --with-readline \ --with-zlib \ @@ -223,8 +222,5 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) RUN docker-php-ext-enable sodium -# iconv was built as a shared module (so it can be disabled later if desired) -RUN docker-php-ext-enable iconv - ENTRYPOINT ["docker-php-entrypoint"] CMD ["php", "-a"] diff --git a/8.1-rc/buster/apache/Dockerfile b/8.1-rc/buster/apache/Dockerfile index 58d968e9ef..b702d4c54e 100644 --- a/8.1-rc/buster/apache/Dockerfile +++ b/8.1-rc/buster/apache/Dockerfile @@ -214,7 +214,6 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-iconv=shared \ --with-openssl \ --with-readline \ --with-zlib \ @@ -279,9 +278,6 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) RUN docker-php-ext-enable sodium -# iconv was built as a shared module (so it can be disabled later if desired) -RUN docker-php-ext-enable iconv - ENTRYPOINT ["docker-php-entrypoint"] # https://httpd.apache.org/docs/2.4/stopping.html#gracefulstop STOPSIGNAL SIGWINCH diff --git a/8.1-rc/buster/cli/Dockerfile b/8.1-rc/buster/cli/Dockerfile index e0cc6b0541..07166c27b8 100644 --- a/8.1-rc/buster/cli/Dockerfile +++ b/8.1-rc/buster/cli/Dockerfile @@ -155,7 +155,6 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-iconv=shared \ --with-openssl \ --with-readline \ --with-zlib \ @@ -220,8 +219,5 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) RUN docker-php-ext-enable sodium -# iconv was built as a shared module (so it can be disabled later if desired) -RUN docker-php-ext-enable iconv - ENTRYPOINT ["docker-php-entrypoint"] CMD ["php", "-a"] diff --git a/8.1-rc/buster/fpm/Dockerfile b/8.1-rc/buster/fpm/Dockerfile index 84ebf4514f..d60841eee1 100644 --- a/8.1-rc/buster/fpm/Dockerfile +++ b/8.1-rc/buster/fpm/Dockerfile @@ -155,7 +155,6 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-iconv=shared \ --with-openssl \ --with-readline \ --with-zlib \ @@ -222,9 +221,6 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) RUN docker-php-ext-enable sodium -# iconv was built as a shared module (so it can be disabled later if desired) -RUN docker-php-ext-enable iconv - ENTRYPOINT ["docker-php-entrypoint"] WORKDIR /var/www/html diff --git a/8.1-rc/buster/zts/Dockerfile b/8.1-rc/buster/zts/Dockerfile index 02073ea8e7..059a8528c2 100644 --- a/8.1-rc/buster/zts/Dockerfile +++ b/8.1-rc/buster/zts/Dockerfile @@ -155,7 +155,6 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-iconv=shared \ --with-openssl \ --with-readline \ --with-zlib \ @@ -223,8 +222,5 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) RUN docker-php-ext-enable sodium -# iconv was built as a shared module (so it can be disabled later if desired) -RUN docker-php-ext-enable iconv - ENTRYPOINT ["docker-php-entrypoint"] CMD ["php", "-a"] diff --git a/8.1/alpine3.14/cli/Dockerfile b/8.1/alpine3.14/cli/Dockerfile index 1f5c3e353e..936c56ae17 100644 --- a/8.1/alpine3.14/cli/Dockerfile +++ b/8.1/alpine3.14/cli/Dockerfile @@ -95,6 +95,7 @@ RUN set -eux; \ argon2-dev \ coreutils \ curl-dev \ + gnu-libiconv-dev \ libsodium-dev \ libxml2-dev \ linux-headers \ @@ -141,7 +142,7 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-iconv=shared \ + --with-iconv=/usr \ --with-openssl \ --with-readline \ --with-zlib \ @@ -198,8 +199,5 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) RUN docker-php-ext-enable sodium -# iconv was built as a shared module (so it can be disabled later if desired) -RUN docker-php-ext-enable iconv - ENTRYPOINT ["docker-php-entrypoint"] CMD ["php", "-a"] diff --git a/8.1/alpine3.14/fpm/Dockerfile b/8.1/alpine3.14/fpm/Dockerfile index e37633ebec..d6af3d28a9 100644 --- a/8.1/alpine3.14/fpm/Dockerfile +++ b/8.1/alpine3.14/fpm/Dockerfile @@ -95,6 +95,7 @@ RUN set -eux; \ argon2-dev \ coreutils \ curl-dev \ + gnu-libiconv-dev \ libsodium-dev \ libxml2-dev \ linux-headers \ @@ -141,7 +142,7 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-iconv=shared \ + --with-iconv=/usr \ --with-openssl \ --with-readline \ --with-zlib \ @@ -203,9 +204,6 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) RUN docker-php-ext-enable sodium -# iconv was built as a shared module (so it can be disabled later if desired) -RUN docker-php-ext-enable iconv - ENTRYPOINT ["docker-php-entrypoint"] WORKDIR /var/www/html diff --git a/8.1/alpine3.15/cli/Dockerfile b/8.1/alpine3.15/cli/Dockerfile index 7572f67df5..2f30de96fd 100644 --- a/8.1/alpine3.15/cli/Dockerfile +++ b/8.1/alpine3.15/cli/Dockerfile @@ -95,6 +95,7 @@ RUN set -eux; \ argon2-dev \ coreutils \ curl-dev \ + gnu-libiconv-dev \ libsodium-dev \ libxml2-dev \ linux-headers \ @@ -141,7 +142,7 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-iconv=shared \ + --with-iconv=/usr \ --with-openssl \ --with-readline \ --with-zlib \ @@ -198,8 +199,5 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) RUN docker-php-ext-enable sodium -# iconv was built as a shared module (so it can be disabled later if desired) -RUN docker-php-ext-enable iconv - ENTRYPOINT ["docker-php-entrypoint"] CMD ["php", "-a"] diff --git a/8.1/alpine3.15/fpm/Dockerfile b/8.1/alpine3.15/fpm/Dockerfile index bd030d4bf5..2fda6ee779 100644 --- a/8.1/alpine3.15/fpm/Dockerfile +++ b/8.1/alpine3.15/fpm/Dockerfile @@ -95,6 +95,7 @@ RUN set -eux; \ argon2-dev \ coreutils \ curl-dev \ + gnu-libiconv-dev \ libsodium-dev \ libxml2-dev \ linux-headers \ @@ -141,7 +142,7 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-iconv=shared \ + --with-iconv=/usr \ --with-openssl \ --with-readline \ --with-zlib \ @@ -203,9 +204,6 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) RUN docker-php-ext-enable sodium -# iconv was built as a shared module (so it can be disabled later if desired) -RUN docker-php-ext-enable iconv - ENTRYPOINT ["docker-php-entrypoint"] WORKDIR /var/www/html diff --git a/8.1/bullseye/apache/Dockerfile b/8.1/bullseye/apache/Dockerfile index 394cd545fe..fb0d680ae2 100644 --- a/8.1/bullseye/apache/Dockerfile +++ b/8.1/bullseye/apache/Dockerfile @@ -214,7 +214,6 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-iconv=shared \ --with-openssl \ --with-readline \ --with-zlib \ @@ -279,9 +278,6 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) RUN docker-php-ext-enable sodium -# iconv was built as a shared module (so it can be disabled later if desired) -RUN docker-php-ext-enable iconv - ENTRYPOINT ["docker-php-entrypoint"] # https://httpd.apache.org/docs/2.4/stopping.html#gracefulstop STOPSIGNAL SIGWINCH diff --git a/8.1/bullseye/cli/Dockerfile b/8.1/bullseye/cli/Dockerfile index dfeef54730..be231ee03e 100644 --- a/8.1/bullseye/cli/Dockerfile +++ b/8.1/bullseye/cli/Dockerfile @@ -155,7 +155,6 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-iconv=shared \ --with-openssl \ --with-readline \ --with-zlib \ @@ -220,8 +219,5 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) RUN docker-php-ext-enable sodium -# iconv was built as a shared module (so it can be disabled later if desired) -RUN docker-php-ext-enable iconv - ENTRYPOINT ["docker-php-entrypoint"] CMD ["php", "-a"] diff --git a/8.1/bullseye/fpm/Dockerfile b/8.1/bullseye/fpm/Dockerfile index 157f970d57..0b3b84d880 100644 --- a/8.1/bullseye/fpm/Dockerfile +++ b/8.1/bullseye/fpm/Dockerfile @@ -155,7 +155,6 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-iconv=shared \ --with-openssl \ --with-readline \ --with-zlib \ @@ -222,9 +221,6 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) RUN docker-php-ext-enable sodium -# iconv was built as a shared module (so it can be disabled later if desired) -RUN docker-php-ext-enable iconv - ENTRYPOINT ["docker-php-entrypoint"] WORKDIR /var/www/html diff --git a/8.1/bullseye/zts/Dockerfile b/8.1/bullseye/zts/Dockerfile index 031bd53438..4b13a181d7 100644 --- a/8.1/bullseye/zts/Dockerfile +++ b/8.1/bullseye/zts/Dockerfile @@ -155,7 +155,6 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-iconv=shared \ --with-openssl \ --with-readline \ --with-zlib \ @@ -223,8 +222,5 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) RUN docker-php-ext-enable sodium -# iconv was built as a shared module (so it can be disabled later if desired) -RUN docker-php-ext-enable iconv - ENTRYPOINT ["docker-php-entrypoint"] CMD ["php", "-a"] diff --git a/8.1/buster/apache/Dockerfile b/8.1/buster/apache/Dockerfile index 165ae2d27f..45da64fd1f 100644 --- a/8.1/buster/apache/Dockerfile +++ b/8.1/buster/apache/Dockerfile @@ -214,7 +214,6 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-iconv=shared \ --with-openssl \ --with-readline \ --with-zlib \ @@ -279,9 +278,6 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) RUN docker-php-ext-enable sodium -# iconv was built as a shared module (so it can be disabled later if desired) -RUN docker-php-ext-enable iconv - ENTRYPOINT ["docker-php-entrypoint"] # https://httpd.apache.org/docs/2.4/stopping.html#gracefulstop STOPSIGNAL SIGWINCH diff --git a/8.1/buster/cli/Dockerfile b/8.1/buster/cli/Dockerfile index 89d5a626bf..2e35d2eb7d 100644 --- a/8.1/buster/cli/Dockerfile +++ b/8.1/buster/cli/Dockerfile @@ -155,7 +155,6 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-iconv=shared \ --with-openssl \ --with-readline \ --with-zlib \ @@ -220,8 +219,5 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) RUN docker-php-ext-enable sodium -# iconv was built as a shared module (so it can be disabled later if desired) -RUN docker-php-ext-enable iconv - ENTRYPOINT ["docker-php-entrypoint"] CMD ["php", "-a"] diff --git a/8.1/buster/fpm/Dockerfile b/8.1/buster/fpm/Dockerfile index bddcdda577..df33250548 100644 --- a/8.1/buster/fpm/Dockerfile +++ b/8.1/buster/fpm/Dockerfile @@ -155,7 +155,6 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-iconv=shared \ --with-openssl \ --with-readline \ --with-zlib \ @@ -222,9 +221,6 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) RUN docker-php-ext-enable sodium -# iconv was built as a shared module (so it can be disabled later if desired) -RUN docker-php-ext-enable iconv - ENTRYPOINT ["docker-php-entrypoint"] WORKDIR /var/www/html diff --git a/8.1/buster/zts/Dockerfile b/8.1/buster/zts/Dockerfile index 65efc75d5d..351d6c1a02 100644 --- a/8.1/buster/zts/Dockerfile +++ b/8.1/buster/zts/Dockerfile @@ -155,7 +155,6 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-iconv=shared \ --with-openssl \ --with-readline \ --with-zlib \ @@ -223,8 +222,5 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) RUN docker-php-ext-enable sodium -# iconv was built as a shared module (so it can be disabled later if desired) -RUN docker-php-ext-enable iconv - ENTRYPOINT ["docker-php-entrypoint"] CMD ["php", "-a"] diff --git a/Dockerfile-linux.template b/Dockerfile-linux.template index 1c42b26e7b..b8bd25d5f7 100644 --- a/Dockerfile-linux.template +++ b/Dockerfile-linux.template @@ -259,6 +259,7 @@ RUN set -eux; \ "openssl-dev", "readline-dev", "sqlite-dev", + "gnu-libiconv-dev", # https://github.com/docker-library/php/issues/888 if (.version | version_id) >= ("7.4" | version_id) then "linux-headers" else empty end, # oniguruma is part of mbstring in php 7.4+ @@ -285,6 +286,11 @@ RUN set -eux; \ -}} ; \ \ +{{ if is_alpine and (.version | version_id) < ("8" | version_id) then ( -}} +# Replace musl iconv headers with gnu, only necessary for PHP < 8 + cp /usr/include/gnu-libiconv/*.h /usr/include; \ + \ +{{ ) else "" end -}} export \ CFLAGS="$PHP_CFLAGS" \ CPPFLAGS="$PHP_CPPFLAGS" \ @@ -329,7 +335,9 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-iconv=shared \ +{{ if is_alpine then ( -}} + --with-iconv=/usr \ +{{ ) else "" end -}} --with-openssl \ --with-readline \ --with-zlib \ @@ -440,9 +448,6 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ # sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) RUN docker-php-ext-enable sodium -# iconv was built as a shared module (so it can be disabled later if desired) -RUN docker-php-ext-enable iconv - {{ # https://github.com/docker-library/php/issues/865 # https://bugs.php.net/bug.php?id=76324