merge conflict fixed & new jitsi versions

infrastructure/web/image/Dockerfile

@@ -1,4 +1,4 @@
-FROM jitsi/web:stable-8960-1
+FROM jitsi/web:stable-9111
 
 # Prepare Configuration
 ADD resources /tmp

src/main/cljc/dda/c4k_jitsi/jitsi.cljc

@@ -1,17 +1,4 @@
 (ns dda.c4k-jitsi.jitsi
-<<<<<<< HEAD
- (:require
-  [clojure.spec.alpha :as s]
-  #?(:cljs [shadow.resource :as rc])
-  #?(:clj [orchestra.core :refer [defn-spec]]
-     :cljs [orchestra.core :refer-macros [defn-spec]])
-  [dda.c4k-common.yaml :as yaml]
-  [dda.c4k-common.common :as cm]
-  [dda.c4k-common.ingress :as ing]
-  [dda.c4k-common.base64 :as b64]
-  [dda.c4k-common.predicate :as cp]
-  #?(:cljs [dda.c4k-common.macros :refer-macros [inline-resources]])))
-=======
   (:require
    [clojure.spec.alpha :as s]
    #?(:clj [orchestra.core :refer [defn-spec]]
@@ -22,7 +9,6 @@
    [dda.c4k-common.base64 :as b64]
    [dda.c4k-common.predicate :as cp]
    #?(:cljs [dda.c4k-common.macros :refer-macros [inline-resources]])))
->>>>>>> 89de4ed0a5b1247d387b28aebbbd357599264480
 
 (s/def ::fqdn cp/fqdn-string?)
 (s/def ::issuer cp/letsencrypt-issuer?)

src/main/resources/jitsi/deployment.yaml

@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
         - name: jicofo
-          image: jitsi/jicofo:stable-8960-1
+          image: jitsi/jicofo:stable-9111
           imagePullPolicy: IfNotPresent
           env:
             - name: XMPP_SERVER
@@ -37,7 +37,7 @@ spec:
             - name: TZ
               value: Europe/Berlin
         - name: prosody
-          image: jitsi/prosody:stable-8960-1
+          image: jitsi/prosody:stable-9111
           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-8960-1
+          image: jitsi/jvb:stable-9111
           imagePullPolicy: IfNotPresent
           env:
             - name: PUBLIC_URL
@@ -132,7 +132,7 @@ spec:
             - name: TZ
               value: Europe/Berlin
         - name: etherpad
-          image: etherpad/etherpad:1.9.3
+          image: etherpad/etherpad:1.9.4
           env:
             - name: XMPP_SERVER
               value: localhost