Andrey/Nextcloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add support for PHP 8.4

Browse Source 
Signed-off-by: Kowalski Dragon (kowalski7cc) <kowalski7cc@users.noreply.github.com>
This commit is contained in:
Kowalski Dragon (kowalski7cc) 2025-12-16 20:26:37 +01:00
parent 7e1fba34d7
commit 0b31710211
No known key found for this signature in database
GPG Key ID: C4E819BD2BC6233E
10 changed files with 35 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
31/apache/Dockerfile
View File

@ -47,7 +47,7 @@ RUN set -ex; \
\
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
docker-php-ext-configure ftp --with-openssl-dir=/usr; \
docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \
docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp --with-avif; \
docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
docker-php-ext-install -j "$(nproc)" \
bcmath \
@ -57,6 +57,7 @@ RUN set -ex; \
gmp \
intl \
ldap \
opcache \
pcntl \
pdo_mysql \
pdo_pgsql \

3
31/fpm-alpine/Dockerfile
View File

@ -43,7 +43,7 @@ RUN set -ex; \
; \
\
docker-php-ext-configure ftp --with-openssl-dir=/usr; \
docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \
docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp --with-avif; \
docker-php-ext-configure ldap; \
docker-php-ext-install -j "$(nproc)" \
bcmath \
@ -53,6 +53,7 @@ RUN set -ex; \
gmp \
intl \
ldap \
opcache \
pcntl \
pdo_mysql \
pdo_pgsql \

3
31/fpm/Dockerfile
View File

@ -47,7 +47,7 @@ RUN set -ex; \
\
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
docker-php-ext-configure ftp --with-openssl-dir=/usr; \
docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \
docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp --with-avif; \
docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
docker-php-ext-install -j "$(nproc)" \
bcmath \
@ -57,6 +57,7 @@ RUN set -ex; \
gmp \
intl \
ldap \
opcache \
pcntl \
pdo_mysql \
pdo_pgsql \

7
32/apache/Dockerfile
View File

@ -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,8 +46,8 @@ RUN set -ex; \
; \
\
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
docker-php-ext-configure ftp --with-openssl-dir=/usr; \
docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \
docker-php-ext-configure ftp --with-ftp-ssl; \
docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp --with-avif; \
docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
docker-php-ext-install -j "$(nproc)" \
bcmath \
@ -57,6 +57,7 @@ RUN set -ex; \
gmp \
intl \
ldap \
opcache \
pcntl \
pdo_mysql \
pdo_pgsql \

7
32/fpm-alpine/Dockerfile
View File

@ -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,8 +42,8 @@ RUN set -ex; \
postgresql-dev \
; \
\
docker-php-ext-configure ftp --with-openssl-dir=/usr; \
docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \
docker-php-ext-configure ftp --with-ftp-ssl; \
docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp --with-avif; \
docker-php-ext-configure ldap; \
docker-php-ext-install -j "$(nproc)" \
bcmath \
@ -53,6 +53,7 @@ RUN set -ex; \
gmp \
intl \
ldap \
opcache \
pcntl \
pdo_mysql \
pdo_pgsql \

7
32/fpm/Dockerfile
View File

@ -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,8 +46,8 @@ RUN set -ex; \
; \
\
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
docker-php-ext-configure ftp --with-openssl-dir=/usr; \
docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \
docker-php-ext-configure ftp --with-ftp-ssl; \
docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp --with-avif; \
docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
docker-php-ext-install -j "$(nproc)" \
bcmath \
@ -57,6 +57,7 @@ RUN set -ex; \
gmp \
intl \
ldap \
opcache \
pcntl \
pdo_mysql \
pdo_pgsql \

5
Dockerfile-alpine.template
View File

@ -41,8 +41,8 @@ RUN set -ex; \
postgresql-dev \
; \
\
docker-php-ext-configure ftp --with-openssl-dir=/usr; \
docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \
docker-php-ext-configure ftp %%FTP_OPTIONS%%; \
docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp --with-avif; \
docker-php-ext-configure ldap; \
docker-php-ext-install -j "$(nproc)" \
bcmath \
@ -52,6 +52,7 @@ RUN set -ex; \
gmp \
intl \
ldap \
opcache \
pcntl \
pdo_mysql \
pdo_pgsql \

5
Dockerfile-debian.template
View File

@ -45,8 +45,8 @@ RUN set -ex; \
; \
\
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
docker-php-ext-configure ftp --with-openssl-dir=/usr; \
docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \
docker-php-ext-configure ftp %%FTP_OPTIONS%%; \
docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp --with-avif; \
docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
docker-php-ext-install -j "$(nproc)" \
bcmath \
@ -56,6 +56,7 @@ RUN set -ex; \
gmp \
intl \
ldap \
opcache \
pcntl \
pdo_mysql \
pdo_pgsql \

8
update.sh
View File

@ -11,6 +11,12 @@ declare -A debian_version=(
declare -A php_version=(
[default]='8.3'
[32]='8.4'
)
declare -A ftp_options=(
[default]='--with-openssl-dir=/usr'
[8.4]='--with-ftp-ssl'
)
declare -A cmd=(
@ -107,6 +113,7 @@ function create_variant() {
debianVersion=${debian_version[$version]-${debian_version[default]}}
phpVersion=${php_version[$version]-${php_version[default]}}
crontabInt=${crontab_int[$version]-${crontab_int[default]}}
ftp_options=${ftp_options[$phpVersion]-${ftp_options[default]}}
url="https://github.com/nextcloud-releases/server/releases/download/v$fullversion/nextcloud-$fullversion.tar.bz2"
ascUrl="https://github.com/nextcloud-releases/server/releases/download/v$fullversion/nextcloud-$fullversion.tar.bz2.asc"
@ -132,6 +139,7 @@ function create_variant() {
s|%%VARIANT_EXTRAS%%|'"${extras[$variant]}"'|g;
s/%%APCU_VERSION%%/'"${pecl_versions[APCu]}"'/g;
s/%%IGBINARY_VERSION%%/'"${pecl_versions[igbinary]}"'/g;
s|%%FTP_OPTIONS%%|'"$ftp_options"'|g;
s/%%IMAGICK_VERSION%%/'"${pecl_versions[imagick]}"'/g;
s/%%MEMCACHED_VERSION%%/'"${pecl_versions[memcached]}"'/g;
s/%%REDIS_VERSION%%/'"${pecl_versions[redis]}"'/g;

6
versions.json
View File

@ -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"
}
}
},