From a79faa60834c278898f91e45d83046adb2be391f Mon Sep 17 00:00:00 2001
From: matti <matti@noreply.codeberg.org>
Date: Wed, 21 Jun 2023 22:18:12 +0000
Subject: [PATCH] revert 94002fc25cb543d270a98824d31e2bdfb293fad0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

revert bump to zammad 6.0

init container schafft es nicht sich in die Datenbank einzuloggen, erstmal wieder zurück zu Zammad 5.4
---
 LICENSE            |  2 +-
 docker-compose.yml | 53 +++++++++++-----------------------------------
 2 files changed, 13 insertions(+), 42 deletions(-)

diff --git a/LICENSE b/LICENSE
index cfe6111..a4e9dc9 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 MIT No Attribution
 
-Copyright 2023 angestöpselt e.V.
+Copyright <YEAR> <COPYRIGHT HOLDER>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this
 software and associated documentation files (the "Software"), to deal in the Software
diff --git a/docker-compose.yml b/docker-compose.yml
index 6cd772f..5be1643 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,30 +1,9 @@
 ---
-version: '3.8'
+version: '3.2'
 
 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
-      - ${APP_DATA}/zammad/scripts/backup.sh:/usr/local/bin/backup.sh:ro
-
   zammad-elasticsearch:
-    image: bitnami/elasticsearch:${ELASTICSEARCH_VERSION}
+    image: bitnami/elasticsearch:8.5.1
     restart: ${RESTART}
     volumes:
       - elasticsearch-data:/bitnami/elasticsearch/data
@@ -35,17 +14,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-config-nginx:/etc/nginx/sites-enabled
-      - zammad-var:/opt/zammad/var
+      - zammad-data:/opt/zammad
 
   zammad-memcached:
     command: memcached -m 256M
-    image: memcached:${MEMCACHE_VERSION}
+    image: memcached:1.6.17-alpine
     restart: ${RESTART}
 
   zammad-nginx:
@@ -57,12 +36,10 @@ services:
     image: ${IMAGE_REPO}:${VERSION}
     restart: ${RESTART}
     volumes:
-      - zammad-config-nginx:/etc/nginx/sites-enabled:ro
-      - zammad-var:/opt/zammad/var:ro
+      - zammad-data:/opt/zammad
 
   zammad-postgresql:
     environment:
-      - POSTGRES_DB=${POSTGRES_DB}
       - POSTGRES_USER=${POSTGRES_USER}
       - POSTGRES_PASSWORD=${POSTGRES_PASS}
     image: postgres:${POSTGRES_VERSION}
@@ -82,13 +59,11 @@ services:
     image: ${IMAGE_REPO}:${VERSION}
     restart: ${RESTART}
     volumes:
-      - zammad-var:/opt/zammad/var
+      - zammad-data:/opt/zammad
 
   zammad-redis:
-    image: redis:${REDIS_VERSION}
+    image: redis:7.0.5-alpine
     restart: ${RESTART}
-    volumes:
-      - redis-data:/data
 
   zammad-scheduler:
     command: ["zammad-scheduler"]
@@ -102,7 +77,7 @@ services:
     image: ${IMAGE_REPO}:${VERSION}
     restart: ${RESTART}
     volumes:
-      - zammad-var:/opt/zammad/var
+      - zammad-data:/opt/zammad
 
   zammad-websocket:
     command: ["zammad-websocket"]
@@ -116,18 +91,14 @@ services:
     image: ${IMAGE_REPO}:${VERSION}
     restart: ${RESTART}
     volumes:
-      - zammad-var:/opt/zammad/var
+      - zammad-data:/opt/zammad
 
 volumes:
   elasticsearch-data:
     driver: local
   postgresql-data:
     driver: local
-  redis-data:
-    driver: local
   zammad-backup:
     driver: local
-  zammad-config-nginx:
+  zammad-data:
     driver: local
-  zammad-var:
-    driver: local
\ No newline at end of file