diff --git a/.env b/.env index 7db514f..ca3aa5e 100644 --- a/.env +++ b/.env @@ -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 diff --git a/docker-compose.yml b/docker-compose.yml index b1640d0..31d691b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -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}