Freifunk-Rhein-Sieg/zammad-docker-compose
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix in memory db usage (#241)

Browse Source 
* fix in memeory db

Signed-off-by: André Bauer <andre.bauer@staffbase.com>

* fix linter

Signed-off-by: André Bauer <andre.bauer@staffbase.com>

* disable jscpd

Signed-off-by: André Bauer <andre.bauer@staffbase.com>

* added env to init container too

Signed-off-by: André Bauer <andre.bauer@staffbase.com>

* remove whitespaces

Signed-off-by: André Bauer <andre.bauer@staffbase.com>

* fix typo

Signed-off-by: André Bauer <andre.bauer@staffbase.com>
This commit is contained in:
André Bauer 2021-10-06 14:16:13 +02:00 committed by GitHub
parent 701627f9c6
commit defd3fbdcf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.env
View File

@ -1,6 +1,8 @@
IMAGE_REPO=zammad/zammad-docker-compose IMAGE_REPO=zammad/zammad-docker-compose
MEMCACHE_SERVERS=zammad-memcached:11211
POSTGRES_PASS=zammad POSTGRES_PASS=zammad
POSTGRES_USER=zammad POSTGRES_USER=zammad
REDIS_URL=redis://zammad-redis:6379
RESTART=always RESTART=always
# don't forget to add the minus before the version # don't forget to add the minus before the version
VERSION=-4.1.0-6 VERSION=-4.1.0-6

2
.github/workflows/ci.yaml vendored
View File

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

2
containers/zammad/docker-entrypoint.sh
View File

@ -10,7 +10,6 @@ set -e
: "${ELASTICSEARCH_NAMESPACE:=zammad}" : "${ELASTICSEARCH_NAMESPACE:=zammad}"
: "${ELASTICSEARCH_REINDEX:=true}" : "${ELASTICSEARCH_REINDEX:=true}"
: "${ELASTICSEARCH_SSL_VERIFY:=true}" : "${ELASTICSEARCH_SSL_VERIFY:=true}"
: "${MEMCACHE_SERVERS:=zammad-memcached:11211}"
: "${NGINX_PORT:=8080}" : "${NGINX_PORT:=8080}"
: "${NGINX_SERVER_NAME:=_}" : "${NGINX_SERVER_NAME:=_}"
: "${NGINX_SERVER_SCHEME:=\$scheme}" : "${NGINX_SERVER_SCHEME:=\$scheme}"
@ -21,7 +20,6 @@ set -e
: "${POSTGRESQL_DB:=zammad_production}" : "${POSTGRESQL_DB:=zammad_production}"
: "${POSTGRESQL_DB_CREATE:=true}" : "${POSTGRESQL_DB_CREATE:=true}"
: "${RAILS_TRUSTED_PROXIES:=['127.0.0.1', '::1']}" : "${RAILS_TRUSTED_PROXIES:=['127.0.0.1', '::1']}"
: "${REDIS_URL:=redis://zammad-redis:6379}"
: "${RSYNC_ADDITIONAL_PARAMS:=--no-perms --no-owner}" : "${RSYNC_ADDITIONAL_PARAMS:=--no-perms --no-owner}"
: "${ZAMMAD_RAILSSERVER_HOST:=zammad-railsserver}" : "${ZAMMAD_RAILSSERVER_HOST:=zammad-railsserver}"
: "${ZAMMAD_RAILSSERVER_PORT:=3000}" : "${ZAMMAD_RAILSSERVER_PORT:=3000}"

11
docker-compose.yml
View File

@ -32,8 +32,10 @@ services:
depends_on: depends_on:
- zammad-postgresql - zammad-postgresql
environment: environment:
- MEMCACHE_SERVERS=${MEMCACHE_SERVERS}
- POSTGRESQL_USER=${POSTGRES_USER} - POSTGRESQL_USER=${POSTGRES_USER}
- POSTGRESQL_PASS=${POSTGRES_PASS} - POSTGRESQL_PASS=${POSTGRES_PASS}
- REDIS_URL=${REDIS_URL}
image: ${IMAGE_REPO}:zammad${VERSION} image: ${IMAGE_REPO}:zammad${VERSION}
restart: on-failure restart: on-failure
volumes: volumes:
@ -70,6 +72,9 @@ services:
- zammad-memcached - zammad-memcached
- zammad-postgresql - zammad-postgresql
- zammad-redis - zammad-redis
environment:
- MEMCACHE_SERVERS=${MEMCACHE_SERVERS}
- REDIS_URL=${REDIS_URL}
image: ${IMAGE_REPO}:zammad${VERSION} image: ${IMAGE_REPO}:zammad${VERSION}
restart: ${RESTART} restart: ${RESTART}
volumes: volumes:
@ -85,6 +90,9 @@ services:
- zammad-memcached - zammad-memcached
- zammad-railsserver - zammad-railsserver
- zammad-redis - zammad-redis
environment:
- MEMCACHE_SERVERS=${MEMCACHE_SERVERS}
- REDIS_URL=${REDIS_URL}
image: ${IMAGE_REPO}:zammad${VERSION} image: ${IMAGE_REPO}:zammad${VERSION}
restart: ${RESTART} restart: ${RESTART}
volumes: volumes:
@ -96,6 +104,9 @@ services:
- zammad-memcached - zammad-memcached
- zammad-railsserver - zammad-railsserver
- zammad-redis - zammad-redis
environment:
- MEMCACHE_SERVERS=${MEMCACHE_SERVERS}
- REDIS_URL=${REDIS_URL}
image: ${IMAGE_REPO}:zammad${VERSION} image: ${IMAGE_REPO}:zammad${VERSION}
restart: ${RESTART} restart: ${RESTART}
volumes: volumes: