Skip to content
Merged

PHP 8.5 #2580

Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion 32/apache/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ RUN set -ex; \
\
# pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.28; \
pecl install igbinary-3.2.16; \
pecl install igbinary-3.2.17RC1; \

@zc-devs zc-devs Jun 15, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe stable version should use stable dependencies (also 33).

pecl install imagick-3.8.1; \
pecl install --configureoptions 'enable-memcached-igbinary="yes"' \
memcached-3.4.0; \
Expand Down
2 changes: 1 addition & 1 deletion 32/fpm-alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ RUN set -ex; \
\
# pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.28; \
pecl install igbinary-3.2.16; \
pecl install igbinary-3.2.17RC1; \
pecl install imagick-3.8.1; \
pecl install --configureoptions 'enable-memcached-igbinary="yes"' \
memcached-3.4.0; \
Expand Down
2 changes: 1 addition & 1 deletion 32/fpm/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ RUN set -ex; \
\
# pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.28; \
pecl install igbinary-3.2.16; \
pecl install igbinary-3.2.17RC1; \
pecl install imagick-3.8.1; \
pecl install --configureoptions 'enable-memcached-igbinary="yes"' \
memcached-3.4.0; \
Expand Down
2 changes: 1 addition & 1 deletion 33/apache/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ RUN set -ex; \
\
# pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.28; \
pecl install igbinary-3.2.16; \
pecl install igbinary-3.2.17RC1; \
pecl install imagick-3.8.1; \
pecl install --configureoptions 'enable-memcached-igbinary="yes"' \
memcached-3.4.0; \
Expand Down
2 changes: 1 addition & 1 deletion 33/fpm-alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ RUN set -ex; \
\
# pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.28; \
pecl install igbinary-3.2.16; \
pecl install igbinary-3.2.17RC1; \
pecl install imagick-3.8.1; \
pecl install --configureoptions 'enable-memcached-igbinary="yes"' \
memcached-3.4.0; \
Expand Down
2 changes: 1 addition & 1 deletion 33/fpm/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ RUN set -ex; \
\
# pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.28; \
pecl install igbinary-3.2.16; \
pecl install igbinary-3.2.17RC1; \
pecl install imagick-3.8.1; \
pecl install --configureoptions 'enable-memcached-igbinary="yes"' \
memcached-3.4.0; \
Expand Down
4 changes: 2 additions & 2 deletions 34/apache/Dockerfile
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.4-apache-trixie
FROM php:8.5-apache-trixie

# entrypoint.sh and cron.sh dependencies
RUN set -ex; \
Expand Down Expand Up @@ -66,7 +66,7 @@ RUN set -ex; \
\
# pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.28; \
pecl install igbinary-3.2.16; \
pecl install igbinary-3.2.17RC1; \
pecl install imagick-3.8.1; \
pecl install --configureoptions 'enable-memcached-igbinary="yes"' \
memcached-3.4.0; \
Expand Down
4 changes: 2 additions & 2 deletions 34/fpm-alpine/Dockerfile
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.4-fpm-alpine3.24
FROM php:8.5-fpm-alpine3.24

# entrypoint.sh and cron.sh dependencies
RUN set -ex; \
Expand Down Expand Up @@ -62,7 +62,7 @@ RUN set -ex; \
\
# pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.28; \
pecl install igbinary-3.2.16; \
pecl install igbinary-3.2.17RC1; \
pecl install imagick-3.8.1; \
pecl install --configureoptions 'enable-memcached-igbinary="yes"' \
memcached-3.4.0; \
Expand Down
4 changes: 2 additions & 2 deletions 34/fpm/Dockerfile
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.4-fpm-trixie
FROM php:8.5-fpm-trixie

# entrypoint.sh and cron.sh dependencies
RUN set -ex; \
Expand Down Expand Up @@ -66,7 +66,7 @@ RUN set -ex; \
\
# pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.28; \
pecl install igbinary-3.2.16; \
pecl install igbinary-3.2.17RC1; \
pecl install imagick-3.8.1; \
pecl install --configureoptions 'enable-memcached-igbinary="yes"' \
memcached-3.4.0; \
Expand Down
7 changes: 5 additions & 2 deletions update.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ declare -A debian_version=(

declare -A php_version=(
[32]='8.3'
[default]='8.4'
[33]='8.4'
[default]='8.5'
)

declare -A ftp_options=(
Expand Down Expand Up @@ -88,7 +89,9 @@ redis_version="$(

declare -A pecl_versions=(
[APCu]="$apcu_version"
[igbinary]="$igbinary_version"
# https://github.com/nextcloud/docker/issues/2578
#[igbinary]="$igbinary_version"
[igbinary]="3.2.17RC1"
[imagick]="$imagick_version"
[memcached]="$memcached_version"
[redis]="$redis_version"
Expand Down
6 changes: 3 additions & 3 deletions versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,19 @@
"variant": "apache",
"base": "debian",
"baseVersion": "trixie",
"phpVersion": "8.4"
"phpVersion": "8.5"
},
"fpm": {
"variant": "fpm",
"base": "debian",
"baseVersion": "trixie",
"phpVersion": "8.4"
"phpVersion": "8.5"
},
"fpm-alpine": {
"variant": "fpm-alpine",
"base": "alpine",
"baseVersion": "3.24",
"phpVersion": "8.4"
"phpVersion": "8.5"
}
}
},
Expand Down
Loading