forked from CCCHH/ansible-infra
		
	zammad(host): move to latest upstream compose file version (v14.1.1)
It hopefully fixes bugs we had in the past, so removing the workarounds and it also comes with default values now, so removing all variables set to those defaults.
This commit is contained in:
		
					parent
					
						
							
								747e5b2d4c
							
						
					
				
			
			
				commit
				
					
						df32e1cac8
					
				
			
		
					 2 changed files with 57 additions and 64 deletions
				
			
		| 
						 | 
				
			
			@ -1,15 +1,4 @@
 | 
			
		|||
ELASTICSEARCH_VERSION=8.19.4
 | 
			
		||||
IMAGE_REPO=ghcr.io/zammad/zammad
 | 
			
		||||
MEMCACHE_SERVERS=zammad-memcached:11211
 | 
			
		||||
MEMCACHE_VERSION=1.6-alpine
 | 
			
		||||
POSTGRES_DB=zammad_production
 | 
			
		||||
POSTGRES_PASS={{ secret__zammad_db_password }}
 | 
			
		||||
POSTGRES_USER=zammad
 | 
			
		||||
POSTGRES_HOST=zammad-postgresql
 | 
			
		||||
POSTGRES_PORT=5432
 | 
			
		||||
POSTGRES_VERSION=15-alpine
 | 
			
		||||
REDIS_URL=redis://zammad-redis:6379
 | 
			
		||||
REDIS_VERSION=7-alpine
 | 
			
		||||
RESTART=always
 | 
			
		||||
VERSION=6
 | 
			
		||||
NGINX_SERVER_SCHEME=https
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,70 +1,83 @@
 | 
			
		|||
---
 | 
			
		||||
version: '3.8'
 | 
			
		||||
version: "3.8"
 | 
			
		||||
 | 
			
		||||
# Taken from: https://github.com/zammad/zammad-docker-compose/blob/master/docker-compose.yml
 | 
			
		||||
# Version: v14.1.1
 | 
			
		||||
# Update from new tag by replacing all content.
 | 
			
		||||
# Configuration should be done in the .env.j2.
 | 
			
		||||
 | 
			
		||||
x-shared:
 | 
			
		||||
  zammad-service: &zammad-service
 | 
			
		||||
    environment: &zammad-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}
 | 
			
		||||
      MEMCACHE_SERVERS: ${MEMCACHE_SERVERS:-zammad-memcached:11211}
 | 
			
		||||
      POSTGRESQL_DB: ${POSTGRES_DB:-zammad_production}
 | 
			
		||||
      POSTGRESQL_HOST: ${POSTGRES_HOST:-zammad-postgresql}
 | 
			
		||||
      POSTGRESQL_USER: ${POSTGRES_USER:-zammad}
 | 
			
		||||
      POSTGRESQL_PASS: ${POSTGRES_PASS:-zammad}
 | 
			
		||||
      POSTGRESQL_PORT: ${POSTGRES_PORT:-5432}
 | 
			
		||||
      POSTGRESQL_OPTIONS: ${POSTGRESQL_OPTIONS:-?pool=50}
 | 
			
		||||
      POSTGRESQL_DB_CREATE:
 | 
			
		||||
      REDIS_URL: ${REDIS_URL:-redis://zammad-redis:6379}
 | 
			
		||||
      S3_URL:
 | 
			
		||||
      # Backup settings
 | 
			
		||||
      BACKUP_DIR: "${BACKUP_DIR:-/var/tmp/zammad}"
 | 
			
		||||
      BACKUP_TIME: "${BACKUP_TIME:-03:00}"
 | 
			
		||||
      HOLD_DAYS: "${HOLD_DAYS:-10}"
 | 
			
		||||
      TZ: "${TZ:-Europe/Berlin}"
 | 
			
		||||
      # Allow passing in these variables via .env:
 | 
			
		||||
      AUTOWIZARD_JSON:
 | 
			
		||||
      AUTOWIZARD_RELATIVE_PATH:
 | 
			
		||||
      ELASTICSEARCH_ENABLED:
 | 
			
		||||
      ELASTICSEARCH_SCHEMA:
 | 
			
		||||
      ELASTICSEARCH_HOST:
 | 
			
		||||
      ELASTICSEARCH_PORT:
 | 
			
		||||
      ELASTICSEARCH_SCHEMA:
 | 
			
		||||
      ELASTICSEARCH_USER:
 | 
			
		||||
      ELASTICSEARCH_PASS:
 | 
			
		||||
      ELASTICSEARCH_NAMESPACE:
 | 
			
		||||
      ELASTICSEARCH_REINDEX:
 | 
			
		||||
      ELASTICSEARCH_SSL_VERIFY:
 | 
			
		||||
      NGINX_PORT:
 | 
			
		||||
      NGINX_CLIENT_MAX_BODY_SIZE:
 | 
			
		||||
      NGINX_SERVER_NAME:
 | 
			
		||||
      NGINX_SERVER_SCHEME:
 | 
			
		||||
      POSTGRESQL_DB_CREATE:
 | 
			
		||||
      POSTGRESQL_OPTIONS:
 | 
			
		||||
      RAILS_TRUSTED_PROXIES:
 | 
			
		||||
      ZAMMAD_HTTP_TYPE:
 | 
			
		||||
      ZAMMAD_FQDN:
 | 
			
		||||
      ZAMMAD_WEB_CONCURRENCY:
 | 
			
		||||
      ZAMMAD_SESSION_JOBS:
 | 
			
		||||
      ZAMMAD_PROCESS_SCHEDULED:
 | 
			
		||||
      ZAMMAD_PROCESS_SESSIONS_JOBS_WORKERS:
 | 
			
		||||
      ZAMMAD_PROCESS_SCHEDULED_JOBS_WORKERS:
 | 
			
		||||
      ZAMMAD_PROCESS_DELAYED_JOBS_WORKERS:
 | 
			
		||||
    image: ${IMAGE_REPO}:${VERSION}
 | 
			
		||||
    restart: ${RESTART}
 | 
			
		||||
      # ZAMMAD_SESSION_JOBS_CONCURRENT is deprecated, please use ZAMMAD_PROCESS_SESSIONS_JOBS_WORKERS instead.
 | 
			
		||||
      ZAMMAD_SESSION_JOBS_CONCURRENT:
 | 
			
		||||
      # Variables used by ngingx-proxy container for reverse proxy creations
 | 
			
		||||
      # for docs refer to https://github.com/nginx-proxy/nginx-proxy
 | 
			
		||||
      VIRTUAL_HOST:
 | 
			
		||||
      VIRTUAL_PORT:
 | 
			
		||||
      # Variables used by acme-companion for retrieval of LetsEncrypt certificate
 | 
			
		||||
      # for docs refer to https://github.com/nginx-proxy/acme-companion
 | 
			
		||||
      LETSENCRYPT_HOST:
 | 
			
		||||
      LETSENCRYPT_EMAIL:
 | 
			
		||||
 | 
			
		||||
    image: ${IMAGE_REPO:-ghcr.io/zammad/zammad}:${VERSION:-6.5.2}
 | 
			
		||||
    restart: ${RESTART:-always}
 | 
			
		||||
    volumes:
 | 
			
		||||
      - zammad-storage:/opt/zammad/storage
 | 
			
		||||
      - zammad-var:/opt/zammad/var
 | 
			
		||||
    depends_on:
 | 
			
		||||
      - zammad-memcached
 | 
			
		||||
      - zammad-postgresql
 | 
			
		||||
      - zammad-redis
 | 
			
		||||
 | 
			
		||||
services:
 | 
			
		||||
 | 
			
		||||
  zammad-backup:
 | 
			
		||||
    <<: *zammad-service
 | 
			
		||||
    command: ["zammad-backup"]
 | 
			
		||||
    depends_on:
 | 
			
		||||
      - zammad-railsserver
 | 
			
		||||
      - zammad-postgresql
 | 
			
		||||
    entrypoint: /usr/local/bin/backup.sh
 | 
			
		||||
    environment:
 | 
			
		||||
      <<: *zammad-environment
 | 
			
		||||
      BACKUP_TIME: "03:00"
 | 
			
		||||
      HOLD_DAYS: "10"
 | 
			
		||||
      TZ: Europe/Berlin
 | 
			
		||||
    image: postgres:${POSTGRES_VERSION}
 | 
			
		||||
    restart: ${RESTART}
 | 
			
		||||
    volumes:
 | 
			
		||||
      - zammad-backup:/var/tmp/zammad
 | 
			
		||||
      - zammad-storage:/opt/zammad/storage:ro
 | 
			
		||||
      - zammad-var:/opt/zammad/var:ro
 | 
			
		||||
      - ./scripts/backup.sh:/usr/local/bin/backup.sh:ro
 | 
			
		||||
    user: 0:0
 | 
			
		||||
 | 
			
		||||
  zammad-elasticsearch:
 | 
			
		||||
    image: elasticsearch:${ELASTICSEARCH_VERSION}
 | 
			
		||||
    restart: ${RESTART}
 | 
			
		||||
    image: elasticsearch:${ELASTICSEARCH_VERSION:-8.19.4}
 | 
			
		||||
    restart: ${RESTART:-always}
 | 
			
		||||
    volumes:
 | 
			
		||||
      - elasticsearch-data:/usr/share/elasticsearch/data
 | 
			
		||||
    environment:
 | 
			
		||||
| 
						 | 
				
			
			@ -79,34 +92,29 @@ services:
 | 
			
		|||
      - zammad-postgresql
 | 
			
		||||
    restart: on-failure
 | 
			
		||||
    user: 0:0
 | 
			
		||||
    volumes:
 | 
			
		||||
      - zammad-storage:/opt/zammad/storage
 | 
			
		||||
      - zammad-var:/opt/zammad/var
 | 
			
		||||
 | 
			
		||||
  zammad-memcached:
 | 
			
		||||
    command: memcached -m 256M
 | 
			
		||||
    image: memcached:${MEMCACHE_VERSION}
 | 
			
		||||
    restart: ${RESTART}
 | 
			
		||||
    image: memcached:${MEMCACHE_VERSION:-1.6.39-alpine}
 | 
			
		||||
    restart: ${RESTART:-always}
 | 
			
		||||
 | 
			
		||||
  zammad-nginx:
 | 
			
		||||
    <<: *zammad-service
 | 
			
		||||
    command: ["zammad-nginx"]
 | 
			
		||||
    expose:
 | 
			
		||||
      - "8080"
 | 
			
		||||
      - "${NGINX_PORT:-8080}"
 | 
			
		||||
    ports:
 | 
			
		||||
      - "8080:8080"
 | 
			
		||||
      - "${NGINX_EXPOSE_PORT:-8080}:${NGINX_PORT:-8080}"
 | 
			
		||||
    depends_on:
 | 
			
		||||
      - zammad-railsserver
 | 
			
		||||
    volumes:
 | 
			
		||||
      - zammad-var:/opt/zammad/var:ro # required for the zammad-ready check file
 | 
			
		||||
 | 
			
		||||
  zammad-postgresql:
 | 
			
		||||
    environment:
 | 
			
		||||
      POSTGRES_DB: ${POSTGRES_DB}
 | 
			
		||||
      POSTGRES_USER: ${POSTGRES_USER}
 | 
			
		||||
      POSTGRES_PASSWORD: ${POSTGRES_PASS}
 | 
			
		||||
    image: postgres:${POSTGRES_VERSION}
 | 
			
		||||
    restart: ${RESTART}
 | 
			
		||||
      POSTGRES_DB: ${POSTGRES_DB:-zammad_production}
 | 
			
		||||
      POSTGRES_USER: ${POSTGRES_USER:-zammad}
 | 
			
		||||
      POSTGRES_PASSWORD: ${POSTGRES_PASS:-zammad}
 | 
			
		||||
    image: postgres:${POSTGRES_VERSION:-17.6-alpine}
 | 
			
		||||
    restart: ${RESTART:-always}
 | 
			
		||||
    volumes:
 | 
			
		||||
      - postgresql-data:/var/lib/postgresql/data
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -115,16 +123,14 @@ services:
 | 
			
		|||
    command: ["zammad-railsserver"]
 | 
			
		||||
 | 
			
		||||
  zammad-redis:
 | 
			
		||||
    image: redis:${REDIS_VERSION}
 | 
			
		||||
    restart: ${RESTART}
 | 
			
		||||
    image: redis:${REDIS_VERSION:-7.4.5-alpine}
 | 
			
		||||
    restart: ${RESTART:-always}
 | 
			
		||||
    volumes:
 | 
			
		||||
      - redis-data:/data
 | 
			
		||||
 | 
			
		||||
  zammad-scheduler:
 | 
			
		||||
    <<: *zammad-service
 | 
			
		||||
    command: ["zammad-scheduler"]
 | 
			
		||||
    volumes:
 | 
			
		||||
      - /ansible_docker_compose/zammad-scheduler-database.yml:/opt/zammad/config/database.yml # workaround for connection pool issue
 | 
			
		||||
 | 
			
		||||
  zammad-websocket:
 | 
			
		||||
    <<: *zammad-service
 | 
			
		||||
| 
						 | 
				
			
			@ -141,5 +147,3 @@ volumes:
 | 
			
		|||
    driver: local
 | 
			
		||||
  zammad-storage:
 | 
			
		||||
    driver: local
 | 
			
		||||
  zammad-var:
 | 
			
		||||
    driver: local
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue