From c5b802543eabdfb3e03a6b4fbfac4b0f57875491 Mon Sep 17 00:00:00 2001
From: Mirco <mirco.zachmann@meissa.de>
Date: Fri, 10 May 2024 09:05:45 +0200
Subject: [PATCH] version to 9457-2

---
 infrastructure/excalidraw-backend/image/Dockerfile        | 2 +-
 .../excalidraw-backend/image/resources/install.sh         | 1 +
 .../excalidraw-backend/image/resources/package.json       | 2 +-
 infrastructure/web/image/Dockerfile                       | 2 +-
 src/main/resources/jitsi/deployment.yaml                  | 8 ++++----
 src/test/cljc/dda/c4k_jitsi/jitsi_test.cljc               | 8 ++++----
 6 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/infrastructure/excalidraw-backend/image/Dockerfile b/infrastructure/excalidraw-backend/image/Dockerfile
index 0c7484c..e9c385d 100644
--- a/infrastructure/excalidraw-backend/image/Dockerfile
+++ b/infrastructure/excalidraw-backend/image/Dockerfile
@@ -1,5 +1,5 @@
 # Taken from: https://github.com/jitsi/excalidraw-backend
-FROM node:20.10.0-bookworm-slim
+FROM node:22-bookworm-slim
 
 WORKDIR /excalidraw-backend
 
diff --git a/infrastructure/excalidraw-backend/image/resources/install.sh b/infrastructure/excalidraw-backend/image/resources/install.sh
index 5952d3a..37171ae 100755
--- a/infrastructure/excalidraw-backend/image/resources/install.sh
+++ b/infrastructure/excalidraw-backend/image/resources/install.sh
@@ -12,5 +12,6 @@ function main() {
 source ./install_functions_debian.sh
 DEBIAN_FRONTEND=noninteractive DEBCONF_NOWARNINGS=yes main
 
+npm audit fix
 npm ci --omit=dev
 npm run build
diff --git a/infrastructure/excalidraw-backend/image/resources/package.json b/infrastructure/excalidraw-backend/image/resources/package.json
index 3ebfc65..9df36eb 100644
--- a/infrastructure/excalidraw-backend/image/resources/package.json
+++ b/infrastructure/excalidraw-backend/image/resources/package.json
@@ -20,7 +20,7 @@
         "cross-env": "^7.0.3",
         "debug": "4.3.4",
         "dotenv": "^16.0.0",
-        "express": "^4.18.2",
+        "express": "^4.19.2",
         "socket.io": "^4.7.2",
         "prom-client": "^15.0.0",
         "ts-node-dev": "^2.0.0",
diff --git a/infrastructure/web/image/Dockerfile b/infrastructure/web/image/Dockerfile
index 92bb39f..2a6a1b3 100644
--- a/infrastructure/web/image/Dockerfile
+++ b/infrastructure/web/image/Dockerfile
@@ -1,4 +1,4 @@
-FROM jitsi/web:stable-9111
+FROM jitsi/web:stable-9457-2
 
 # Prepare Configuration
 ADD resources /tmp
diff --git a/src/main/resources/jitsi/deployment.yaml b/src/main/resources/jitsi/deployment.yaml
index 60474e2..3914970 100644
--- a/src/main/resources/jitsi/deployment.yaml
+++ b/src/main/resources/jitsi/deployment.yaml
@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
         - name: jicofo
-          image: jitsi/jicofo:stable-9111
+          image: jitsi/jicofo:stable-9457-2
           imagePullPolicy: IfNotPresent
           env:
             - name: XMPP_SERVER
@@ -37,7 +37,7 @@ spec:
             - name: TZ
               value: Europe/Berlin
         - name: prosody
-          image: jitsi/prosody:stable-9111
+          image: jitsi/prosody:stable-9457-2
           imagePullPolicy: IfNotPresent
           env:
             - name: PUBLIC_URL
@@ -102,7 +102,7 @@ spec:
             - name: WHITEBOARD_COLLAB_SERVER_PUBLIC_URL
               value: REPLACE_EXCALIDRAW_BACKEND_URL
         - name: jvb
-          image: jitsi/jvb:stable-9111
+          image: jitsi/jvb:stable-9457-2
           imagePullPolicy: IfNotPresent
           env:
             - name: PUBLIC_URL
@@ -132,7 +132,7 @@ spec:
             - name: TZ
               value: Europe/Berlin
         - name: etherpad
-          image: etherpad/etherpad:1.9.4
+          image: etherpad/etherpad:2
           env:
             - name: XMPP_SERVER
               value: localhost
diff --git a/src/test/cljc/dda/c4k_jitsi/jitsi_test.cljc b/src/test/cljc/dda/c4k_jitsi/jitsi_test.cljc
index 0ad930b..9469a99 100644
--- a/src/test/cljc/dda/c4k_jitsi/jitsi_test.cljc
+++ b/src/test/cljc/dda/c4k_jitsi/jitsi_test.cljc
@@ -19,7 +19,7 @@
             :spec
             {:containers
              [{:name "jicofo",
-               :image "jitsi/jicofo:stable-9111",
+               :image "jitsi/jicofo:stable-9457-2",
                :imagePullPolicy "IfNotPresent",
                :env
                [{:name "XMPP_SERVER", :value "localhost"}
@@ -29,7 +29,7 @@
                 {:name "JICOFO_AUTH_PASSWORD", :valueFrom {:secretKeyRef {:name "jitsi-config", :key "JICOFO_AUTH_PASSWORD"}}}
                 {:name "TZ", :value "Europe/Berlin"}]}
               {:name "prosody",
-               :image "jitsi/prosody:stable-9111",
+               :image "jitsi/prosody:stable-9457-2",
                :imagePullPolicy "IfNotPresent",
                :env
                [{:name "PUBLIC_URL", :value "xy.xy.xy"}
@@ -62,7 +62,7 @@
                 {:name "WHITEBOARD_ENABLED", :value "true"}
                 {:name "WHITEBOARD_COLLAB_SERVER_PUBLIC_URL", :value "https://excalidraw-backend.xy.xy.xy"}]}
               {:name "jvb",
-               :image "jitsi/jvb:stable-9111",
+               :image "jitsi/jvb:stable-9457-2",
                :imagePullPolicy "IfNotPresent",
                :env
                [{:name "PUBLIC_URL", :value "xy.xy.xy"}
@@ -76,7 +76,7 @@
                 {:name "JICOFO_AUTH_PASSWORD", :valueFrom {:secretKeyRef {:name "jitsi-config", :key "JICOFO_AUTH_PASSWORD"}}}
                 {:name "TZ", :value "Europe/Berlin"}]}
               {:name "etherpad",
-               :image "etherpad/etherpad:1.9.4",
+               :image "etherpad/etherpad:2",
                :env
                [{:name "XMPP_SERVER", :value "localhost"}
                 {:name "JICOFO_COMPONENT_SECRET",