Merge pull request 'chore(deps): update elasticsearch docker tag to v9.5.5' (#14) from renovate/elasticsearch-9.x into master

Reviewed-on: #14

MAINTENANCE.md

@@ -0,0 +1,32 @@
+# Zammad Recipe Maintenance
+
+All contributions should be made via a pull request. This is to ensure a
+certain quality and consistency, that others can rely on.
+
+## Maintainer Responsibilities
+
+A recipe maintainer has the following responsibilities:
+
+- Respond to pull requests / issues within two weeks
+- Make image security updates within a week
+- Make image major updates every three months
+
+In order to fullfill these responsibilities a recipe maintainer:
+
+- Has to watch the repository (to get notifications)
+- Needs to make sure renovate is configured properly
+
+## Pull Requests
+
+A pull request can be merged if it is approved by at least one maintainer. For
+pull requests opened by a maintainer they need to be approved by another
+maintainer. Even though it is okay to merge a pull request with one approval, it
+is always better if all maintainers looked at the pull request and approved it.
+
+## Become a maintainer
+
+Everyone can apply to be a recipe maintainer:
+1. Watch the repository to always get updates
+2. Simply add your self to the list in the [README.md](./README.md) and open a new pull request with the change.
+3. Once the pull request gets merged you will be added to the [zammad maintainers team](https://git.coopcloud.tech/org/coop-cloud/teams/zammad-maintainers).
+4. Join the room [#cc-|-zammad-maintenance:matrix.org](#cc-|-zammad-maintenance:matrix.org) and chat to other maintainers.

README.md

@@ -4,8 +4,9 @@ Zammad is a free helpdesk or issue tracking system.
 
 <!-- metadata -->
 
+* **Maintainer**: Local-IT: [@moritz](https://git.coopcloud.tech/moritz), [@msimon](https://git.coopcloud.tech/simon), [@carla](https://git.coopcloud.tech/carla)
 * **Category**: Apps
-* **Status**: 0
+* **Status**: `stable`
 * **Image**: [`zammad`](https://hub.docker.com/r/zammad), 4, upstream
 * **Healthcheck**: Yes
 * **Backups**: No

abra.sh

@@ -3,21 +3,21 @@ 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:7.1.2
+    image: ghcr.io/zammad/zammad:7.2.2
     command: ["zammad-backup"]
     volumes:
       - zammad-backup:/var/tmp/zammad

compose.yml

@@ -45,7 +45,6 @@ x-shared:
       SSO_PROVIDER_DOMAIN:
       IDP_SSO_TARGET_URL:
       IDP_SLO_SERVICE_URL:
-    image: ghcr.io/zammad/zammad:7.1.2
     deploy:
       restart_policy:
         condition: on-failure
@@ -69,7 +68,7 @@ x-shared:
 
 services:
   zammad-elasticsearch:
-    image: elasticsearch:9.4.4
+    image: elasticsearch:9.5.5
     deploy:
       restart_policy:
         condition: on-failure
@@ -93,6 +92,7 @@ services:
 
   zammad-init:
     <<: *zammad-service
+    image: ghcr.io/zammad/zammad:7.2.2
     command: ["zammad-init"]
     depends_on:
       - zammad-postgresql
@@ -113,6 +113,7 @@ services:
 
   app:
     <<: *zammad-service
+    image: ghcr.io/zammad/zammad:7.2.2
     command: ["zammad-nginx"]
     #expose:
     #  - 8080
@@ -134,7 +135,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.4.0+7.2.2"
         - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:8080"]
@@ -168,7 +169,7 @@ services:
     secrets:
       - db_password
     healthcheck:
-      test: ["CMD", "pg_isready", "-U", "zammad"]
+      test: ["CMD", "pg_isready", "-U", "zammad", "-d", "zammad_production"]
       interval: 30s
       timeout: 10s
       retries: 10
@@ -176,6 +177,7 @@ services:
 
   zammad-railsserver:
     <<: *zammad-service
+    image: ghcr.io/zammad/zammad:7.2.2
     command: ["zammad-railsserver"]
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:3000"]
@@ -193,7 +195,7 @@ services:
           memory: 2G
 
   zammad-redis:
-    image: redis:8.10.0-alpine
+    image: redis:8.10.2-alpine
     deploy:
       restart_policy:
         condition: on-failure
@@ -208,6 +210,7 @@ services:
 
   zammad-scheduler:
     <<: *zammad-service
+    image: ghcr.io/zammad/zammad:7.2.2
     command: ["zammad-scheduler"]
     healthcheck:
       test: 'grep -a "background-worker.rb" -r /proc/[0-9]*/cmdline'
@@ -218,6 +221,7 @@ services:
 
   zammad-websocket:
     <<: *zammad-service
+    image: ghcr.io/zammad/zammad:7.2.2
     command: ["zammad-websocket"]
     healthcheck:
       test: 'ruby -rsocket -e "s = TCPSocket.new(''localhost'', 6042); s.close"'

renovate.json

@@ -0,0 +1,6 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:recommended"
+  ]
+}