From defd3fbdcf0fbb52af541fd1d6f3285f6501aece Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Wed, 6 Oct 2021 14:16:13 +0200 Subject: [PATCH] fix in memory db usage (#241) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix in memeory db Signed-off-by: André Bauer * fix linter Signed-off-by: André Bauer * disable jscpd Signed-off-by: André Bauer * added env to init container too Signed-off-by: André Bauer * remove whitespaces Signed-off-by: André Bauer * fix typo Signed-off-by: André Bauer --- .env | 2 ++ .github/workflows/ci.yaml | 2 ++ containers/zammad/docker-entrypoint.sh | 2 -- docker-compose.yml | 11 +++++++++++ 4 files changed, 15 insertions(+), 2 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/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index ff9ea53..a38570f 100644 --- a/.github/workflows/ci.yaml +++ b/.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: 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..621c6f9 100644 --- a/docker-compose.yml +++ b/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: