From 95779aaef77c12497d75e0ea5ad931e1ad4320e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Bauer?= <andre.bauer@staffbase.com>
Date: Wed, 6 Oct 2021 09:04:44 +0200
Subject: [PATCH] fix in memeory db
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: André Bauer <andre.bauer@staffbase.com>
---
 .env                                   |  2 ++
 containers/zammad/docker-entrypoint.sh |  2 --
 docker-compose.yml                     | 11 ++++++++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/.env b/.env
index ad4a3d7..b536d1b 100644
--- a/.env
+++ b/.env
@@ -1,6 +1,8 @@
 IMAGE_REPO=zammad/zammad-docker-compose
+MEMCACHE_SERVERS=zammad-memcached:11211
 POSTGRES_PASS=zammad
 POSTGRES_USER=zammad
+REDIS_URL=redis://zammad-redis:6379
 RESTART=always
 # don't forget to add the minus before the version
 VERSION=-4.1.0-6
diff --git a/containers/zammad/docker-entrypoint.sh b/containers/zammad/docker-entrypoint.sh
index 9d5079e..56736f1 100755
--- a/containers/zammad/docker-entrypoint.sh
+++ b/containers/zammad/docker-entrypoint.sh
@@ -10,7 +10,6 @@ set -e
 : "${ELASTICSEARCH_NAMESPACE:=zammad}"
 : "${ELASTICSEARCH_REINDEX:=true}"
 : "${ELASTICSEARCH_SSL_VERIFY:=true}"
-: "${MEMCACHE_SERVERS:=zammad-memcached:11211}"
 : "${NGINX_PORT:=8080}"
 : "${NGINX_SERVER_NAME:=_}"
 : "${NGINX_SERVER_SCHEME:=\$scheme}"
@@ -21,7 +20,6 @@ set -e
 : "${POSTGRESQL_DB:=zammad_production}"
 : "${POSTGRESQL_DB_CREATE:=true}"
 : "${RAILS_TRUSTED_PROXIES:=['127.0.0.1', '::1']}"
-: "${REDIS_URL:=redis://zammad-redis:6379}"
 : "${RSYNC_ADDITIONAL_PARAMS:=--no-perms --no-owner}"
 : "${ZAMMAD_RAILSSERVER_HOST:=zammad-railsserver}"
 : "${ZAMMAD_RAILSSERVER_PORT:=3000}"
diff --git a/docker-compose.yml b/docker-compose.yml
index a3a1393..cde81cc 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -70,6 +70,9 @@ services:
       - zammad-memcached
       - zammad-postgresql
       - zammad-redis
+    environment:
+      - MEMCACHE_SERVERS=${MEMCACHE_SERVERS}
+      - REDIS_URL=${REDIS_URL}
     image: ${IMAGE_REPO}:zammad${VERSION}
     restart: ${RESTART}
     volumes:
@@ -85,6 +88,9 @@ services:
       - zammad-memcached
       - zammad-railsserver
       - zammad-redis
+    environment:
+      - MEMCACHE_SERVERS=${MEMCACHE_SERVERS}
+      - REDIS_URL=${REDIS_URL}
     image: ${IMAGE_REPO}:zammad${VERSION}
     restart: ${RESTART}
     volumes:
@@ -96,7 +102,10 @@ services:
       - zammad-memcached
       - zammad-railsserver
       - zammad-redis
-    image: ${IMAGE_REPO}:zammad${VERSION}
+    environment:
+      - MEMCACHE_SERVERS=${MEMCACHE_SERVERS}
+      - REDIS_URL=${REDIS_URL}
+      image: ${IMAGE_REPO}:zammad${VERSION}
     restart: ${RESTART}
     volumes:
       - zammad-data:/opt/zammad