Update deps and Zammad version (6.4.1)

docker/compose/bridge.yml

@@ -25,6 +25,7 @@ services:
       context: ../../
       dockerfile: ./apps/bridge-frontend/Dockerfile
     container_name: bridge-frontend
+    image: registry.gitlab.com/digiresilience/link/link-stack/bridge-frontend:${LINK_STACK_VERSION}
     restart: ${RESTART}
     ports:
       - 8006:3000
@@ -35,5 +36,6 @@ services:
       context: ../../
       dockerfile: ./apps/bridge-worker/Dockerfile
     container_name: bridge-worker
+    image: registry.gitlab.com/digiresilience/link/link-stack/bridge-worker:${LINK_STACK_VERSION}
     restart: ${RESTART}
     environment: *common-bridge-variables

docker/compose/signal-cli-rest-api.yml

@@ -1,7 +1,8 @@
 services:
   signal-cli-rest-api:
+    container_name: signal-cli-rest-api
+    build: ../signal-cli-rest-api
     image: registry.gitlab.com/digiresilience/link/link-stack/signal-cli-rest-api:develop
-    platform: linux/amd64
     environment:
       - MODE=json-rpc
     volumes:

docker/compose/zammad.yml

@@ -17,7 +17,6 @@ x-zammad-vars: &common-zammad-variables
 
 services:
   zammad-init:
-    platform: linux/x86_64
     container_name: zammad-init
     command: ["zammad-init"]
     depends_on:
@@ -47,7 +46,6 @@ services:
       <<: *common-global-variables
 
   zammad-nginx:
-    platform: linux/x86_64
     container_name: zammad-nginx
     command: ["zammad-nginx"]
     expose:
@@ -72,7 +70,6 @@ services:
       - zammad-var:/opt/zammad/var:ro
 
   zammad-railsserver:
-    platform: linux/x86_64
     container_name: zammad-railsserver
     command: ["zammad-railsserver"]
     depends_on:
@@ -103,7 +100,6 @@ services:
       - redis-data:/data
 
   zammad-scheduler:
-    platform: linux/x86_64
     container_name: zammad-scheduler
     command: ["zammad-scheduler"]
     depends_on:
@@ -123,7 +119,6 @@ services:
       - zammad-storage:/opt/zammad/storage
 
   zammad-websocket:
-    platform: linux/x86_64
     container_name: zammad-websocket
     command: ["zammad-websocket"]
     depends_on:

docker/memcached/Dockerfile

@@ -1 +1 @@
-FROM memcached:1.6.31-bookworm
+FROM memcached:1.6.34-bookworm

docker/nginx-proxy/Dockerfile

@@ -1 +1 @@
-FROM nginxproxy/nginx-proxy:1.6.1
+FROM nginxproxy/nginx-proxy:1.6.4

docker/opensearch-dashboards/Dockerfile

@@ -1 +1 @@
-FROM opensearchproject/opensearch-dashboards:2.17.0
+FROM opensearchproject/opensearch-dashboards:2.18.0

docker/opensearch/Dockerfile

@@ -1,2 +1,2 @@
-FROM opensearchproject/opensearch:2.17.0
+FROM opensearchproject/opensearch:2.18.0
 RUN /usr/share/opensearch/bin/opensearch-plugin install ingest-attachment -b

docker/redis/Dockerfile

@@ -1 +1 @@
-FROM redis:7.4.0-bookworm
+FROM redis:7.4.2-bookworm

docker/scripts/docker.js

@@ -17,8 +17,7 @@ const files = {
 
 const finalFiles = files[app]
   .map((file) => ['-f', `docker/compose/${file}.yml`]).flat();
-const finalCommand = command === "up" ? ["up", "-d"] : [command];
-
+const finalCommand = command === "up" ? ["up", "-d", "--remove-orphans"] : [command];
 const dockerCompose = spawn('docker', ['compose', '--env-file', '.env', ...finalFiles, ...finalCommand]);
 
 dockerCompose.stdout.on('data', (data) => {

docker/signal-cli-rest-api/Dockerfile

@@ -1 +1 @@
-FROM bbernhard/signal-cli-rest-api:0.89
+FROM bbernhard/signal-cli-rest-api:0.90

docker/zammad/Dockerfile

@@ -1,19 +1,25 @@
-ARG ZAMMAD_VERSION=6.3.1
+ARG ZAMMAD_VERSION=6.4.1
 
-FROM node:22-slim as node
+FROM node:22-slim AS node
 
 FROM zammad/zammad-docker-compose:${ZAMMAD_VERSION} AS builder
+USER root
 COPY --from=node /opt /opt
 COPY --from=node /usr/local/bin /usr/local/bin
+COPY --from=node /usr/local/lib /usr/local/lib
+COPY --from=node /usr/lib /usr/lib
 SHELL ["/bin/bash", "-e", "-o", "pipefail", "-c"]
+RUN npm install -g pnpm
+RUN pnpm --version
 WORKDIR ${ZAMMAD_DIR}
 RUN mkdir -p /opt/zammad/contrib/link/addons
 COPY addons contrib/link/addons
 COPY setup.rb contrib/link/setup.rb
 COPY install.rb contrib/link/install.rb
 
-USER root
 RUN sed -i '/script\/build\/cleanup\.sh/d' contrib/docker/setup.sh
+RUN sed -i '/touch db\/schema.rb/a ZAMMAD_SAFE_MODE=1 DATABASE_URL=postgresql:\/\/zammad:\/zammad bundle exec rails runner \/opt\/zammad\/contrib\/link\/install.rb' contrib/docker/setup.sh
+RUN cat contrib/docker/setup.sh
 RUN contrib/docker/setup.sh builder
 ARG EMBEDDED=false
 RUN if [ "$EMBEDDED" = "true" ] ; then sed -i '/proxy_set_header X-Forwarded-User "";/d' ${ZAMMAD_DIR}/contrib/nginx/zammad.conf; fi
@@ -22,11 +28,9 @@ RUN sed -i '/^[[:space:]]*# es config/a\
   bundle exec rails runner /opt/zammad/contrib/link/setup.rb\n\
   bundle exec rake zammad:package:migrate\n\
  ' /docker-entrypoint.sh
-RUN ZAMMAD_SAFE_MODE=1 DATABASE_URL=postgresql://zammad:/zammad bundle exec rails runner /opt/zammad/contrib/link/install.rb
-RUN ZAMMAD_SAFE_MODE=1 DATABASE_URL=postgresql://zammad:/zammad bundle exec rake assets:precompile
 
-FROM zammad/zammad-docker-compose:${ZAMMAD_VERSION} as runner
-USER ${ZAMMAD_USER}
+FROM zammad/zammad-docker-compose:${ZAMMAD_VERSION} AS runner
+USER zammad
 COPY --from=builder --chown=zammad:zammad ${ZAMMAD_DIR} ${ZAMMAD_DIR}
 COPY --from=builder /usr/local/bundle /usr/local/bundle
 COPY --from=builder /docker-entrypoint.sh /docker-entrypoint.sh