From d2b76d1b11a900f2bd749b1630d2ddf4cc15ec0d Mon Sep 17 00:00:00 2001
From: Davide Polonio <poloniodavide@gmail.com>
Date: Tue, 14 Jul 2020 09:55:23 +0000
Subject: [PATCH] Add roundcube

---
 .gitignore                        |  2 +-
 mail/docker-compose.yml           | 33 +++++++++++++++++++++++++++++--
 reverse_proxy/docker-compose.yaml | 22 ++++++++++-----------
 3 files changed, 43 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index e4b4a85..217576d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-env-mailserver
+env-*
 config/
 .env
diff --git a/mail/docker-compose.yml b/mail/docker-compose.yml
index a691d25..3e31a3b 100644
--- a/mail/docker-compose.yml
+++ b/mail/docker-compose.yml
@@ -1,10 +1,11 @@
-version: '2'
+version: '3.7'
 services:
   mail:
-    image: tvial/docker-mailserver:latest
+    image: tvial/docker-mailserver:release-v7.0.0
     hostname: ${HOSTNAME}
     domainname: ${DOMAINNAME}
     container_name: ${CONTAINER_NAME}
+    restart: always
     ports:
       - "25:25"
       - "143:143"
@@ -22,7 +23,30 @@ services:
     cap_add:
       - NET_ADMIN
       - SYS_PTRACE
+    networks:
+      - internal
+
+  roundcubedb:
+    image: postgres:9.6-alpine
     restart: always
+    env_file:
+      - .env
+      - env-roundcube
+    networks:
+      - internal
+
+  roundcube:
+    image: roundcube/roundcubemail:1.4.7-apache
+    restart: always
+    depends_on:
+      - mail
+      - roundcubedb
+    env_file:
+      - .env
+      - env-roundcube
+    networks:
+      - proxy
+      - internal
 
 volumes:
   maildata:
@@ -49,3 +73,8 @@ volumes:
       type: none
       o: bind
       device: "/srv/docker/reverse_proxy/certs/mail.poldebra.me"
+
+networks:
+  proxy:
+    external: true
+  internal:
diff --git a/reverse_proxy/docker-compose.yaml b/reverse_proxy/docker-compose.yaml
index aaf3f19..25c72c7 100644
--- a/reverse_proxy/docker-compose.yaml
+++ b/reverse_proxy/docker-compose.yaml
@@ -27,17 +27,17 @@ services:
     networks:
       - proxy
 
-  web:
-    image: nginx
-    environment:
-     - NGINX_HOST=mail.poldebra.me
-     - NGINX_PORT=80
-     - VIRTUAL_HOST=mail.poldebra.me
-     - VIRTUAL_PORT=80
-     - LETSENCRYPT_HOST=mail.poldebra.me
-     - LETSENCRYPT_EMAIL=poloniodavide@gmail.com
-    networks:
-      - proxy
+#  web:
+#    image: nginx
+#    environment:
+#     - NGINX_HOST=mail.poldebra.me
+#     - NGINX_PORT=80
+#     - VIRTUAL_HOST=mail.poldebra.me
+#     - VIRTUAL_PORT=80
+#     - LETSENCRYPT_HOST=mail.poldebra.me
+#     - LETSENCRYPT_EMAIL=poloniodavide@gmail.com
+#    networks:
+#      - proxy
 
 volumes:
   nginx_cert: