From 4dd1b97e386a6f464396c41f56e0f4b3077adade Mon Sep 17 00:00:00 2001 From: DerLinkman Date: Sun, 6 Nov 2022 15:52:30 +0100 Subject: [PATCH 1/4] [PHP] Update to 8.1 --- data/Dockerfiles/phpfpm/Dockerfile | 2 +- docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/Dockerfiles/phpfpm/Dockerfile b/data/Dockerfiles/phpfpm/Dockerfile index 74035c02..5360840a 100644 --- a/data/Dockerfiles/phpfpm/Dockerfile +++ b/data/Dockerfiles/phpfpm/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.0-fpm-alpine3.16 +FROM php:8.1-fpm-alpine3.16 LABEL maintainer "Andre Peters " ENV APCU_PECL 5.1.21 diff --git a/docker-compose.yml b/docker-compose.yml index 05d5d83b..02f92c3f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -106,7 +106,7 @@ services: - rspamd php-fpm-mailcow: - image: mailcow/phpfpm:1.79 + image: mailcow/phpfpm:1.80 command: "php-fpm -d date.timezone=${TZ} -d expose_php=0" depends_on: - redis-mailcow From df17e6b75e3ba3d6993932eff52e972406e60815 Mon Sep 17 00:00:00 2001 From: Nathaniel Mom Date: Sun, 6 Nov 2022 23:12:14 +1000 Subject: [PATCH 2/4] change 'return 1' to 'exit 1' --- helper-scripts/update_compose.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helper-scripts/update_compose.sh b/helper-scripts/update_compose.sh index c58eabea..16769edc 100755 --- a/helper-scripts/update_compose.sh +++ b/helper-scripts/update_compose.sh @@ -50,7 +50,7 @@ echo -e "\e[32mTrying to determine GLIBC version...\e[0m" exit 0 else echo -e "\e[33mWARNING: $COMPOSE_PATH is not writable, but new version $LATEST_COMPOSE is available (installed: $COMPOSE_VERSION)\e[0m" - return 1 + exit 1 fi fi else From bc937ed2db47516fb68a4619fb14a14fbbad5368 Mon Sep 17 00:00:00 2001 From: Michael Cramer Date: Tue, 8 Nov 2022 09:45:25 +0100 Subject: [PATCH 3/4] [PHP] Polish dockerfile includes also #4839 because of --with-avif for gd configure command (is not available in 8.0) contains the following adjustments: - upgrade APCu to 5.1.22 - use PECL package for mailparse instead of git clone (3.1.4 is the latest one available and sice then no changes on master branch) - split PECL commands into separate ones (according to https://hub.docker.com/_/php this is the recommended way) - add missing configure options for gd extension to include webp, xpm and avif - specify composer version to be installed - cleanup more dev dependencies --- data/Dockerfiles/phpfpm/Dockerfile | 34 +++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/data/Dockerfiles/phpfpm/Dockerfile b/data/Dockerfiles/phpfpm/Dockerfile index 5360840a..38c68f70 100644 --- a/data/Dockerfiles/phpfpm/Dockerfile +++ b/data/Dockerfiles/phpfpm/Dockerfile @@ -1,12 +1,12 @@ FROM php:8.1-fpm-alpine3.16 LABEL maintainer "Andre Peters " -ENV APCU_PECL 5.1.21 +ENV APCU_PECL 5.1.22 ENV IMAGICK_PECL 3.7.0 -# Mailparse is pulled from master branch -#ENV MAILPARSE_PECL 3.0.2 +ENV MAILPARSE_PECL 3.1.4 ENV MEMCACHED_PECL 3.2.0 ENV REDIS_PECL 5.3.7 +ENV COMPOSER 2.4.4 RUN apk add -U --no-cache autoconf \ aspell-dev \ @@ -18,6 +18,7 @@ RUN apk add -U --no-cache autoconf \ freetype-dev \ g++ \ git \ + gettext \ gettext-dev \ gmp-dev \ gnupg \ @@ -27,8 +28,11 @@ RUN apk add -U --no-cache autoconf \ imagemagick-dev \ imap-dev \ jq \ + libavif \ + libavif-dev \ libjpeg-turbo \ libjpeg-turbo-dev \ + libmemcached \ libmemcached-dev \ libpng \ libpng-dev \ @@ -38,7 +42,9 @@ RUN apk add -U --no-cache autoconf \ libtool \ libwebp-dev \ libxml2-dev \ + libxpm \ libxpm-dev \ + libzip \ libzip-dev \ make \ mysql-client \ @@ -49,22 +55,24 @@ RUN apk add -U --no-cache autoconf \ samba-client \ zlib-dev \ tzdata \ - && git clone https://github.com/php/pecl-mail-mailparse \ - && cd pecl-mail-mailparse \ - && pecl install package.xml \ - && cd .. \ - && rm -r pecl-mail-mailparse \ - && pecl install redis-${REDIS_PECL} memcached-${MEMCACHED_PECL} APCu-${APCU_PECL} imagick-${IMAGICK_PECL} \ + && pecl install mailparse-${MAILPARSE_PECL} \ + && pecl install redis-${REDIS_PECL} \ + && pecl install memcached-${MEMCACHED_PECL} \ + && pecl install APCu-${APCU_PECL} \ + && pecl install imagick-${IMAGICK_PECL} \ && docker-php-ext-enable apcu imagick memcached mailparse redis \ && pecl clear-cache \ && docker-php-ext-configure intl \ && docker-php-ext-configure exif \ && 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 zip bcmath gmp \ && 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 \ + && curl --silent --show-error https://getcomposer.org/installer | php -- --version=${COMPOSER} \ && mv composer.phar /usr/local/bin/composer \ && chmod +x /usr/local/bin/composer \ && apk del --purge autoconf \ @@ -72,15 +80,21 @@ RUN apk add -U --no-cache autoconf \ cyrus-sasl-dev \ freetype-dev \ g++ \ + gettext-dev \ icu-dev \ imagemagick-dev \ imap-dev \ + libavif-dev \ libjpeg-turbo-dev \ + libmemcached-dev \ libpng-dev \ libressl-dev \ libwebp-dev \ libxml2-dev \ + libxpm-dev \ + libzip-dev \ make \ + openldap-dev \ pcre-dev \ zlib-dev From f2f5e212f5c725c56b4703e5a45b85efe99a540d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20S?= Date: Wed, 23 Nov 2022 22:10:57 +0900 Subject: [PATCH 4/4] Fixy comment typo --- .../HAPROXY/docker-compose.override.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helper-scripts/docker-compose.override.yml.d/HAPROXY/docker-compose.override.yml b/helper-scripts/docker-compose.override.yml.d/HAPROXY/docker-compose.override.yml index 21d391b8..5009f4c9 100644 --- a/helper-scripts/docker-compose.override.yml.d/HAPROXY/docker-compose.override.yml +++ b/helper-scripts/docker-compose.override.yml.d/HAPROXY/docker-compose.override.yml @@ -1,6 +1,6 @@ ## ## Set haproxy_trusted_networks in Dovecots extra.conf! -#รค +## version: '2.1' services: