From 91369a66905c011fa964158030f9b076abac8d5a Mon Sep 17 00:00:00 2001
From: matti <matti@noreply.codeberg.org>
Date: Fri, 18 Nov 2022 20:01:21 +0000
Subject: [PATCH] update docker-compose

update Zammad to 5.2.3-32
PostgreSql was updated from 9.6.24 to 15.0.0
---
 docker-compose.yml | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 1bb3692..164c090 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -14,19 +14,18 @@ services:
       - HOLD_DAYS=10
       - POSTGRESQL_USER=${POSTGRES_USER}
       - POSTGRESQL_PASSWORD=${POSTGRES_PASS}
-    image: ${IMAGE_REPO}:zammad-postgresql${VERSION}
+    image: postgres:15.0-alpine
     restart: ${RESTART}
     volumes:
       - zammad-backup:/var/tmp/zammad
-      - zammad-data:/opt/zammad
+      - zammad-data:/opt/zammad:ro
+      - ./scripts/backup.sh:/usr/local/bin/backup.sh:ro
 
   zammad-elasticsearch:
-    environment:
-      - discovery.type=single-node
-    image: ${IMAGE_REPO}:zammad-elasticsearch${VERSION}
+    image: bitnami/elasticsearch:8.5.0
     restart: ${RESTART}
     volumes:
-      - elasticsearch-data:/usr/share/elasticsearch/data
+      - elasticsearch-data:/bitnami/elasticsearch/data
 
   zammad-init:
     command: ["zammad-init"]
@@ -37,14 +36,14 @@ services:
       - POSTGRESQL_USER=${POSTGRES_USER}
       - POSTGRESQL_PASS=${POSTGRES_PASS}
       - REDIS_URL=${REDIS_URL}
-    image: ${IMAGE_REPO}:zammad${VERSION}
+    image: ${IMAGE_REPO}:${VERSION}
     restart: on-failure
     volumes:
       - zammad-data:/opt/zammad
 
   zammad-memcached:
     command: memcached -m 256M
-    image: memcached:1.6.10-alpine
+    image: memcached:1.6.17-alpine
     restart: ${RESTART}
 
   zammad-nginx:
@@ -53,7 +52,7 @@ services:
       - "8080"
     depends_on:
       - zammad-railsserver
-    image: ${IMAGE_REPO}:zammad${VERSION}
+    image: ${IMAGE_REPO}:${VERSION}
     restart: ${RESTART}
     volumes:
       - zammad-data:/opt/zammad
@@ -62,7 +61,7 @@ services:
     environment:
       - POSTGRES_USER=${POSTGRES_USER}
       - POSTGRES_PASSWORD=${POSTGRES_PASS}
-    image: ${IMAGE_REPO}:zammad-postgresql${VERSION}
+    image: postgres:15.0-alpine
     restart: ${RESTART}
     volumes:
       - postgresql-data:/var/lib/postgresql/data
@@ -76,7 +75,7 @@ services:
     environment:
       - MEMCACHE_SERVERS=${MEMCACHE_SERVERS}
       - REDIS_URL=${REDIS_URL}
-    image: ${IMAGE_REPO}:zammad${VERSION}
+    image: ${IMAGE_REPO}:${VERSION}
     restart: ${RESTART}
     volumes:
       - zammad-data:/opt/zammad
@@ -94,7 +93,7 @@ services:
     environment:
       - MEMCACHE_SERVERS=${MEMCACHE_SERVERS}
       - REDIS_URL=${REDIS_URL}
-    image: ${IMAGE_REPO}:zammad${VERSION}
+    image: ${IMAGE_REPO}:${VERSION}
     restart: ${RESTART}
     volumes:
       - zammad-data:/opt/zammad
@@ -108,7 +107,7 @@ services:
     environment:
       - MEMCACHE_SERVERS=${MEMCACHE_SERVERS}
       - REDIS_URL=${REDIS_URL}
-    image: ${IMAGE_REPO}:zammad${VERSION}
+    image: ${IMAGE_REPO}:${VERSION}
     restart: ${RESTART}
     volumes:
       - zammad-data:/opt/zammad