From ccf10748cd6e1e8d51b0e05e835f0911b8edcbbe Mon Sep 17 00:00:00 2001
From: Michael Jerger <michael.jerger@meissa-gmbh.de>
Date: Thu, 17 Aug 2023 18:07:15 +0200
Subject: [PATCH] rename

---
 .gitlab-ci.yml                                                  | 2 +-
 infrastructure/{docker-jitsi-web => app}/build.py               | 2 +-
 infrastructure/{docker-jitsi-web => app}/image/Dockerfile       | 0
 .../{docker-jitsi-web => app}/image/resources/install-debug.sh  | 0
 .../{docker-jitsi-web => app}/image/resources/install.sh        | 0
 .../image/resources/settings-config.js                          | 0
 6 files changed, 2 insertions(+), 2 deletions(-)
 rename infrastructure/{docker-jitsi-web => app}/build.py (95%)
 rename infrastructure/{docker-jitsi-web => app}/image/Dockerfile (100%)
 rename infrastructure/{docker-jitsi-web => app}/image/resources/install-debug.sh (100%)
 rename infrastructure/{docker-jitsi-web => app}/image/resources/install.sh (100%)
 rename infrastructure/{docker-jitsi-web => app}/image/resources/settings-config.js (100%)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 004c28f..e4279bc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -112,4 +112,4 @@ jitsi-image-test-publish:
   <<: *tag_only
   stage: image
   script:
-    - cd infrastructure/docker-jitsi-web && pyb image test publish
\ No newline at end of file
+    - cd infrastructure/app && pyb image publish
diff --git a/infrastructure/docker-jitsi-web/build.py b/infrastructure/app/build.py
similarity index 95%
rename from infrastructure/docker-jitsi-web/build.py
rename to infrastructure/app/build.py
index 04767a4..05b00d5 100644
--- a/infrastructure/docker-jitsi-web/build.py
+++ b/infrastructure/app/build.py
@@ -26,7 +26,7 @@ def initialize(project):
         "image_tag": f"{image_tag}",
     }
 
-    project.build_depends_on("ddadevops>=4.0.0")
+    project.build_depends_on("ddadevops>=4.7.0")
 
     build = DevopsImageBuild(project, input)
     build.initialize_build_dir()
diff --git a/infrastructure/docker-jitsi-web/image/Dockerfile b/infrastructure/app/image/Dockerfile
similarity index 100%
rename from infrastructure/docker-jitsi-web/image/Dockerfile
rename to infrastructure/app/image/Dockerfile
diff --git a/infrastructure/docker-jitsi-web/image/resources/install-debug.sh b/infrastructure/app/image/resources/install-debug.sh
similarity index 100%
rename from infrastructure/docker-jitsi-web/image/resources/install-debug.sh
rename to infrastructure/app/image/resources/install-debug.sh
diff --git a/infrastructure/docker-jitsi-web/image/resources/install.sh b/infrastructure/app/image/resources/install.sh
similarity index 100%
rename from infrastructure/docker-jitsi-web/image/resources/install.sh
rename to infrastructure/app/image/resources/install.sh
diff --git a/infrastructure/docker-jitsi-web/image/resources/settings-config.js b/infrastructure/app/image/resources/settings-config.js
similarity index 100%
rename from infrastructure/docker-jitsi-web/image/resources/settings-config.js
rename to infrastructure/app/image/resources/settings-config.js