fix in memory db usage (#241)

* fix in memeory db

Signed-off-by: André Bauer <[email protected]>

* fix linter

Signed-off-by: André Bauer <[email protected]>

* disable jscpd

Signed-off-by: André Bauer <[email protected]>

* added env to init container too

Signed-off-by: André Bauer <[email protected]>

* remove whitespaces

Signed-off-by: André Bauer <[email protected]>

* fix typo

Signed-off-by: André Bauer <[email protected]>

Author: monotek

.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

.github/workflows/ci.yaml

@@ -38,6 +38,8 @@ jobs:
         env:
           DEFAULT_BRANCH: master
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          VALIDATE_JSCPD: false
+
 
   build-and-run-docker-compose:
     needs:

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}"

docker-compose.yml

@@ -32,8 +32,10 @@ services:
     depends_on:
       - zammad-postgresql
     environment:
+      - MEMCACHE_SERVERS=${MEMCACHE_SERVERS}
       - POSTGRESQL_USER=${POSTGRES_USER}
       - POSTGRESQL_PASS=${POSTGRES_PASS}
+      - REDIS_URL=${REDIS_URL}
     image: ${IMAGE_REPO}:zammad${VERSION}
     restart: on-failure
     volumes:
@@ -70,6 +72,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 +90,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,6 +104,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: