From 1ffa9f6455742b21a480a44dc64c66785a87b7f9 Mon Sep 17 00:00:00 2001
From: Matthias Hemmerich <m.hemmerich@netzhaut.de>
Date: Fri, 23 Jun 2023 09:52:38 +0200
Subject: [PATCH] update to 6.0

---
 docker-compose.override.yml | 24 ++++++++++++-----
 docker-compose.yml          | 53 ++++++++++++++++++++++++++++---------
 2 files changed, 58 insertions(+), 19 deletions(-)

diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index 13da040..da2c390 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -5,6 +5,16 @@ networks:
     external: true
 
 services:
+
+  zammad-backup:
+    container_name: zammad-backup
+    environment:
+      - BACKUP_TIME=03:00
+      - HOLD_DAYS=2
+    image: postgres:${POSTGRES_VERSION}
+    volumes:
+      - ${APP_DATA}/zammad/scripts/backup.sh:/usr/local/bin/backup.sh:ro
+
   zammad-elasticsearch:
     container_name: zammad-elasticsearch
     mem_limit: 6g
@@ -16,7 +26,6 @@ services:
 
   zammad-nginx:
     container_name: zammad-nginx
-    env_file: stack.env
     healthcheck:
       test: curl --fail http://localhost:8080 || exit 1
       interval: 60s
@@ -36,7 +45,6 @@ services:
 
   zammad-postgresql:
     container_name: zammad-postgresql
-    env_file: stack.env
     healthcheck:
       test: ["CMD-SHELL", "pg_isready"]
       interval: 60s
@@ -46,17 +54,15 @@ services:
   zammad-init:
     container_name: zammad-init
     environment:
-      - POSTGRES_DB=${POSTGRES_DB}
-      - POSTGRES_USER=${POSTGRES_USER}
-      - POSTGRES_PASSWORD=${POSTGRES_PASS}
-    env_file: stack.env
+      - POSTGRESQL_PASS=${POSTGRES_PASS}
 
   zammad-memcached:
     container_name: zammad-memcached
 
   zammad-railsserver:
     container_name: zammad-railsserver
-    env_file: stack.env
+    environment:
+      - POSTGRESQL_PASS=${POSTGRES_PASS}
 
   zammad-redis:
     container_name: zammad-redis
@@ -68,6 +74,10 @@ services:
 
   zammad-scheduler:
     container_name: zammad-scheduler
+    environment:
+      - POSTGRESQL_PASS=${POSTGRES_PASS}
 
   zammad-websocket:
     container_name: zammad-websocket
+    environment:
+      - POSTGRESQL_PASS=${POSTGRES_PASS}
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 5be1643..b1640d0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,9 +1,30 @@
 ---
-version: '3.2'
+version: '3.8'
 
 services:
+
+  zammad-backup:
+    command: ["zammad-backup"]
+    depends_on:
+      - zammad-railsserver
+      - zammad-postgresql
+    entrypoint: /usr/local/bin/backup.sh
+    environment:
+      - BACKUP_TIME=03:00
+      - HOLD_DAYS=10
+      - POSTGRESQL_DB=${POSTGRES_DB}
+      - POSTGRESQL_USER=${POSTGRES_USER}
+      - POSTGRESQL_PASSWORD=${POSTGRES_PASS}
+      - TZ=Europe/Berlin
+    image: postgres:${POSTGRES_VERSION}
+    restart: ${RESTART}
+    volumes:
+      - zammad-backup:/var/tmp/zammad
+      - zammad-var:/opt/zammad/var:ro
+      - ./scripts/backup.sh:/usr/local/bin/backup.sh:ro
+
   zammad-elasticsearch:
-    image: bitnami/elasticsearch:8.5.1
+    image: bitnami/elasticsearch:${ELASTICSEARCH_VERSION}
     restart: ${RESTART}
     volumes:
       - elasticsearch-data:/bitnami/elasticsearch/data
@@ -14,17 +35,17 @@ services:
       - zammad-postgresql
     environment:
       - MEMCACHE_SERVERS=${MEMCACHE_SERVERS}
-      - POSTGRESQL_USER=${POSTGRES_USER}
-      - POSTGRESQL_PASS=${POSTGRES_PASS}
       - REDIS_URL=${REDIS_URL}
     image: ${IMAGE_REPO}:${VERSION}
     restart: on-failure
+    user: 0:0
     volumes:
-      - zammad-data:/opt/zammad
+      - zammad-config-nginx:/etc/nginx/sites-enabled
+      - zammad-var:/opt/zammad/var
 
   zammad-memcached:
     command: memcached -m 256M
-    image: memcached:1.6.17-alpine
+    image: memcached:${MEMCACHE_VERSION}
     restart: ${RESTART}
 
   zammad-nginx:
@@ -36,10 +57,12 @@ services:
     image: ${IMAGE_REPO}:${VERSION}
     restart: ${RESTART}
     volumes:
-      - zammad-data:/opt/zammad
+      - zammad-config-nginx:/etc/nginx/sites-enabled:ro
+      - zammad-var:/opt/zammad/var:ro
 
   zammad-postgresql:
     environment:
+      - POSTGRES_DB=${POSTGRES_DB}
       - POSTGRES_USER=${POSTGRES_USER}
       - POSTGRES_PASSWORD=${POSTGRES_PASS}
     image: postgres:${POSTGRES_VERSION}
@@ -59,11 +82,13 @@ services:
     image: ${IMAGE_REPO}:${VERSION}
     restart: ${RESTART}
     volumes:
-      - zammad-data:/opt/zammad
+      - zammad-var:/opt/zammad/var
 
   zammad-redis:
-    image: redis:7.0.5-alpine
+    image: redis:${REDIS_VERSION}
     restart: ${RESTART}
+    volumes:
+      - redis-data:/data
 
   zammad-scheduler:
     command: ["zammad-scheduler"]
@@ -77,7 +102,7 @@ services:
     image: ${IMAGE_REPO}:${VERSION}
     restart: ${RESTART}
     volumes:
-      - zammad-data:/opt/zammad
+      - zammad-var:/opt/zammad/var
 
   zammad-websocket:
     command: ["zammad-websocket"]
@@ -91,14 +116,18 @@ services:
     image: ${IMAGE_REPO}:${VERSION}
     restart: ${RESTART}
     volumes:
-      - zammad-data:/opt/zammad
+      - zammad-var:/opt/zammad/var
 
 volumes:
   elasticsearch-data:
     driver: local
   postgresql-data:
     driver: local
+  redis-data:
+    driver: local
   zammad-backup:
     driver: local
-  zammad-data:
+  zammad-config-nginx:
+    driver: local
+  zammad-var:
     driver: local