diff --git a/data/Dockerfiles/phpfpm/Dockerfile b/data/Dockerfiles/phpfpm/Dockerfile index 5d9817fbdf..22036b9b39 100644 --- a/data/Dockerfiles/phpfpm/Dockerfile +++ b/data/Dockerfiles/phpfpm/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.2-fpm-bookworm +FROM php:8.2-fpm-alpine3.18 LABEL maintainer "The Infrastructure Company GmbH " # renovate: datasource=github-tags depName=krakjoe/apcu versioning=semver-coerced extractVersion=^v(?.*)$ @@ -14,51 +14,54 @@ ARG REDIS_PECL_VERSION=6.0.2 # renovate: datasource=github-tags depName=composer/composer versioning=semver-coerced extractVersion=(?.*)$ ARG COMPOSER_VERSION=2.6.6 -RUN apt-get update && apt-get install --no-install-recommends -y \ - aspell \ - aspell-en \ - autoconf \ +RUN apk add -U --no-cache autoconf \ + aspell-dev \ + aspell-libs \ bash \ - default-mysql-client \ - dnsutils \ + c-client \ + cyrus-sasl-dev \ + freetype \ + freetype-dev \ g++ \ - gettext \ git \ + gettext \ + gettext-dev \ + gmp-dev \ gnupg \ + icu-dev \ + icu-libs \ imagemagick \ + imagemagick-dev \ + imap-dev \ jq \ - libc-client-dev \ - libc-client2007e \ - libfreetype6-dev \ - libgettextpo-dev \ - libgmp-dev \ - libicu-dev \ - libjpeg62-turbo-dev \ - libkrb5-3 \ - libkrb5-dev \ - libldap2-dev \ - libmagickcore-dev \ - libmagickwand-dev \ + libavif \ + libavif-dev \ + libjpeg-turbo \ + libjpeg-turbo-dev \ + libmemcached \ libmemcached-dev \ - libmemcached11 \ - libpcre3-dev \ + libpng \ libpng-dev \ - libpspell-dev \ - librsvg2-dev \ - libsasl2-dev \ - libssl-dev \ + libressl \ + libressl-dev \ + librsvg \ + libtool \ libwebp-dev \ libxml2-dev \ + libxpm \ libxpm-dev \ - libxpm4 \ + libzip \ libzip-dev \ - libzip4 \ + linux-headers \ make \ + mysql-client \ + openldap-dev \ + pcre-dev \ re2c \ - redis-tools \ - smbclient \ + redis \ + samba-client \ + zlib-dev \ tzdata \ - zlib1g-dev \ && pecl install APCu-${APCU_PECL_VERSION} \ && pecl install imagick-${IMAGICK_PECL_VERSION} \ && pecl install mailparse-${MAILPARSE_PECL_VERSION} \ @@ -68,37 +71,40 @@ RUN apt-get update && apt-get install --no-install-recommends -y \ && pecl clear-cache \ && docker-php-ext-configure intl \ && docker-php-ext-configure exif \ - && docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp --with-xpm \ + && docker-php-ext-configure gd --with-freetype=/usr/include/ \ + --with-jpeg=/usr/include/ \ + --with-webp \ + --with-xpm \ + --with-avif \ && docker-php-ext-install -j 4 exif gd gettext intl ldap opcache pcntl pdo pdo_mysql pspell soap sockets sysvsem zip bcmath gmp \ - && docker-php-ext-configure imap --with-imap --with-imap-ssl --with-kerberos \ - && docker-php-ext-install -j 4 imap \ + && docker-php-ext-configure imap --with-imap --with-imap-ssl \ + && docker-php-ext-install -j 4 imap \ && curl --silent --show-error https://getcomposer.org/installer | php -- --version=${COMPOSER_VERSION} \ && mv composer.phar /usr/local/bin/composer \ && chmod +x /usr/local/bin/composer \ - && apt-get purge -y --auto-remove \ - autoconf \ + && apk del --purge autoconf \ + aspell-dev \ + cyrus-sasl-dev \ + freetype-dev \ g++ \ - libc-client-dev \ - libfreetype6-dev \ - libgettextpo-dev \ - libicu-dev \ - libjpeg62-turbo-dev \ - libkrb5-dev \ - libldap2-dev \ - libmagickcore-dev \ - libmagickwand-dev \ + gettext-dev \ + icu-dev \ + imagemagick-dev \ + imap-dev \ + libavif-dev \ + libjpeg-turbo-dev \ libmemcached-dev \ - libpcre3-dev \ libpng-dev \ - libpspell-dev \ - libsasl2-dev \ - libssl-dev \ + libressl-dev \ libwebp-dev \ libxml2-dev \ libxpm-dev \ libzip-dev \ + linux-headers \ make \ - zlib1g-dev + openldap-dev \ + pcre-dev \ + zlib-dev COPY ./docker-entrypoint.sh / diff --git a/data/Dockerfiles/phpfpm/docker-entrypoint.sh b/data/Dockerfiles/phpfpm/docker-entrypoint.sh index 8f0f9984b2..e6c26fd198 100755 --- a/data/Dockerfiles/phpfpm/docker-entrypoint.sh +++ b/data/Dockerfiles/phpfpm/docker-entrypoint.sh @@ -198,10 +198,10 @@ fi [[ ! -f /web/css/build/0081-custom-mailcow.css ]] && echo '/* Autogenerated by mailcow */' > /web/css/build/0081-custom-mailcow.css # Fix permissions for global filters -chown -R 33:33 /global_sieve/* +chown -R 82:82 /global_sieve/* # Fix permissions on twig cache folder -chown -R 33:33 /web/templates/cache +chown -R 82:82 /web/templates/cache # Clear cache find /web/templates/cache/* -not -name '.gitkeep' -delete diff --git a/data/web/templates/debug.twig b/data/web/templates/debug.twig index f63ef1f1f7..867371177c 100644 --- a/data/web/templates/debug.twig +++ b/data/web/templates/debug.twig @@ -77,7 +77,7 @@ Version diff --git a/docker-compose.yml b/docker-compose.yml index 72f4cf5a25..ece85026e6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -110,7 +110,7 @@ services: - rspamd php-fpm-mailcow: - image: mailcow/phpfpm:1.89 + image: mailcow/phpfpm:1.87 command: "php-fpm -d date.timezone=${TZ} -d expose_php=0" depends_on: - redis-mailcow