From bff4e0e56e7399eaecd29dae57b9699e49edf200 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20D=C3=BCsterhus?= Date: Thu, 1 Feb 2024 19:48:17 +0100 Subject: [PATCH 1/2] Drop PHP 8.2.14 / 8.3.1 for `--enable-ftp` These versions have been superseeded by newer versions and thus the condition will no longer match. see 641cf9a226ba8447dcf9338d2a19a59f1102967b --- Dockerfile-linux.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile-linux.template b/Dockerfile-linux.template index 70312903d..23a4fb548 100644 --- a/Dockerfile-linux.template +++ b/Dockerfile-linux.template @@ -318,7 +318,7 @@ RUN set -eux; \ # https://github.com/docker-library/php/issues/822 --with-pic \ \ -{{ if .version as $v | [ "8.1.27", "8.2.14", "8.3.1" ] | index($v) then ( -}} +{{ if .version as $v | [ "8.1.27" ] | 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 -}} From 5a70099cfab8cf8315f7b261cd8fd33c08ab2df7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20D=C3=BCsterhus?= Date: Thu, 1 Feb 2024 19:51:54 +0100 Subject: [PATCH 2/2] Add `--enable-ftp` for future 8.1.x versions 8.1.x is security-only and future releases happen on a case to case basis to fix security issues only. We likely should not break the build for those folks still on 8.1. see #1482 --- Dockerfile-linux.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile-linux.template b/Dockerfile-linux.template index 23a4fb548..f980ecd33 100644 --- a/Dockerfile-linux.template +++ b/Dockerfile-linux.template @@ -318,7 +318,7 @@ RUN set -eux; \ # https://github.com/docker-library/php/issues/822 --with-pic \ \ -{{ if .version as $v | [ "8.1.27" ] | index($v) then ( -}} +{{ if [ "8.1" ] | index(env.version | rtrimstr("-rc")) 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 -}}