diff --git a/8.1/alpine3.18/cli/Dockerfile b/8.1/alpine3.18/cli/Dockerfile index c3a1126b94..dbe54d75f9 100644 --- a/8.1/alpine3.18/cli/Dockerfile +++ b/8.1/alpine3.18/cli/Dockerfile @@ -132,7 +132,7 @@ RUN set -eux; \ # https://github.com/docker-library/php/issues/822 --with-pic \ \ -# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) +# --enable-ftp is included here for compatibility with existing versions. ftp_ssl_connect() needed ftp to be compiled statically before PHP 7.0 (see https://github.com/docker-library/php/issues/236). --enable-ftp \ # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195) --enable-mbstring \ diff --git a/8.1/alpine3.18/fpm/Dockerfile b/8.1/alpine3.18/fpm/Dockerfile index 4ab993f497..edb54486c9 100644 --- a/8.1/alpine3.18/fpm/Dockerfile +++ b/8.1/alpine3.18/fpm/Dockerfile @@ -132,7 +132,7 @@ RUN set -eux; \ # https://github.com/docker-library/php/issues/822 --with-pic \ \ -# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) +# --enable-ftp is included here for compatibility with existing versions. ftp_ssl_connect() needed ftp to be compiled statically before PHP 7.0 (see https://github.com/docker-library/php/issues/236). --enable-ftp \ # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195) --enable-mbstring \ diff --git a/8.1/alpine3.18/zts/Dockerfile b/8.1/alpine3.18/zts/Dockerfile index 19c8a275a8..960ae9f5a0 100644 --- a/8.1/alpine3.18/zts/Dockerfile +++ b/8.1/alpine3.18/zts/Dockerfile @@ -132,7 +132,7 @@ RUN set -eux; \ # https://github.com/docker-library/php/issues/822 --with-pic \ \ -# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) +# --enable-ftp is included here for compatibility with existing versions. ftp_ssl_connect() needed ftp to be compiled statically before PHP 7.0 (see https://github.com/docker-library/php/issues/236). --enable-ftp \ # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195) --enable-mbstring \ diff --git a/8.1/alpine3.19/cli/Dockerfile b/8.1/alpine3.19/cli/Dockerfile index 93089c94be..a4d0c0d4f2 100644 --- a/8.1/alpine3.19/cli/Dockerfile +++ b/8.1/alpine3.19/cli/Dockerfile @@ -132,7 +132,7 @@ RUN set -eux; \ # https://github.com/docker-library/php/issues/822 --with-pic \ \ -# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) +# --enable-ftp is included here for compatibility with existing versions. ftp_ssl_connect() needed ftp to be compiled statically before PHP 7.0 (see https://github.com/docker-library/php/issues/236). --enable-ftp \ # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195) --enable-mbstring \ diff --git a/8.1/alpine3.19/fpm/Dockerfile b/8.1/alpine3.19/fpm/Dockerfile index 9b2cc3c7fa..b1e2bc52fe 100644 --- a/8.1/alpine3.19/fpm/Dockerfile +++ b/8.1/alpine3.19/fpm/Dockerfile @@ -132,7 +132,7 @@ RUN set -eux; \ # https://github.com/docker-library/php/issues/822 --with-pic \ \ -# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) +# --enable-ftp is included here for compatibility with existing versions. ftp_ssl_connect() needed ftp to be compiled statically before PHP 7.0 (see https://github.com/docker-library/php/issues/236). --enable-ftp \ # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195) --enable-mbstring \ diff --git a/8.1/alpine3.19/zts/Dockerfile b/8.1/alpine3.19/zts/Dockerfile index 40b466bdd5..3b25c5e75a 100644 --- a/8.1/alpine3.19/zts/Dockerfile +++ b/8.1/alpine3.19/zts/Dockerfile @@ -132,7 +132,7 @@ RUN set -eux; \ # https://github.com/docker-library/php/issues/822 --with-pic \ \ -# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) +# --enable-ftp is included here for compatibility with existing versions. ftp_ssl_connect() needed ftp to be compiled statically before PHP 7.0 (see https://github.com/docker-library/php/issues/236). --enable-ftp \ # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195) --enable-mbstring \ diff --git a/8.1/bookworm/apache/Dockerfile b/8.1/bookworm/apache/Dockerfile index 8f1b0e880c..1b164c37d2 100644 --- a/8.1/bookworm/apache/Dockerfile +++ b/8.1/bookworm/apache/Dockerfile @@ -204,7 +204,7 @@ RUN set -eux; \ # https://github.com/docker-library/php/issues/822 --with-pic \ \ -# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) +# --enable-ftp is included here for compatibility with existing versions. ftp_ssl_connect() needed ftp to be compiled statically before PHP 7.0 (see https://github.com/docker-library/php/issues/236). --enable-ftp \ # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195) --enable-mbstring \ diff --git a/8.1/bookworm/cli/Dockerfile b/8.1/bookworm/cli/Dockerfile index ed9728f8b4..14d8bfff69 100644 --- a/8.1/bookworm/cli/Dockerfile +++ b/8.1/bookworm/cli/Dockerfile @@ -143,7 +143,7 @@ RUN set -eux; \ # https://github.com/docker-library/php/issues/822 --with-pic \ \ -# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) +# --enable-ftp is included here for compatibility with existing versions. ftp_ssl_connect() needed ftp to be compiled statically before PHP 7.0 (see https://github.com/docker-library/php/issues/236). --enable-ftp \ # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195) --enable-mbstring \ diff --git a/8.1/bookworm/fpm/Dockerfile b/8.1/bookworm/fpm/Dockerfile index 0a69135da8..1efe2438e7 100644 --- a/8.1/bookworm/fpm/Dockerfile +++ b/8.1/bookworm/fpm/Dockerfile @@ -143,7 +143,7 @@ RUN set -eux; \ # https://github.com/docker-library/php/issues/822 --with-pic \ \ -# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) +# --enable-ftp is included here for compatibility with existing versions. ftp_ssl_connect() needed ftp to be compiled statically before PHP 7.0 (see https://github.com/docker-library/php/issues/236). --enable-ftp \ # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195) --enable-mbstring \ diff --git a/8.1/bookworm/zts/Dockerfile b/8.1/bookworm/zts/Dockerfile index 670bf7499d..4bccfa769f 100644 --- a/8.1/bookworm/zts/Dockerfile +++ b/8.1/bookworm/zts/Dockerfile @@ -143,7 +143,7 @@ RUN set -eux; \ # https://github.com/docker-library/php/issues/822 --with-pic \ \ -# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) +# --enable-ftp is included here for compatibility with existing versions. ftp_ssl_connect() needed ftp to be compiled statically before PHP 7.0 (see https://github.com/docker-library/php/issues/236). --enable-ftp \ # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195) --enable-mbstring \ diff --git a/8.1/bullseye/apache/Dockerfile b/8.1/bullseye/apache/Dockerfile index 560bf0ecab..fdf7870eff 100644 --- a/8.1/bullseye/apache/Dockerfile +++ b/8.1/bullseye/apache/Dockerfile @@ -202,7 +202,7 @@ RUN set -eux; \ # https://github.com/docker-library/php/issues/822 --with-pic \ \ -# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) +# --enable-ftp is included here for compatibility with existing versions. ftp_ssl_connect() needed ftp to be compiled statically before PHP 7.0 (see https://github.com/docker-library/php/issues/236). --enable-ftp \ # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195) --enable-mbstring \ diff --git a/8.1/bullseye/cli/Dockerfile b/8.1/bullseye/cli/Dockerfile index ed44b6fd3e..ad37e4f205 100644 --- a/8.1/bullseye/cli/Dockerfile +++ b/8.1/bullseye/cli/Dockerfile @@ -143,7 +143,7 @@ RUN set -eux; \ # https://github.com/docker-library/php/issues/822 --with-pic \ \ -# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) +# --enable-ftp is included here for compatibility with existing versions. ftp_ssl_connect() needed ftp to be compiled statically before PHP 7.0 (see https://github.com/docker-library/php/issues/236). --enable-ftp \ # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195) --enable-mbstring \ diff --git a/8.1/bullseye/fpm/Dockerfile b/8.1/bullseye/fpm/Dockerfile index f02dfb2c47..cbfc2f7639 100644 --- a/8.1/bullseye/fpm/Dockerfile +++ b/8.1/bullseye/fpm/Dockerfile @@ -143,7 +143,7 @@ RUN set -eux; \ # https://github.com/docker-library/php/issues/822 --with-pic \ \ -# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) +# --enable-ftp is included here for compatibility with existing versions. ftp_ssl_connect() needed ftp to be compiled statically before PHP 7.0 (see https://github.com/docker-library/php/issues/236). --enable-ftp \ # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195) --enable-mbstring \ diff --git a/8.1/bullseye/zts/Dockerfile b/8.1/bullseye/zts/Dockerfile index f3aa129f52..713ff611b6 100644 --- a/8.1/bullseye/zts/Dockerfile +++ b/8.1/bullseye/zts/Dockerfile @@ -143,7 +143,7 @@ RUN set -eux; \ # https://github.com/docker-library/php/issues/822 --with-pic \ \ -# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) +# --enable-ftp is included here for compatibility with existing versions. ftp_ssl_connect() needed ftp to be compiled statically before PHP 7.0 (see https://github.com/docker-library/php/issues/236). --enable-ftp \ # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195) --enable-mbstring \ diff --git a/8.2/alpine3.18/cli/Dockerfile b/8.2/alpine3.18/cli/Dockerfile index 98134e01ea..88a4c02444 100644 --- a/8.2/alpine3.18/cli/Dockerfile +++ b/8.2/alpine3.18/cli/Dockerfile @@ -132,7 +132,7 @@ RUN set -eux; \ # https://github.com/docker-library/php/issues/822 --with-pic \ \ -# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) +# --enable-ftp is included here for compatibility with existing versions. ftp_ssl_connect() needed ftp to be compiled statically before PHP 7.0 (see https://github.com/docker-library/php/issues/236). --enable-ftp \ # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195) --enable-mbstring \ diff --git a/8.2/alpine3.18/fpm/Dockerfile b/8.2/alpine3.18/fpm/Dockerfile index bafbe303ab..11d3203413 100644 --- a/8.2/alpine3.18/fpm/Dockerfile +++ b/8.2/alpine3.18/fpm/Dockerfile @@ -132,7 +132,7 @@ RUN set -eux; \ # https://github.com/docker-library/php/issues/822 --with-pic \ \ -# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) +# --enable-ftp is included here for compatibility with existing versions. ftp_ssl_connect() needed ftp to be compiled statically before PHP 7.0 (see https://github.com/docker-library/php/issues/236). --enable-ftp \ # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195) --enable-mbstring \ diff --git a/8.2/alpine3.18/zts/Dockerfile b/8.2/alpine3.18/zts/Dockerfile index 51b5b6039e..a587d81f8c 100644 --- a/8.2/alpine3.18/zts/Dockerfile +++ b/8.2/alpine3.18/zts/Dockerfile @@ -132,7 +132,7 @@ RUN set -eux; \ # https://github.com/docker-library/php/issues/822 --with-pic \ \ -# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) +# --enable-ftp is included here for compatibility with existing versions. ftp_ssl_connect() needed ftp to be compiled statically before PHP 7.0 (see https://github.com/docker-library/php/issues/236). --enable-ftp \ # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195) --enable-mbstring \ diff --git a/8.2/alpine3.19/cli/Dockerfile b/8.2/alpine3.19/cli/Dockerfile index 29f1d71176..8e260de776 100644 --- a/8.2/alpine3.19/cli/Dockerfile +++ b/8.2/alpine3.19/cli/Dockerfile @@ -132,7 +132,7 @@ RUN set -eux; \ # https://github.com/docker-library/php/issues/822 --with-pic \ \ -# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) +# --enable-ftp is included here for compatibility with existing versions. ftp_ssl_connect() needed ftp to be compiled statically before PHP 7.0 (see https://github.com/docker-library/php/issues/236). --enable-ftp \ # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195) --enable-mbstring \ diff --git a/8.2/alpine3.19/fpm/Dockerfile b/8.2/alpine3.19/fpm/Dockerfile index 0fa821b84b..145db56da3 100644 --- a/8.2/alpine3.19/fpm/Dockerfile +++ b/8.2/alpine3.19/fpm/Dockerfile @@ -132,7 +132,7 @@ RUN set -eux; \ # https://github.com/docker-library/php/issues/822 --with-pic \ \ -# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) +# --enable-ftp is included here for compatibility with existing versions. ftp_ssl_connect() needed ftp to be compiled statically before PHP 7.0 (see https://github.com/docker-library/php/issues/236). --enable-ftp \ # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195) --enable-mbstring \ diff --git a/8.2/alpine3.19/zts/Dockerfile b/8.2/alpine3.19/zts/Dockerfile index b9ea89a59e..fd5b099d04 100644 --- a/8.2/alpine3.19/zts/Dockerfile +++ b/8.2/alpine3.19/zts/Dockerfile @@ -132,7 +132,7 @@ RUN set -eux; \ # https://github.com/docker-library/php/issues/822 --with-pic \ \ -# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) +# --enable-ftp is included here for compatibility with existing versions. ftp_ssl_connect() needed ftp to be compiled statically before PHP 7.0 (see https://github.com/docker-library/php/issues/236). --enable-ftp \ # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195) --enable-mbstring \ diff --git a/8.2/bookworm/apache/Dockerfile b/8.2/bookworm/apache/Dockerfile index 47d78ee22d..3f8d3d8002 100644 --- a/8.2/bookworm/apache/Dockerfile +++ b/8.2/bookworm/apache/Dockerfile @@ -204,7 +204,7 @@ RUN set -eux; \ # https://github.com/docker-library/php/issues/822 --with-pic \ \ -# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) +# --enable-ftp is included here for compatibility with existing versions. ftp_ssl_connect() needed ftp to be compiled statically before PHP 7.0 (see https://github.com/docker-library/php/issues/236). --enable-ftp \ # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195) --enable-mbstring \ diff --git a/8.2/bookworm/cli/Dockerfile b/8.2/bookworm/cli/Dockerfile index 8ef2b181f8..11fd69a4e6 100644 --- a/8.2/bookworm/cli/Dockerfile +++ b/8.2/bookworm/cli/Dockerfile @@ -143,7 +143,7 @@ RUN set -eux; \ # https://github.com/docker-library/php/issues/822 --with-pic \ \ -# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) +# --enable-ftp is included here for compatibility with existing versions. ftp_ssl_connect() needed ftp to be compiled statically before PHP 7.0 (see https://github.com/docker-library/php/issues/236). --enable-ftp \ # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195) --enable-mbstring \ diff --git a/8.2/bookworm/fpm/Dockerfile b/8.2/bookworm/fpm/Dockerfile index 37d2d92298..901f19f4d3 100644 --- a/8.2/bookworm/fpm/Dockerfile +++ b/8.2/bookworm/fpm/Dockerfile @@ -143,7 +143,7 @@ RUN set -eux; \ # https://github.com/docker-library/php/issues/822 --with-pic \ \ -# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) +# --enable-ftp is included here for compatibility with existing versions. ftp_ssl_connect() needed ftp to be compiled statically before PHP 7.0 (see https://github.com/docker-library/php/issues/236). --enable-ftp \ # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195) --enable-mbstring \ diff --git a/8.2/bookworm/zts/Dockerfile b/8.2/bookworm/zts/Dockerfile index be2897f51c..6ec9689a91 100644 --- a/8.2/bookworm/zts/Dockerfile +++ b/8.2/bookworm/zts/Dockerfile @@ -143,7 +143,7 @@ RUN set -eux; \ # https://github.com/docker-library/php/issues/822 --with-pic \ \ -# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) +# --enable-ftp is included here for compatibility with existing versions. ftp_ssl_connect() needed ftp to be compiled statically before PHP 7.0 (see https://github.com/docker-library/php/issues/236). --enable-ftp \ # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195) --enable-mbstring \ diff --git a/8.2/bullseye/apache/Dockerfile b/8.2/bullseye/apache/Dockerfile index 9105e8f551..ea05b232c7 100644 --- a/8.2/bullseye/apache/Dockerfile +++ b/8.2/bullseye/apache/Dockerfile @@ -202,7 +202,7 @@ RUN set -eux; \ # https://github.com/docker-library/php/issues/822 --with-pic \ \ -# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) +# --enable-ftp is included here for compatibility with existing versions. ftp_ssl_connect() needed ftp to be compiled statically before PHP 7.0 (see https://github.com/docker-library/php/issues/236). --enable-ftp \ # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195) --enable-mbstring \ diff --git a/8.2/bullseye/cli/Dockerfile b/8.2/bullseye/cli/Dockerfile index f34d12c1a8..fdb2b30fc2 100644 --- a/8.2/bullseye/cli/Dockerfile +++ b/8.2/bullseye/cli/Dockerfile @@ -143,7 +143,7 @@ RUN set -eux; \ # https://github.com/docker-library/php/issues/822 --with-pic \ \ -# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) +# --enable-ftp is included here for compatibility with existing versions. ftp_ssl_connect() needed ftp to be compiled statically before PHP 7.0 (see https://github.com/docker-library/php/issues/236). --enable-ftp \ # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195) --enable-mbstring \ diff --git a/8.2/bullseye/fpm/Dockerfile b/8.2/bullseye/fpm/Dockerfile index 1355dea16d..22981d1e54 100644 --- a/8.2/bullseye/fpm/Dockerfile +++ b/8.2/bullseye/fpm/Dockerfile @@ -143,7 +143,7 @@ RUN set -eux; \ # https://github.com/docker-library/php/issues/822 --with-pic \ \ -# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) +# --enable-ftp is included here for compatibility with existing versions. ftp_ssl_connect() needed ftp to be compiled statically before PHP 7.0 (see https://github.com/docker-library/php/issues/236). --enable-ftp \ # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195) --enable-mbstring \ diff --git a/8.2/bullseye/zts/Dockerfile b/8.2/bullseye/zts/Dockerfile index d65d12f81a..0eaa05ff48 100644 --- a/8.2/bullseye/zts/Dockerfile +++ b/8.2/bullseye/zts/Dockerfile @@ -143,7 +143,7 @@ RUN set -eux; \ # https://github.com/docker-library/php/issues/822 --with-pic \ \ -# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) +# --enable-ftp is included here for compatibility with existing versions. ftp_ssl_connect() needed ftp to be compiled statically before PHP 7.0 (see https://github.com/docker-library/php/issues/236). --enable-ftp \ # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195) --enable-mbstring \ diff --git a/8.3/alpine3.18/cli/Dockerfile b/8.3/alpine3.18/cli/Dockerfile index edb9def277..c065765919 100644 --- a/8.3/alpine3.18/cli/Dockerfile +++ b/8.3/alpine3.18/cli/Dockerfile @@ -132,7 +132,7 @@ RUN set -eux; \ # https://github.com/docker-library/php/issues/822 --with-pic \ \ -# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) +# --enable-ftp is included here for compatibility with existing versions. ftp_ssl_connect() needed ftp to be compiled statically before PHP 7.0 (see https://github.com/docker-library/php/issues/236). --enable-ftp \ # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195) --enable-mbstring \ diff --git a/8.3/alpine3.18/fpm/Dockerfile b/8.3/alpine3.18/fpm/Dockerfile index cdfc62e131..da1b3b4b5d 100644 --- a/8.3/alpine3.18/fpm/Dockerfile +++ b/8.3/alpine3.18/fpm/Dockerfile @@ -132,7 +132,7 @@ RUN set -eux; \ # https://github.com/docker-library/php/issues/822 --with-pic \ \ -# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) +# --enable-ftp is included here for compatibility with existing versions. ftp_ssl_connect() needed ftp to be compiled statically before PHP 7.0 (see https://github.com/docker-library/php/issues/236). --enable-ftp \ # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195) --enable-mbstring \ diff --git a/8.3/alpine3.18/zts/Dockerfile b/8.3/alpine3.18/zts/Dockerfile index 1d156f412d..0205425da5 100644 --- a/8.3/alpine3.18/zts/Dockerfile +++ b/8.3/alpine3.18/zts/Dockerfile @@ -132,7 +132,7 @@ RUN set -eux; \ # https://github.com/docker-library/php/issues/822 --with-pic \ \ -# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) +# --enable-ftp is included here for compatibility with existing versions. ftp_ssl_connect() needed ftp to be compiled statically before PHP 7.0 (see https://github.com/docker-library/php/issues/236). --enable-ftp \ # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195) --enable-mbstring \ diff --git a/8.3/alpine3.19/cli/Dockerfile b/8.3/alpine3.19/cli/Dockerfile index 09d8708619..40a2dcba65 100644 --- a/8.3/alpine3.19/cli/Dockerfile +++ b/8.3/alpine3.19/cli/Dockerfile @@ -132,7 +132,7 @@ RUN set -eux; \ # https://github.com/docker-library/php/issues/822 --with-pic \ \ -# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) +# --enable-ftp is included here for compatibility with existing versions. ftp_ssl_connect() needed ftp to be compiled statically before PHP 7.0 (see https://github.com/docker-library/php/issues/236). --enable-ftp \ # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195) --enable-mbstring \ diff --git a/8.3/alpine3.19/fpm/Dockerfile b/8.3/alpine3.19/fpm/Dockerfile index f1e2f6fd81..89718e4478 100644 --- a/8.3/alpine3.19/fpm/Dockerfile +++ b/8.3/alpine3.19/fpm/Dockerfile @@ -132,7 +132,7 @@ RUN set -eux; \ # https://github.com/docker-library/php/issues/822 --with-pic \ \ -# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) +# --enable-ftp is included here for compatibility with existing versions. ftp_ssl_connect() needed ftp to be compiled statically before PHP 7.0 (see https://github.com/docker-library/php/issues/236). --enable-ftp \ # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195) --enable-mbstring \ diff --git a/8.3/alpine3.19/zts/Dockerfile b/8.3/alpine3.19/zts/Dockerfile index d6b36d285b..a907bf4ec8 100644 --- a/8.3/alpine3.19/zts/Dockerfile +++ b/8.3/alpine3.19/zts/Dockerfile @@ -132,7 +132,7 @@ RUN set -eux; \ # https://github.com/docker-library/php/issues/822 --with-pic \ \ -# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) +# --enable-ftp is included here for compatibility with existing versions. ftp_ssl_connect() needed ftp to be compiled statically before PHP 7.0 (see https://github.com/docker-library/php/issues/236). --enable-ftp \ # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195) --enable-mbstring \ diff --git a/8.3/bookworm/apache/Dockerfile b/8.3/bookworm/apache/Dockerfile index 8d68d92460..4fd0e7aa78 100644 --- a/8.3/bookworm/apache/Dockerfile +++ b/8.3/bookworm/apache/Dockerfile @@ -204,7 +204,7 @@ RUN set -eux; \ # https://github.com/docker-library/php/issues/822 --with-pic \ \ -# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) +# --enable-ftp is included here for compatibility with existing versions. ftp_ssl_connect() needed ftp to be compiled statically before PHP 7.0 (see https://github.com/docker-library/php/issues/236). --enable-ftp \ # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195) --enable-mbstring \ diff --git a/8.3/bookworm/cli/Dockerfile b/8.3/bookworm/cli/Dockerfile index c56b82a5d4..51484c1d74 100644 --- a/8.3/bookworm/cli/Dockerfile +++ b/8.3/bookworm/cli/Dockerfile @@ -143,7 +143,7 @@ RUN set -eux; \ # https://github.com/docker-library/php/issues/822 --with-pic \ \ -# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) +# --enable-ftp is included here for compatibility with existing versions. ftp_ssl_connect() needed ftp to be compiled statically before PHP 7.0 (see https://github.com/docker-library/php/issues/236). --enable-ftp \ # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195) --enable-mbstring \ diff --git a/8.3/bookworm/fpm/Dockerfile b/8.3/bookworm/fpm/Dockerfile index 0cbad36672..c32ce9e100 100644 --- a/8.3/bookworm/fpm/Dockerfile +++ b/8.3/bookworm/fpm/Dockerfile @@ -143,7 +143,7 @@ RUN set -eux; \ # https://github.com/docker-library/php/issues/822 --with-pic \ \ -# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) +# --enable-ftp is included here for compatibility with existing versions. ftp_ssl_connect() needed ftp to be compiled statically before PHP 7.0 (see https://github.com/docker-library/php/issues/236). --enable-ftp \ # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195) --enable-mbstring \ diff --git a/8.3/bookworm/zts/Dockerfile b/8.3/bookworm/zts/Dockerfile index b2d0334195..b49128ea56 100644 --- a/8.3/bookworm/zts/Dockerfile +++ b/8.3/bookworm/zts/Dockerfile @@ -143,7 +143,7 @@ RUN set -eux; \ # https://github.com/docker-library/php/issues/822 --with-pic \ \ -# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) +# --enable-ftp is included here for compatibility with existing versions. ftp_ssl_connect() needed ftp to be compiled statically before PHP 7.0 (see https://github.com/docker-library/php/issues/236). --enable-ftp \ # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195) --enable-mbstring \ diff --git a/8.3/bullseye/apache/Dockerfile b/8.3/bullseye/apache/Dockerfile index e90d09996d..1a5d35e247 100644 --- a/8.3/bullseye/apache/Dockerfile +++ b/8.3/bullseye/apache/Dockerfile @@ -202,7 +202,7 @@ RUN set -eux; \ # https://github.com/docker-library/php/issues/822 --with-pic \ \ -# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) +# --enable-ftp is included here for compatibility with existing versions. ftp_ssl_connect() needed ftp to be compiled statically before PHP 7.0 (see https://github.com/docker-library/php/issues/236). --enable-ftp \ # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195) --enable-mbstring \ diff --git a/8.3/bullseye/cli/Dockerfile b/8.3/bullseye/cli/Dockerfile index d3c3299f56..f4d821fd26 100644 --- a/8.3/bullseye/cli/Dockerfile +++ b/8.3/bullseye/cli/Dockerfile @@ -143,7 +143,7 @@ RUN set -eux; \ # https://github.com/docker-library/php/issues/822 --with-pic \ \ -# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) +# --enable-ftp is included here for compatibility with existing versions. ftp_ssl_connect() needed ftp to be compiled statically before PHP 7.0 (see https://github.com/docker-library/php/issues/236). --enable-ftp \ # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195) --enable-mbstring \ diff --git a/8.3/bullseye/fpm/Dockerfile b/8.3/bullseye/fpm/Dockerfile index 7bb59a241d..a75d7fdd22 100644 --- a/8.3/bullseye/fpm/Dockerfile +++ b/8.3/bullseye/fpm/Dockerfile @@ -143,7 +143,7 @@ RUN set -eux; \ # https://github.com/docker-library/php/issues/822 --with-pic \ \ -# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) +# --enable-ftp is included here for compatibility with existing versions. ftp_ssl_connect() needed ftp to be compiled statically before PHP 7.0 (see https://github.com/docker-library/php/issues/236). --enable-ftp \ # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195) --enable-mbstring \ diff --git a/8.3/bullseye/zts/Dockerfile b/8.3/bullseye/zts/Dockerfile index e7fadcc018..af06ffc78e 100644 --- a/8.3/bullseye/zts/Dockerfile +++ b/8.3/bullseye/zts/Dockerfile @@ -143,7 +143,7 @@ RUN set -eux; \ # https://github.com/docker-library/php/issues/822 --with-pic \ \ -# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) +# --enable-ftp is included here for compatibility with existing versions. ftp_ssl_connect() needed ftp to be compiled statically before PHP 7.0 (see https://github.com/docker-library/php/issues/236). --enable-ftp \ # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195) --enable-mbstring \ diff --git a/Dockerfile-linux.template b/Dockerfile-linux.template index 14c9d15c24..70312903d6 100644 --- a/Dockerfile-linux.template +++ b/Dockerfile-linux.template @@ -318,8 +318,10 @@ RUN set -eux; \ # https://github.com/docker-library/php/issues/822 --with-pic \ \ -# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) +{{ if .version as $v | [ "8.1.27", "8.2.14", "8.3.1" ] | index($v) then ( -}} +# --enable-ftp is included here for compatibility with existing versions. ftp_ssl_connect() needed ftp to be compiled statically before PHP 7.0 (see https://github.com/docker-library/php/issues/236). --enable-ftp \ +{{ ) else "" end -}} # --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195) --enable-mbstring \ # --enable-mysqlnd is included here because it's harder to compile after the fact than extensions are (since it's a plugin for several extensions, not an extension in itself)