Use PHP v8.4 in all main images

diff --git a/apache/Dockerfile b/apache/Dockerfile
index 398fe4546f8e40ac82cb5b4e2feb2d967c9f00cc..8b26484e055e8035197c99fdf81eef9934402dd5 100644 (file)
--- a/apache/Dockerfile
+++ b/apache/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.1-apache as root
+FROM php:8.4-apache AS root
 LABEL maintainer="Thomas Bruederli <thomas@roundcube.net>"
 LABEL org.opencontainers.image.source="https://github.com/roundcube/roundcubemail-docker"
 
@@ -45,6 +45,7 @@ RUN set -ex; \
 # Extract sources to avoid using pecl (https://github.com/docker-library/php/issues/374#issuecomment-690698974)
        pecl bundle -d /usr/src/php/ext imagick; \
        pecl bundle -d /usr/src/php/ext redis; \
+       pecl bundle -d /usr/src/php/ext pspell; \
        debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
        docker-php-ext-configure gd --with-jpeg --with-freetype; \
        docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch" --with-ldap-sasl; \

diff --git a/fpm-alpine/Dockerfile b/fpm-alpine/Dockerfile
index 7c295bc3f216d9382e1eb54351a8fc55c231b503..27ea745cb35b87f1e112c33da87fddaf224ee15c 100644 (file)
--- a/fpm-alpine/Dockerfile
+++ b/fpm-alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.1-fpm-alpine3.21 as root
+FROM php:8.4-fpm-alpine3.21 AS root
 LABEL maintainer="Thomas Bruederli <thomas@roundcube.net>"
 LABEL org.opencontainers.image.source="https://github.com/roundcube/roundcubemail-docker"
 
@@ -40,6 +40,7 @@ RUN set -ex; \
 # Extract sources to avoid using pecl (https://github.com/docker-library/php/issues/374#issuecomment-690698974)
        pecl bundle -d /usr/src/php/ext imagick; \
        pecl bundle -d /usr/src/php/ext redis; \
+       pecl bundle -d /usr/src/php/ext pspell; \
        docker-php-ext-configure gd --with-jpeg --with-freetype; \
        docker-php-ext-configure ldap --with-ldap-sasl; \
        docker-php-ext-install \

diff --git a/fpm/Dockerfile b/fpm/Dockerfile
index 7b0396254965a22c07ed6f0bfa46c64f59598c7b..686cb1dfd09f7c1029b44610f432e2944ba555e2 100644 (file)
--- a/fpm/Dockerfile
+++ b/fpm/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.1-fpm as root
+FROM php:8.4-fpm AS root
 LABEL maintainer="Thomas Bruederli <thomas@roundcube.net>"
 LABEL org.opencontainers.image.source="https://github.com/roundcube/roundcubemail-docker"
 
@@ -45,6 +45,7 @@ RUN set -ex; \
 # Extract sources to avoid using pecl (https://github.com/docker-library/php/issues/374#issuecomment-690698974)
        pecl bundle -d /usr/src/php/ext imagick; \
        pecl bundle -d /usr/src/php/ext redis; \
+       pecl bundle -d /usr/src/php/ext pspell; \
        debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
        docker-php-ext-configure gd --with-jpeg --with-freetype; \
        docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch" --with-ldap-sasl; \

diff --git a/templates/Dockerfile-alpine.templ b/templates/Dockerfile-alpine.templ
index bf2acabfc1cc3d1a5cd25a21e411966ee018aa99..51fd8097f12090bffdc9e63ef9ec25165eec2c15 100644 (file)
--- a/templates/Dockerfile-alpine.templ
+++ b/templates/Dockerfile-alpine.templ
@@ -1,4 +1,4 @@
-FROM php:8.1-%%VARIANT%%3.21 as root
+FROM php:8.4-%%VARIANT%%3.21 AS root
 LABEL maintainer="Thomas Bruederli <thomas@roundcube.net>"
 LABEL org.opencontainers.image.source="https://github.com/roundcube/roundcubemail-docker"
 
@@ -40,6 +40,7 @@ RUN set -ex; \
 # Extract sources to avoid using pecl (https://github.com/docker-library/php/issues/374#issuecomment-690698974)
        pecl bundle -d /usr/src/php/ext imagick; \
        pecl bundle -d /usr/src/php/ext redis; \
+       pecl bundle -d /usr/src/php/ext pspell; \
        docker-php-ext-configure gd --with-jpeg --with-freetype; \
        docker-php-ext-configure ldap --with-ldap-sasl; \
        docker-php-ext-install \

diff --git a/templates/Dockerfile-debian.templ b/templates/Dockerfile-debian.templ
index b232a5185ac175b0681fca409ceef61427b9f601..f3a588595be5f77e3edf79794f8d3c0eb02ebb8f 100644 (file)
--- a/templates/Dockerfile-debian.templ
+++ b/templates/Dockerfile-debian.templ
@@ -1,4 +1,4 @@
-FROM php:8.1-%%VARIANT%% as root
+FROM php:8.4-%%VARIANT%% AS root
 LABEL maintainer="Thomas Bruederli <thomas@roundcube.net>"
 LABEL org.opencontainers.image.source="https://github.com/roundcube/roundcubemail-docker"
 
@@ -45,6 +45,7 @@ RUN set -ex; \
 # Extract sources to avoid using pecl (https://github.com/docker-library/php/issues/374#issuecomment-690698974)
        pecl bundle -d /usr/src/php/ext imagick; \
        pecl bundle -d /usr/src/php/ext redis; \
+       pecl bundle -d /usr/src/php/ext pspell; \
        debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
        docker-php-ext-configure gd --with-jpeg --with-freetype; \
        docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch" --with-ldap-sasl; \