fix abra.sh

abra.sh

@@ -1,23 +1,23 @@
-export ENTRYPOINT_VERSION=v2
+export ENTRYPOINT_VERSION=v3
 export AUTO_WIZARD_VERSION=v2
 export PG_BACKUP_VERSION=v2
 
 get_setting_changes() {
-  /custom-entrypoint.sh "rails r 'puts JSON.pretty_generate(JSON.parse(Setting.all.select{ |setting| setting.state_current != setting.state_initial }.map { |setting| {name: setting.name, value: setting.state_current[\""value\""]} } .to_json))'"
+  /custom-entrypoint.sh "bundle exec rails r 'puts JSON.pretty_generate(JSON.parse(Setting.all.select{ |setting| setting.state_current != setting.state_initial }.map { |setting| {name: setting.name, value: setting.state_current[\""value\""]} } .to_json))'"
 }
 
 console() {
-  /custom-entrypoint.sh "rails c"
+  /custom-entrypoint.sh "bundle exec rails c"
 }
 
 rails_run() {
-  COMMAND="rails r \"$@\""
+  COMMAND="bundle exec rails r \"$@\""
   /custom-entrypoint.sh "$COMMAND"
 }
 
 init() {
   cp -f /opt/zammad/contrib/auto_wizard.json /tmp/auto_wizard.json
-  /custom-entrypoint.sh "rails zammad:setup:auto_wizard[/tmp/auto_wizard.json]"
+  /custom-entrypoint.sh "bundle exec rake zammad:setup:auto_wizard[/tmp/auto_wizard.json]"
 }
 
 enable_authentik_sso() {

compose.backup.yml

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

compose.yml

@@ -45,7 +45,7 @@ x-shared:
       SSO_PROVIDER_DOMAIN:
       IDP_SSO_TARGET_URL:
       IDP_SLO_SERVICE_URL:
-    image: ghcr.io/zammad/zammad:6.5.0-34
+    image: ghcr.io/zammad/zammad:7.1.1
     deploy:
       restart_policy:
         condition: on-failure
@@ -69,7 +69,7 @@ x-shared:
 
 services:
   zammad-elasticsearch:
-    image: elasticsearch:8.18.0
+    image: elasticsearch:9.4.3
     deploy:
       restart_policy:
         condition: on-failure
@@ -82,7 +82,7 @@ services:
       - elasticsearch-data:/usr/share/elasticsearch/data
     environment:
       discovery.type: single-node
-      xpack.security.enabled: 'false'
+      xpack.security.enabled: "false"
       ES_JAVA_OPTS: -Xms1g -Xmx1g
     healthcheck:
       #test: TODO
@@ -100,7 +100,7 @@ services:
 
   zammad-memcached:
     command: memcached -m 256M
-    image: memcached:1.6.38-alpine
+    image: memcached:1.6.42-alpine
     healthcheck:
       test: 'echo "version" | nc -vn -w 1 127.0.0.1 11211'
       interval: 30s
@@ -126,7 +126,7 @@ services:
     deploy:
       labels:
         - "traefik.enable=true"
-        - "traefik.docker.network=proxy"
+        - "traefik.swarm.network=proxy"
         - "traefik.http.services.${STACK_NAME}.loadbalancer.server.port=8080"
         - "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`${EXTRA_DOMAINS})"
         - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
@@ -134,7 +134,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=3.0.0+6.5.0-34"
+        - "coop-cloud.${STACK_NAME}.version=4.1.0+7.1.1"
         - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:8080"]
@@ -183,9 +183,17 @@ services:
       timeout: 10s
       retries: 10
       start_period: 5m
+    deploy:
+      restart_policy:
+        condition: on-failure
+      resources:
+        limits:
+          memory: 4G
+        reservations:
+          memory: 2G
 
   zammad-redis:
-    image: redis:7.4.3-alpine
+    image: redis:8.8.0-alpine
     deploy:
       restart_policy:
         condition: on-failure

entrypoint.sh

@@ -24,6 +24,7 @@ file_env() {
   unset "$fileVar"
 }
 
+unset POSTGRESQL_PASS  # neutralizes upstream image default
 file_env "POSTGRESQL_PASS"
 
 # https://github.com/zammad/zammad/blob/develop/contrib/docker/docker-entrypoint.sh

release/4.1.0+7.1.1

@@ -0,0 +1 @@
+Breaking change: Asciifolding and new search features are now available after reindexing via: zammad run rake zammad:searchindex:rebuild. For details, see zammad release notes.