From 62f83e1e4abaf855a85082e8203dd3fbdebd1329 Mon Sep 17 00:00:00 2001
From: thopic <thopic@gnous.fr>
Date: Wed, 14 Dec 2022 16:30:11 +0100
Subject: [PATCH] [RC] Switch to roundcubeorg/roundcubemail image (still on
 1.6.0)

---
 roundcube/Dockerfile         | 14 +++++++-------
 roundcube/docker-compose.yml |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/roundcube/Dockerfile b/roundcube/Dockerfile
index 39cce9d..b5a225d 100644
--- a/roundcube/Dockerfile
+++ b/roundcube/Dockerfile
@@ -1,4 +1,4 @@
-FROM roundcube/roundcubemail:1.6.0-apache
+FROM roundcubeorg/roundcubemail:latest-apache
 
 RUN a2enmod remoteip; \
     echo "RemoteIPHeader X-Forwarded-For" > /etc/apache2/conf-available/remoteip.conf; \
@@ -14,14 +14,14 @@ RUN set -ex; \
         git \
     ; \
     \
-    curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer; \
-    mv /usr/src/roundcubemail/composer.json-dist /usr/src/roundcubemail/composer.json; \
-    \
     composer \
         --working-dir=/usr/src/roundcubemail/ \
-        --prefer-dist --prefer-stable \
-        --update-no-dev --no-interaction \
-        --optimize-autoloader --apcu-autoloader \
+        --prefer-dist \
+        --prefer-stable \
+        --update-no-dev \
+        --no-interaction \
+        --optimize-autoloader \
+        --apcu-autoloader \
         require \
             roundcube/carddav \
     ; \
diff --git a/roundcube/docker-compose.yml b/roundcube/docker-compose.yml
index 02eea38..fa5ea89 100644
--- a/roundcube/docker-compose.yml
+++ b/roundcube/docker-compose.yml
@@ -3,7 +3,7 @@ version: "3.8"
 services:
   app:
     build: .
-    image: my_roundcube:1.6.0
+    image: my_roundcube:latest
     restart: unless-stopped
     depends_on:
       - db