Fixes #358, fixes #364, fixes 365, closes #357 - Fix passing of database credentials to containers

* Fix passing of database credentials to containers.

* Bump Zammad image version in .env.
This commit is contained in:
Martin Gruner
2023-08-24 09:30:27 +02:00
committed by GitHub
parent 799edd7863
commit 7f31a9acfc
2 changed files with 29 additions and 1 deletions
+1 -1
View File
@@ -11,4 +11,4 @@ POSTGRES_VERSION=15.3-alpine
REDIS_URL=redis://zammad-redis:6379
REDIS_VERSION=7.0.5-alpine
RESTART=always
VERSION=6.0.0-66
VERSION=6.0.0-119
+28
View File
@@ -35,6 +35,11 @@ services:
- zammad-postgresql
environment:
- MEMCACHE_SERVERS=${MEMCACHE_SERVERS}
- POSTGRESQL_DB=${POSTGRES_DB}
- POSTGRESQL_HOST=${POSTGRES_HOST}
- POSTGRESQL_USER=${POSTGRES_USER}
- POSTGRESQL_PASS=${POSTGRES_PASS}
- POSTGRESQL_PORT=${POSTGRES_PORT}
- REDIS_URL=${REDIS_URL}
image: ${IMAGE_REPO}:${VERSION}
restart: on-failure
@@ -54,6 +59,14 @@ services:
- "8080"
depends_on:
- zammad-railsserver
environment:
- MEMCACHE_SERVERS=${MEMCACHE_SERVERS}
- POSTGRESQL_DB=${POSTGRES_DB}
- POSTGRESQL_HOST=${POSTGRES_HOST}
- POSTGRESQL_USER=${POSTGRES_USER}
- POSTGRESQL_PASS=${POSTGRES_PASS}
- POSTGRESQL_PORT=${POSTGRES_PORT}
- REDIS_URL=${REDIS_URL}
image: ${IMAGE_REPO}:${VERSION}
restart: ${RESTART}
volumes:
@@ -78,6 +91,11 @@ services:
- zammad-redis
environment:
- MEMCACHE_SERVERS=${MEMCACHE_SERVERS}
- POSTGRESQL_DB=${POSTGRES_DB}
- POSTGRESQL_HOST=${POSTGRES_HOST}
- POSTGRESQL_USER=${POSTGRES_USER}
- POSTGRESQL_PASS=${POSTGRES_PASS}
- POSTGRESQL_PORT=${POSTGRES_PORT}
- REDIS_URL=${REDIS_URL}
image: ${IMAGE_REPO}:${VERSION}
restart: ${RESTART}
@@ -98,6 +116,11 @@ services:
- zammad-redis
environment:
- MEMCACHE_SERVERS=${MEMCACHE_SERVERS}
- POSTGRESQL_DB=${POSTGRES_DB}
- POSTGRESQL_HOST=${POSTGRES_HOST}
- POSTGRESQL_USER=${POSTGRES_USER}
- POSTGRESQL_PASS=${POSTGRES_PASS}
- POSTGRESQL_PORT=${POSTGRES_PORT}
- REDIS_URL=${REDIS_URL}
image: ${IMAGE_REPO}:${VERSION}
restart: ${RESTART}
@@ -112,6 +135,11 @@ services:
- zammad-redis
environment:
- MEMCACHE_SERVERS=${MEMCACHE_SERVERS}
- POSTGRESQL_DB=${POSTGRES_DB}
- POSTGRESQL_HOST=${POSTGRES_HOST}
- POSTGRESQL_USER=${POSTGRES_USER}
- POSTGRESQL_PASS=${POSTGRES_PASS}
- POSTGRESQL_PORT=${POSTGRES_PORT}
- REDIS_URL=${REDIS_URL}
image: ${IMAGE_REPO}:${VERSION}
restart: ${RESTART}