diff --git a/compose.backup.yml b/compose.backup.yml index 5b01cf0..24c076c 100644 --- a/compose.backup.yml +++ b/compose.backup.yml @@ -1,7 +1,7 @@ version: "3.8" services: zammad-backup: - image: ghcr.io/zammad/zammad:6.4.0-34 + image: ghcr.io/zammad/zammad:6.5.0-34 command: ["zammad-backup"] volumes: - zammad-backup:/var/tmp/zammad diff --git a/compose.yml b/compose.yml index 93ef2e2..24c6d3f 100644 --- a/compose.yml +++ b/compose.yml @@ -43,7 +43,7 @@ x-shared: SSO_PROVIDER_DOMAIN: IDP_SSO_TARGET_URL: IDP_SLO_SERVICE_URL: - image: ghcr.io/zammad/zammad:6.4.0-34 + image: ghcr.io/zammad/zammad:6.5.0-34 deploy: restart_policy: condition: on-failure @@ -55,11 +55,11 @@ x-shared: - zammad-redis entrypoint: /custom-entrypoint.sh configs: - - source: entrypoint - target: /custom-entrypoint.sh - mode: 0555 - - source: auto_wizard - target: /opt/zammad/contrib/auto_wizard.json + - source: entrypoint + target: /custom-entrypoint.sh + mode: 0555 + - source: auto_wizard + target: /opt/zammad/contrib/auto_wizard.json secrets: - db_password - smtp_password @@ -67,7 +67,7 @@ x-shared: services: zammad-elasticsearch: - image: bitnami/elasticsearch:8.16.1 + image: bitnami/elasticsearch:8.18.0 deploy: restart_policy: condition: on-failure @@ -86,7 +86,7 @@ services: timeout: 10s retries: 10 start_period: 5m - + zammad-init: <<: *zammad-service command: ["zammad-init"] @@ -96,7 +96,7 @@ services: zammad-memcached: command: memcached -m 256M - image: memcached:1.6.32-alpine + image: memcached:1.6.38-alpine healthcheck: test: 'echo "version" | nc -vn -w 1 127.0.0.1 11211' interval: 30s @@ -130,7 +130,7 @@ services: - "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect" - "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost=true" - "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}" - - "coop-cloud.${STACK_NAME}.version=2.0.0+6.4.0-34" + - "coop-cloud.${STACK_NAME}.version=2.1.0+6.5.0-34" - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}" healthcheck: test: ["CMD", "curl", "-f", "http://localhost:8080"] @@ -152,15 +152,15 @@ services: backupbot.backup: "${ENABLE_BACKUPS:-true}" backupbot.backup.pre-hook: "/pg_backup.sh backup" backupbot.backup.volumes.postgresql-data.path: "backup.sql" - backupbot.restore.post-hook: '/pg_backup.sh restore' + backupbot.restore.post-hook: "/pg_backup.sh restore" backupbot.backup.volumes.elasticsearch-data: "false" backupbot.backup.volumes.redis-data: "false" volumes: - postgresql-data:/var/lib/postgresql/data configs: - - source: pg_backup - target: /pg_backup.sh - mode: 0555 + - source: pg_backup + target: /pg_backup.sh + mode: 0555 secrets: - db_password healthcheck: @@ -180,9 +180,8 @@ services: retries: 10 start_period: 5m - zammad-redis: - image: redis:7.4.1-alpine + image: redis:7.4.3-alpine deploy: restart_policy: condition: on-failure @@ -199,7 +198,7 @@ services: <<: *zammad-service command: ["zammad-scheduler"] healthcheck: - test: 'ps x | grep "[b]ackground-worker.rb"' + test: 'grep -a "background-worker.rb" -r /proc/[0-9]*/cmdline' interval: 30s timeout: 10s retries: 10