fix abra.sh

abra.sh

@@ -3,11 +3,11 @@ 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() {
@@ -17,7 +17,7 @@ rails_run() {
 
 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() {
@@ -38,23 +38,6 @@ enable_authentik_sso() {
   abra app cmd -T $DOMAIN zammad-railsserver rails_run "$(printf "%q " $COMMAND)"
 }
 
-enable_rauthy_sso() {
-  COMMAND="
-    (u = User.find_by(id: 3)) && (u.login='$OID_ADMIN_UID') && u.save!;
-    Setting.set('auth_openid_connect', true);
-    Setting.set('auth_third_party_auto_link_at_inital_login', true);
-    Setting.set('auth_openid_connect_credentials', {
-        'display_name'=>'$ORGANIZATION',
-        'identifier'=>'$OID_SSO_IDENTIFIER',
-        'issuer'=>'$OID_SSO_ISSUER',
-        'uid_field'=>'$OID_SSO_UID_FIELD',
-        'scope'=>'$OID_SSO_SCOPES',
-        'pkce'=>'$OID_SSO_PKCE',
-        'callback_url'=>'$OID_SSO_CALLBACK_URL'})
-    "
-  abra app cmd -T $DOMAIN app rails_run "$(printf "%q " $COMMAND)"
-}
-
 set_logo() {
   LOGO_PATH="$1"
   abra app cp "$APP_NAME" "$LOGO_PATH" zammad-railsserver:/tmp/

compose.backup.yml

@@ -1,7 +1,7 @@
 version: "3.8"
 services:
   zammad-backup:
-    image: ghcr.io/zammad/zammad:7.1.2
+    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:7.1.2
+    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:9.4.4
+    image: elasticsearch:9.4.3
     deploy:
       restart_policy:
         condition: on-failure
@@ -100,7 +100,7 @@ services:
 
   zammad-memcached:
     command: memcached -m 256M
-    image: memcached:1.6.45-alpine
+    image: memcached:1.6.42-alpine
     healthcheck:
       test: 'echo "version" | nc -vn -w 1 127.0.0.1 11211'
       interval: 30s
@@ -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=4.1.1+7.1.2"
+        - "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"]
@@ -168,7 +168,7 @@ services:
     secrets:
       - db_password
     healthcheck:
-      test: ["CMD", "pg_isready", "-U", "zammad", "-d", "zammad_production"]
+      test: ["CMD", "pg_isready", "-U", "zammad"]
       interval: 30s
       timeout: 10s
       retries: 10
@@ -193,7 +193,7 @@ services:
           memory: 2G
 
   zammad-redis:
-    image: redis:8.10.0-alpine
+    image: redis:8.8.0-alpine
     deploy:
       restart_policy:
         condition: on-failure