From cf19e450e0beb6695872d4114049a24d5b0dc095 Mon Sep 17 00:00:00 2001
From: thopic <thopic@gnous.fr>
Date: Sun, 1 Nov 2026 21:44:29 +0100
Subject: [PATCH] [RC] Bump to 1.7.5

---
 roundcube/Dockerfile         | 32 --------------------------------
 roundcube/docker-compose.yml |  8 +++-----
 2 files changed, 3 insertions(+), 37 deletions(-)
 delete mode 100644 roundcube/Dockerfile

diff --git a/roundcube/Dockerfile b/roundcube/Dockerfile
deleted file mode 100644
index 70098d4..0000000
--- a/roundcube/Dockerfile
+++ /dev/null
@@ -1,32 +0,0 @@
-FROM roundcube/roundcubemail:1.6.6-apache
-
-RUN a2enmod remoteip; \
-    echo "RemoteIPHeader X-Forwarded-For" > /etc/apache2/conf-available/remoteip.conf; \
-    a2enconf remoteip; \
-    sed -i -r 's/^ServerTokens .*/ServerTokens Prod/g' /etc/apache2/conf-available/security.conf; \
-    sed -i -r 's/^ServerSignature .*/ServerSignature Off/g' /etc/apache2/conf-available/security.conf; \
-    sed -i -E 's/^LogFormat "%h(.*)/LogFormat "%a\1/g' /etc/apache2/apache2.conf; \
-    echo "expose_php = Off" > /usr/local/etc/php/conf.d/php_version.ini;
-
-RUN set -ex; \
-    apt-get update; \
-    apt-get install -y --no-install-recommends \
-        git \
-    ; \
-    \
-    composer \
-        --working-dir=/usr/src/roundcubemail/ \
-        --prefer-dist \
-        --prefer-stable \
-        --update-no-dev \
-        --no-interaction \
-        --optimize-autoloader \
-        --apcu-autoloader \
-        require \
-            roundcube/carddav \
-    ;
-
-RUN mkdir -p /etc/enigma/gnupg \
- && chown www-data:www-data /etc/enigma/gnupg \
- && cp /usr/src/roundcubemail/plugins/enigma/config.inc.php.dist /usr/src/roundcubemail/plugins/enigma/config.inc.php \
- && echo "\$config['enigma_pgp_homedir'] = '/etc/enigma/gnupg';" >> /usr/src/roundcubemail/plugins/enigma/config.inc.php
diff --git a/roundcube/docker-compose.yml b/roundcube/docker-compose.yml
index 62d1e49..34b8590 100644
--- a/roundcube/docker-compose.yml
+++ b/roundcube/docker-compose.yml
@@ -1,9 +1,6 @@
-version: "3.8"
-
 services:
   app:
-    build: .
-    image: my_roundcube:1.6.6
+    image: roundcube/roundcubemail:1.7.5-apache
     restart: unless-stopped
     depends_on:
       - db
@@ -17,6 +14,7 @@ services:
       - ROUNDCUBEMAIL_SMTP_SERVER=ssl://${MAIL_SERVER}
       - ROUNDCUBEMAIL_SMTP_PORT=465
       - ROUNDCUBEMAIL_DEFAULT_PORT=993
+      - ROUNDCUBEMAIL_COMPOSER_PLUGINS=roundcube/carddav
       - ROUNDCUBEMAIL_PLUGINS=archive, zipdownload, enigma, carddav
     networks:
       - default
@@ -30,7 +28,7 @@ services:
       - "co.elastic.logs/fileset=access"
 
   db:
-    image: mariadb:10.5
+    image: mariadb:10.11
     restart: unless-stopped
     volumes:
       - ${DATA_PATH}/db:/var/lib/mysql