From 00de215af3d2cc83b820aad45db1a30738c061bc Mon Sep 17 00:00:00 2001
From: Andreas Zweili <andreas@zweili.ch>
Date: Mon, 23 May 2022 10:59:36 +0200
Subject: [PATCH] Add snappymail to the docker-mailserver

---
 docker-mailserver/docker-compose.yml |  9 ++++++++
 rainloop/.env.j2                     |  5 -----
 rainloop/.gitignore                  |  4 ----
 rainloop/docker-compose.yml          | 31 ----------------------------
 4 files changed, 9 insertions(+), 40 deletions(-)
 delete mode 100644 rainloop/.env.j2
 delete mode 100644 rainloop/.gitignore
 delete mode 100644 rainloop/docker-compose.yml

diff --git a/docker-mailserver/docker-compose.yml b/docker-mailserver/docker-compose.yml
index 7212af7..8a0a642 100644
--- a/docker-mailserver/docker-compose.yml
+++ b/docker-mailserver/docker-compose.yml
@@ -23,6 +23,15 @@ services:
     restart: unless-stopped
     cap_add: ["NET_ADMIN", "SYS_PTRACE"]
 
+  snappymail:
+    image: fffrantz/snappymail:2.16.1
+    container_name: snappymail
+    ports:
+      - "8080:80"
+    restart: unless-stopped
+    depends_on:
+      - mail
+
 volumes:
   maildata:
     driver_opts:
diff --git a/rainloop/.env.j2 b/rainloop/.env.j2
deleted file mode 100644
index 24b53e8..0000000
--- a/rainloop/.env.j2
+++ /dev/null
@@ -1,5 +0,0 @@
-MYSQL_ROOT_PASSWORD=password
-MYSQL_PASSWORD=password
-MYSQL_DATABASE=rainloopdb
-MYSQL_USER=rainloop
-APP_DOMAIN=mail.zweili.org
diff --git a/rainloop/.gitignore b/rainloop/.gitignore
deleted file mode 100644
index bdce22b..0000000
--- a/rainloop/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-data/
-db/
-letsencrypt/
-.env
diff --git a/rainloop/docker-compose.yml b/rainloop/docker-compose.yml
deleted file mode 100644
index 50e7f1f..0000000
--- a/rainloop/docker-compose.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-version: "2"
-
-services:
-  rainloop:
-    image: hiloyt/rainloop
-    container_name: rainloop
-    volumes:
-      - rainloopdata:/rainloop/data
-    ports:
-      - "8080:80"
-    restart: unless-stopped
-    links:
-      - db:db
-
-  db:
-    image: mariadb
-    restart: unless-stopped
-    volumes:
-      - ./db:/var/lib/mysql
-    environment:
-      - MYSQL_ROOT_PASSWORD
-      - MYSQL_PASSWORD
-      - MYSQL_DATABASE
-      - MYSQL_USER
-
-volumes:
-  rainloopdata:
-    driver_opts:
-      type: "nfs"
-      o: "addr=10.7.89.108,nolock,hard,rw,vers=4.1"
-      device: ":/server_data/docker-mailserver/rainloopdata"