From 31f0a7f579a6d396fd27961bc106d8baaa7d37e3 Mon Sep 17 00:00:00 2001
From: andreas <baloand@gmail.com>
Date: Sat, 11 Feb 2023 23:02:40 +0000
Subject: [PATCH] restarted work

---
 docker-compose.yml        | 27 +++++++++++++++++++++++++++
 mysql/docker-compose.yml  | 22 ----------------------
 webapp/build.sh           |  2 +-
 webapp/docker-compose.yml | 27 ---------------------------
 4 files changed, 28 insertions(+), 50 deletions(-)
 create mode 100644 docker-compose.yml
 delete mode 100644 mysql/docker-compose.yml
 delete mode 100644 webapp/docker-compose.yml

diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..31170f1
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,27 @@
+version: '3'
+services:
+  core:
+    image: kopano
+  postfix:
+    image: postfix
+    volumes:
+      - spool:/var/spool/postfix
+  webapp:
+    image: webapp
+    labels:
+      - traefik.enable=true
+      - traefik.http.routers.webapp.rule=Host(`$MAIL_DOMAIN`)
+      - traefik.http.routers.webapp.tls=true
+      - traefik.http.routers.webapp.tls.certResolver=default
+    volumes:
+      - z-push:/var/lib/z-push
+  db:
+    image: mysql
+    restart: unless-stopped
+    volumes:
+      - database:/var/lib/mysql
+volumes:
+  - attachments:
+  - database:
+  - z-push:
+  - spool:
diff --git a/mysql/docker-compose.yml b/mysql/docker-compose.yml
deleted file mode 100644
index d5ed3c7..0000000
--- a/mysql/docker-compose.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-version: '3'
-services:
-  db:
-    image: mysql:latest
-    container_name: mysql
-    restart: always
-    environment:
-      MYSQL_ROOT_PASSWORD: Asdf2345
-    ports:
-      - 3307:3306
-    networks:
-      - kopano
-    volumes:
-      - ~/kopano/mysql/etc:/etc/mysql
-      - database:/var/lib/mysql
-secrets:
-   db_root_password:
-     file: db_root_password.txt
-networks:
-  - kopano
-volumes:
-  - database:
diff --git a/webapp/build.sh b/webapp/build.sh
index 4027c44..0358095 100644
--- a/webapp/build.sh
+++ b/webapp/build.sh
@@ -4,7 +4,7 @@ docker run -d --name apache -p80:80 -v/root/kopano/dist:/var/www httpd
 # export DOCKER_BUILDKIT=1
 docker build -t webapp .
 # docker tag -t webapp:latest ...
-docker run --rm -it --name webapp -d MAIL_DOMAIN=zntrl.de -v/root/kopano/webapp/etc/apache2:/etc/apache2 -v/root/kopano/webapp/etc/ssl:/etc/ssl webapp 
+docker run --rm -it --name webapp -e "MAIL_DOMAIN=zntrl.de" -v/root/kopano/webapp/etc/apache2:/etc/apache2 -v/root/kopano/webapp/etc/ssl:/etc/ssl webapp 
 docker logs -f webapp
 docker exec -it webapp bash
 
diff --git a/webapp/docker-compose.yml b/webapp/docker-compose.yml
deleted file mode 100644
index f83bd1e..0000000
--- a/webapp/docker-compose.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-version: '1'
-services:
-  webapp:
-    image: webapp:latest
-    container_name: webapp
-    env_file: .env
-    restart: always
-    labels:
-      - traefik.enable=true
-      - traefik.http.routers.webapp.rule=Host(`mail.$MAIL_DOMAIN`)
-      - traefik.http.routers.webapp.entrypoints=web-secure
-      - traefik.http.routers.webapp.tls=true
-      - traefik.http.routers.webapp.tls.certResolver=default
-      # - traefik.http.routers.webapp.tls.options=strongcipher@file
-      # - traefik.http.services.webapp.loadbalancer.server.port=80
-    networks:
-      - kopano
-      - traefik
-    volumes:
-      - z-push:/var/lib/z-push
-networks:
-  - kopano:
-      external: true
-  - traefik:
-      external: true
-volumes:
-  - z-push: