diff --git a/docker-compose.override.yml b/docker-compose.override.yml index 693bc23..c0556a0 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -1,25 +1,19 @@ -version: '3.9' +version: '3' networks: proxy: external: true services: - zammad-backup: - container_name: zammad-backup - image: bash:latest - restart: "no" - entrypoint: ["echo", "backup disabled in compose.override.yml"] zammad-elasticsearch: container_name: zammad-elasticsearch mem_limit: 6g - environment: - - "ES_JAVA_OPTS=-Dlog4j2.formatMsgNoLookups=true" healthcheck: test: curl -s http://localhost:9200 --output /dev/null || exit 1 interval: 60s timeout: 10s retries: 30 + zammad-nginx: container_name: zammad-nginx healthcheck: diff --git a/docker-compose.yml b/docker-compose.yml index 363b20d..614a98b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,21 +8,21 @@ services: depends_on: - zammad-railsserver - zammad-postgresql - # entrypoint: /usr/local/bin/backup.sh + entrypoint: /usr/local/bin/backup.sh environment: - BACKUP_SLEEP=86400 - HOLD_DAYS=10 - POSTGRESQL_USER=${POSTGRES_USER} - POSTGRESQL_PASSWORD=${POSTGRES_PASS} - image: postgres:15.0-alpine + image: postgres:${POSTGRES_VERSION} restart: ${RESTART} volumes: - zammad-backup:/var/tmp/zammad - zammad-data:/opt/zammad:ro - # - ./scripts/backup.sh:/usr/local/bin/backup.sh:ro + - ./scripts/backup.sh:/usr/local/bin/backup.sh:ro zammad-elasticsearch: - image: bitnami/elasticsearch:8.5.0 + image: bitnami/elasticsearch:8.5.1 restart: ${RESTART} volumes: - elasticsearch-data:/bitnami/elasticsearch/data @@ -61,7 +61,7 @@ services: environment: - POSTGRES_USER=${POSTGRES_USER} - POSTGRES_PASSWORD=${POSTGRES_PASS} - image: postgres:15.0-alpine + image: postgres:${POSTGRES_VERSION} restart: ${RESTART} volumes: - postgresql-data:/var/lib/postgresql/data @@ -81,7 +81,7 @@ services: - zammad-data:/opt/zammad zammad-redis: - image: redis:6.2.5-alpine + image: redis:7.0.5-alpine restart: ${RESTART} zammad-scheduler: