From f7d0e4533d819384586f14cb6b8759b34074a449 Mon Sep 17 00:00:00 2001
From: Kevin Veen-Birkenbach <kevin@veen.world>
Date: Mon, 28 Dec 2020 19:09:20 +0100
Subject: [PATCH] Updated mailu from 1.7 to 1.8

---
 roles/docker-mailu/Readme.md                  |  4 ++--
 .../templates/docker-compose.yml.j2           | 19 ++++++++++---------
 roles/docker-mailu/templates/mailu.env.j2     |  5 +++++
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/roles/docker-mailu/Readme.md b/roles/docker-mailu/Readme.md
index 1d2982eb..5fde078d 100644
--- a/roles/docker-mailu/Readme.md
+++ b/roles/docker-mailu/Readme.md
@@ -3,10 +3,10 @@
 ## setup
 
 ### volumes
-To delete all volumes execute:
+To delete all volumes and data execute:
 
 ```bash
-  docker volume rm $(docker volume ls -q | grep mailu_)
+  rm -vr /mailu/; docker volume rm $(docker volume ls -q | grep mailu_)
 ```
 Be careful!
 
diff --git a/roles/docker-mailu/templates/docker-compose.yml.j2 b/roles/docker-mailu/templates/docker-compose.yml.j2
index f16072b1..bc7d1a83 100644
--- a/roles/docker-mailu/templates/docker-compose.yml.j2
+++ b/roles/docker-mailu/templates/docker-compose.yml.j2
@@ -21,7 +21,7 @@ services:
 
   # Core services
   front:
-    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}nginx:${MAILU_VERSION:-1.7}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}nginx:${MAILU_VERSION:-1.8}
     restart: always
     env_file: mailu.env
     logging:
@@ -41,7 +41,7 @@ services:
       - "/mailu/overrides/nginx:/overrides"
 
   admin:
-    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}admin:${MAILU_VERSION:-1.7}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}admin:${MAILU_VERSION:-1.8}
     restart: always
     env_file: mailu.env
     volumes:
@@ -51,7 +51,7 @@ services:
       - redis
 
   imap:
-    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}dovecot:${MAILU_VERSION:-1.7}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}dovecot:${MAILU_VERSION:-1.8}
     restart: always
     env_file: mailu.env
     volumes:
@@ -61,7 +61,7 @@ services:
       - front
 
   smtp:
-    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}postfix:${MAILU_VERSION:-1.7}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}postfix:${MAILU_VERSION:-1.8}
     restart: always
     env_file: mailu.env
     volumes:
@@ -70,7 +70,7 @@ services:
       - front
 
   antispam:
-    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}rspamd:${MAILU_VERSION:-1.7}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}rspamd:${MAILU_VERSION:-1.8}
     restart: always
     env_file: mailu.env
     volumes:
@@ -82,33 +82,34 @@ services:
 
   # Optional services
   antivirus:
-    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}clamav:${MAILU_VERSION:-1.7}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}clamav:${MAILU_VERSION:-1.8}
     restart: always
     env_file: mailu.env
     volumes:
       - "/mailu/filter:/data"
 
   webdav:
-    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}radicale:${MAILU_VERSION:-1.7}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}radicale:${MAILU_VERSION:-1.8}
     restart: always
     env_file: mailu.env
     volumes:
       - "/mailu/dav:/data"
 
   fetchmail:
-    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}fetchmail:${MAILU_VERSION:-1.7}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}fetchmail:${MAILU_VERSION:-1.8}
     restart: always
     env_file: mailu.env
 
   # Webmail
   webmail:
-    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}roundcube:${MAILU_VERSION:-1.7}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}roundcube:${MAILU_VERSION:-1.8}
     restart: always
     env_file: mailu.env
     volumes:
       - "/mailu/webmail:/data"
     depends_on:
       - imap
+      - database
 volumes:
   database:
 networks:
diff --git a/roles/docker-mailu/templates/mailu.env.j2 b/roles/docker-mailu/templates/mailu.env.j2
index 5f70f268..5e16c346 100644
--- a/roles/docker-mailu/templates/mailu.env.j2
+++ b/roles/docker-mailu/templates/mailu.env.j2
@@ -144,3 +144,8 @@ DB_USER=mailu
 DB_PW={{mailu_database_password}}
 DB_HOST=database:3306
 DB_NAME=mailu
+ROUNDCUBE_DB_FLAVOR=mysql
+ROUNDCUBE_DB_USER=mailu
+ROUNDCUBE_DB_PW={{mailu_database_password}}
+ROUNDCUBE_DB_NAME=mailu
+ROUNDCUBE_DB_HOST=database:3306