From 03b1b493423c1f43c2abd85902eeb881cb99a8be Mon Sep 17 00:00:00 2001
From: Clemens <clemens.geibel@meissa-gmbh.de.de>
Date: Fri, 29 Sep 2023 09:53:58 +0200
Subject: [PATCH] Renamed c4k-jitsi web module

---
 .gitlab-ci.yml                                                | 2 +-
 build.py                                                      | 2 +-
 infrastructure/{app => web}/build.py                          | 4 ++--
 infrastructure/{app => web}/image/Dockerfile                  | 0
 infrastructure/{app => web}/image/resources/install-debug.sh  | 0
 infrastructure/{app => web}/image/resources/install.sh        | 0
 .../{app => web}/image/resources/settings-config.js           | 0
 infrastructure/{app => web}/test/.keep                        | 0
 src/main/resources/jitsi/deployment.yaml                      | 2 +-
 9 files changed, 5 insertions(+), 5 deletions(-)
 rename infrastructure/{app => web}/build.py (94%)
 rename infrastructure/{app => web}/image/Dockerfile (100%)
 rename infrastructure/{app => web}/image/resources/install-debug.sh (100%)
 rename infrastructure/{app => web}/image/resources/install.sh (100%)
 rename infrastructure/{app => web}/image/resources/settings-config.js (100%)
 rename infrastructure/{app => web}/test/.keep (100%)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a0203f5..b9d0679 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -112,4 +112,4 @@ jitsi-image-test-publish:
   <<: *tag_only
   stage: image
   script:
-    - cd infrastructure/app && pyb image publish
+    - cd infrastructure/web && pyb image publish
diff --git a/build.py b/build.py
index 0cc9df0..3a76add 100644
--- a/build.py
+++ b/build.py
@@ -22,7 +22,7 @@ def initialize(project):
         "release_primary_build_file": "project.clj",
         "release_secondary_build_files": [
             "package.json",
-            "infrastructure/app/build.py",
+            "infrastructure/web/build.py",
             "infrastructure/excalidraw-backend/build.py",
         ],
         "release_artifact_server_url": "https://repo.prod.meissa.de",
diff --git a/infrastructure/app/build.py b/infrastructure/web/build.py
similarity index 94%
rename from infrastructure/app/build.py
rename to infrastructure/web/build.py
index 19dd85a..55d584b 100644
--- a/infrastructure/app/build.py
+++ b/infrastructure/web/build.py
@@ -4,7 +4,7 @@ from pybuilder.core import task, init
 from ddadevops import *
 
 name = "c4k-jitsi"
-MODULE = "app"
+MODULE = "web"
 PROJECT_ROOT_PATH = "../.."
 version = "1.4.2-SNAPSHOT"
 
@@ -22,7 +22,7 @@ def initialize(project):
         "project_root_path": PROJECT_ROOT_PATH,
         "build_types": ["IMAGE"],
         "mixin_types": [],
-        "image_naming": "NAME_ONLY",
+        "image_naming": "NAME_AND_MODULE",
         "image_tag": f"{image_tag}",
     }
 
diff --git a/infrastructure/app/image/Dockerfile b/infrastructure/web/image/Dockerfile
similarity index 100%
rename from infrastructure/app/image/Dockerfile
rename to infrastructure/web/image/Dockerfile
diff --git a/infrastructure/app/image/resources/install-debug.sh b/infrastructure/web/image/resources/install-debug.sh
similarity index 100%
rename from infrastructure/app/image/resources/install-debug.sh
rename to infrastructure/web/image/resources/install-debug.sh
diff --git a/infrastructure/app/image/resources/install.sh b/infrastructure/web/image/resources/install.sh
similarity index 100%
rename from infrastructure/app/image/resources/install.sh
rename to infrastructure/web/image/resources/install.sh
diff --git a/infrastructure/app/image/resources/settings-config.js b/infrastructure/web/image/resources/settings-config.js
similarity index 100%
rename from infrastructure/app/image/resources/settings-config.js
rename to infrastructure/web/image/resources/settings-config.js
diff --git a/infrastructure/app/test/.keep b/infrastructure/web/test/.keep
similarity index 100%
rename from infrastructure/app/test/.keep
rename to infrastructure/web/test/.keep
diff --git a/src/main/resources/jitsi/deployment.yaml b/src/main/resources/jitsi/deployment.yaml
index 8d8c4d3..bf7abf4 100644
--- a/src/main/resources/jitsi/deployment.yaml
+++ b/src/main/resources/jitsi/deployment.yaml
@@ -68,7 +68,7 @@ spec:
             - name: JVB_TCP_HARVESTER_DISABLED
               value: "true"
         - name: web
-          image: domaindrivenarchitecture/c4k-jitsi
+          image: domaindrivenarchitecture/c4k-jitsi-web
           imagePullPolicy: IfNotPresent
           env:
             - name: PUBLIC_URL