Skip to content

Add support for PHP 8.4 for Nextcloud 32 #2513

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kowalski7cc wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add support for PHP 8.4 for Nextcloud 32 #2513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion 31/apache/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -57,6 +57,7 @@ RUN set -ex; \
gmp \
intl \
ldap \
opcache \
pcntl \
pdo_mysql \
pdo_pgsql \
Expand Down
3 changes: 2 additions & 1 deletion 31/fpm-alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -53,6 +53,7 @@ RUN set -ex; \
gmp \
intl \
ldap \
opcache \
pcntl \
pdo_mysql \
pdo_pgsql \
Expand Down
3 changes: 2 additions & 1 deletion 31/fpm/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -57,6 +57,7 @@ RUN set -ex; \
gmp \
intl \
ldap \
opcache \
pcntl \
pdo_mysql \
pdo_pgsql \
Expand Down
7 changes: 4 additions & 3 deletions 32/apache/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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; \
Expand Down Expand Up @@ -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 \
Expand All @@ -57,6 +57,7 @@ RUN set -ex; \
gmp \
intl \
ldap \
opcache \
pcntl \
pdo_mysql \
pdo_pgsql \
Expand Down
7 changes: 4 additions & 3 deletions 32/fpm-alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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; \
Expand Down Expand Up @@ -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 \
Expand All @@ -53,6 +53,7 @@ RUN set -ex; \
gmp \
intl \
ldap \
opcache \
pcntl \
pdo_mysql \
pdo_pgsql \
Expand Down
7 changes: 4 additions & 3 deletions 32/fpm/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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; \
Expand Down Expand Up @@ -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 \
Expand All @@ -57,6 +57,7 @@ RUN set -ex; \
gmp \
intl \
ldap \
opcache \
pcntl \
pdo_mysql \
pdo_pgsql \
Expand Down
5 changes: 3 additions & 2 deletions Dockerfile-alpine.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -52,6 +52,7 @@ RUN set -ex; \
gmp \
intl \
ldap \
opcache \
pcntl \
pdo_mysql \
pdo_pgsql \
Expand Down
5 changes: 3 additions & 2 deletions Dockerfile-debian.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -56,6 +56,7 @@ RUN set -ex; \
gmp \
intl \
ldap \
opcache \
pcntl \
pdo_mysql \
pdo_pgsql \
Expand Down
8 changes: 8 additions & 0 deletions update.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=(
Expand Down Expand Up @@ -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"

Expand All @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions versions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
},
Expand Down
Loading