From 53d81594c8050ba84ab7410860b355493f753346 Mon Sep 17 00:00:00 2001 From: J0WI Date: Wed, 25 Feb 2026 20:46:02 +0000 Subject: [PATCH] Use PHP 8.4 for Nextcloud 33 (#2533) Signed-off-by: J0WI --- 33/apache/Dockerfile | 4 ++-- 33/fpm-alpine/Dockerfile | 4 ++-- 33/fpm/Dockerfile | 4 ++-- Dockerfile-alpine.template | 2 +- Dockerfile-debian.template | 2 +- update.sh | 12 +++++++++++- versions.json | 6 +++--- 7 files changed, 22 insertions(+), 12 deletions(-) diff --git a/33/apache/Dockerfile b/33/apache/Dockerfile index 80a360bb..d43d415b 100644 --- a/33/apache/Dockerfile +++ b/33/apache/Dockerfile @@ -1,5 +1,5 @@ # DO NOT EDIT: created by update.sh from Dockerfile-debian.template -FROM php:8.3-apache-trixie +FROM php:8.4-apache-trixie # entrypoint.sh and cron.sh dependencies RUN set -ex; \ @@ -46,7 +46,7 @@ RUN set -ex; \ ; \ \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ - docker-php-ext-configure ftp --with-openssl-dir=/usr; \ + docker-php-ext-configure ftp --with-ftp-ssl; \ docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \ docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \ docker-php-ext-install -j "$(nproc)" \ diff --git a/33/fpm-alpine/Dockerfile b/33/fpm-alpine/Dockerfile index 74e9db34..a8e53969 100644 --- a/33/fpm-alpine/Dockerfile +++ b/33/fpm-alpine/Dockerfile @@ -1,5 +1,5 @@ # DO NOT EDIT: created by update.sh from Dockerfile-alpine.template -FROM php:8.3-fpm-alpine3.23 +FROM php:8.4-fpm-alpine3.23 # entrypoint.sh and cron.sh dependencies RUN set -ex; \ @@ -42,7 +42,7 @@ RUN set -ex; \ postgresql-dev \ ; \ \ - docker-php-ext-configure ftp --with-openssl-dir=/usr; \ + docker-php-ext-configure ftp --with-ftp-ssl; \ docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \ docker-php-ext-configure ldap; \ docker-php-ext-install -j "$(nproc)" \ diff --git a/33/fpm/Dockerfile b/33/fpm/Dockerfile index 483ceac8..c9f43259 100644 --- a/33/fpm/Dockerfile +++ b/33/fpm/Dockerfile @@ -1,5 +1,5 @@ # DO NOT EDIT: created by update.sh from Dockerfile-debian.template -FROM php:8.3-fpm-trixie +FROM php:8.4-fpm-trixie # entrypoint.sh and cron.sh dependencies RUN set -ex; \ @@ -46,7 +46,7 @@ RUN set -ex; \ ; \ \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ - docker-php-ext-configure ftp --with-openssl-dir=/usr; \ + docker-php-ext-configure ftp --with-ftp-ssl; \ docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \ docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \ docker-php-ext-install -j "$(nproc)" \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index a7238bb7..5fe764bb 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -41,7 +41,7 @@ RUN set -ex; \ postgresql-dev \ ; \ \ - docker-php-ext-configure ftp --with-openssl-dir=/usr; \ + docker-php-ext-configure ftp %%FTP_OPTIONS%%; \ docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \ docker-php-ext-configure ldap; \ docker-php-ext-install -j "$(nproc)" \ diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 10974d6d..72e4d08c 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -45,7 +45,7 @@ RUN set -ex; \ ; \ \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ - docker-php-ext-configure ftp --with-openssl-dir=/usr; \ + docker-php-ext-configure ftp %%FTP_OPTIONS%%; \ docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \ docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \ docker-php-ext-install -j "$(nproc)" \ diff --git a/update.sh b/update.sh index b1a40343..8ac32636 100755 --- a/update.sh +++ b/update.sh @@ -10,7 +10,15 @@ declare -A debian_version=( ) declare -A php_version=( - [default]='8.3' + [31]='8.3' + [32]='8.3' + [default]='8.4' +) + +declare -A ftp_options=( + [31]='--with-openssl-dir=/usr' + [32]='--with-openssl-dir=/usr' + [default]='--with-ftp-ssl' ) declare -A cmd=( @@ -105,6 +113,7 @@ function create_variant() { dir="$1/$variant" alpineVersion=${alpine_version[$version]-${alpine_version[default]}} debianVersion=${debian_version[$version]-${debian_version[default]}} + ftp_options=${ftp_options[$version]-${ftp_options[default]}} phpVersion=${php_version[$version]-${php_version[default]}} crontabInt=${crontab_int[$version]-${crontab_int[default]}} url="https://github.com/nextcloud-releases/server/releases/download/v$fullversion/nextcloud-$fullversion.tar.bz2" @@ -131,6 +140,7 @@ function create_variant() { s/%%CMD%%/'"${cmd[$variant]}"'/g; s|%%VARIANT_EXTRAS%%|'"${extras[$variant]}"'|g; s/%%APCU_VERSION%%/'"${pecl_versions[APCu]}"'/g; + s|%%FTP_OPTIONS%%|'"$ftp_options"'|g; s/%%IGBINARY_VERSION%%/'"${pecl_versions[igbinary]}"'/g; s/%%IMAGICK_VERSION%%/'"${pecl_versions[imagick]}"'/g; s/%%MEMCACHED_VERSION%%/'"${pecl_versions[memcached]}"'/g; diff --git a/versions.json b/versions.json index fd9e527f..eb26365a 100644 --- a/versions.json +++ b/versions.json @@ -9,19 +9,19 @@ "variant": "apache", "base": "debian", "baseVersion": "trixie", - "phpVersion": "8.3" + "phpVersion": "8.4" }, "fpm": { "variant": "fpm", "base": "debian", "baseVersion": "trixie", - "phpVersion": "8.3" + "phpVersion": "8.4" }, "fpm-alpine": { "variant": "fpm-alpine", "base": "alpine", "baseVersion": "3.23", - "phpVersion": "8.3" + "phpVersion": "8.4" } } },