3 Commits

Author SHA1 Message Date
b6b52b6e9c chore: publish 2.1.0+6.5.0-34 release
All checks were successful
continuous-integration/drone/tag Build is passing
2025-05-27 16:25:24 +02:00
d7dbf76a53 fix saml logout url 2025-01-21 16:10:01 +01:00
f80f630304 Update .drone.yml 2025-01-08 10:09:13 -08:00
4 changed files with 19 additions and 20 deletions

View File

@ -32,7 +32,7 @@ steps:
from_secret: drone_abra-bot_token from_secret: drone_abra-bot_token
fork: true fork: true
repositories: repositories:
- coop-cloud/auto-recipes-catalogue-json - toolshed/auto-recipes-catalogue-json
trigger: trigger:
event: tag event: tag

View File

@ -29,7 +29,7 @@ SMTP_PORT=465
## SAML SSO ## ## SAML SSO ##
#SSO_PROVIDER_DOMAIN=authentik.example.com #SSO_PROVIDER_DOMAIN=authentik.example.com
#IDP_SSO_TARGET_URL=https://authentik.example.com/application/saml/zammad/sso/binding/init/ #IDP_SSO_TARGET_URL=https://authentik.example.com/application/saml/zammad/sso/binding/init/
#IDP_SLO_SERVICE_URL=https://authentik.example.com/application/saml/zammad/slo/binding/redirect/ #IDP_SLO_SERVICE_URL=https://zammad.example.com/auth/saml/slo
## Zammad internal backups ## Zammad internal backups

View File

@ -1,7 +1,7 @@
version: "3.8" version: "3.8"
services: services:
zammad-backup: zammad-backup:
image: ghcr.io/zammad/zammad:6.4.0-34 image: ghcr.io/zammad/zammad:6.5.0-34
command: ["zammad-backup"] command: ["zammad-backup"]
volumes: volumes:
- zammad-backup:/var/tmp/zammad - zammad-backup:/var/tmp/zammad

View File

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