From: Pablo Zmdl Date: Tue, 10 Jun 2025 12:49:17 +0000 (+0200) Subject: Use PHP v8.4 in all main images X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=457d3b02f3988fec5d5aaa8ff81ffdab0c3e6ed5;p=roundcube-roundcubemail-docker.git Use PHP v8.4 in all main images --- diff --git a/apache/Dockerfile b/apache/Dockerfile index 398fe45..8b26484 100644 --- 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 " 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 7c295bc..27ea745 100644 --- 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 " 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 7b03962..686cb1d 100644 --- 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 " 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 bf2acab..51fd809 100644 --- 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 " 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 b232a51..f3a5885 100644 --- 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 " 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; \