Skip to content

Commit

Permalink
Clean up handling of --enable-ftp (docker-library#1491)
Browse files Browse the repository at this point in the history
* 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 641cf9a

* 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 641cf9a
  • Loading branch information
TimWolla authored Feb 1, 2024
1 parent 9873aea commit 04841f8
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Dockerfile-linux.template
Original file line number Diff line number Diff line change
Expand Up @@ -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 [ "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 -}}
Expand Down

0 comments on commit 04841f8

Please sign in to comment.