From 2ef6f401618850f1dc18b5e08033908254e8a475 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Tue, 2 Jan 2024 12:39:45 +0100
Subject: [PATCH] Implement branding with folders 'config-all',
 'config-webapp', 'config-backend'

---
 deployment/src/docker/backend.Dockerfile     | 3 ++-
 deployment/src/docker/maintenance.Dockerfile | 7 ++++---
 deployment/src/docker/webapp.Dockerfile      | 5 +++--
 webapp/Dockerfile                            | 1 +
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/deployment/src/docker/backend.Dockerfile b/deployment/src/docker/backend.Dockerfile
index 0bf1c2cc1..800446bec 100644
--- a/deployment/src/docker/backend.Dockerfile
+++ b/deployment/src/docker/backend.Dockerfile
@@ -25,7 +25,8 @@ ARG CONFIGURATION=example
 # COPY configurations/${CONFIGURATION}/branding/email/ src/middleware/helpers/email/
 
 # copy public constants and email templates into the Docker image to brand it
-COPY configurations/${CONFIGURATION}/branding/config/ src/branding/
+COPY configurations/${CONFIGURATION}/branding/config-all/ src/branding/
+COPY configurations/${CONFIGURATION}/branding/config-backend/ src/branding/
 COPY configurations/${CONFIGURATION}/branding/email/ src/middleware/helpers/email/
 
 ##################################################################################
diff --git a/deployment/src/docker/maintenance.Dockerfile b/deployment/src/docker/maintenance.Dockerfile
index 34f529b2d..2a9c48266 100644
--- a/deployment/src/docker/maintenance.Dockerfile
+++ b/deployment/src/docker/maintenance.Dockerfile
@@ -13,9 +13,10 @@ ARG CONFIGURATION=example
 
 # copy public constants into the Docker image to brand it
 COPY configurations/${CONFIGURATION}/branding/static/ static/
-# COPY configurations/${CONFIGURATION}/branding/constants/ constants/
-# RUN /bin/sh -c 'cd constants && for f in *.ts; do mv -- "$f" "${f%.ts}.js"; done'
-COPY configurations/${CONFIGURATION}/branding/config/ branding/
+# Wolle: COPY configurations/${CONFIGURATION}/branding/constants/ constants/
+# Wolle: RUN /bin/sh -c 'cd constants && for f in *.ts; do mv -- "$f" "${f%.ts}.js"; done'
+COPY configurations/${CONFIGURATION}/branding/config-all/ branding/
+COPY configurations/${CONFIGURATION}/branding/config-webapp/ branding/
 RUN /bin/sh -c 'cd branding && for f in *.ts; do mv -- "$f" "${f%.ts}.js"; done'
 
 # locales
diff --git a/deployment/src/docker/webapp.Dockerfile b/deployment/src/docker/webapp.Dockerfile
index ee5796382..7bab11b0f 100644
--- a/deployment/src/docker/webapp.Dockerfile
+++ b/deployment/src/docker/webapp.Dockerfile
@@ -13,8 +13,9 @@ ARG CONFIGURATION=example
 
 # copy public constants into the Docker image to brand it
 COPY configurations/${CONFIGURATION}/branding/static/ static/
-# Wolle COPY configurations/${CONFIGURATION}/branding/constants/ constants/
-COPY configurations/${CONFIGURATION}/branding/config/ branding/
+# Wolle: COPY configurations/${CONFIGURATION}/branding/constants/ constants/
+COPY configurations/${CONFIGURATION}/branding/config-all/ branding/
+COPY configurations/${CONFIGURATION}/branding/config-webapp/ branding/
 RUN /bin/sh -c 'cd branding && for f in *.ts; do mv -- "$f" "${f%.ts}.js"; done'
 COPY configurations/${CONFIGURATION}/branding/locales/html/ locales/html/
 COPY configurations/${CONFIGURATION}/branding/assets/styles/imports/ assets/styles/imports/
diff --git a/webapp/Dockerfile b/webapp/Dockerfile
index c58fec40c..7dd911fe3 100644
--- a/webapp/Dockerfile
+++ b/webapp/Dockerfile
@@ -97,6 +97,7 @@ COPY --from=build ${DOCKER_WORKDIR}/nuxt.config.js ./nuxt.config.js
 # Copy static files
 # TODO - this seems not be needed anymore for the new rebranding
 # TODO - this should be one Folder containign all stuff needed to be copied
+# Wolle: what shall happen here?
 COPY --from=build ${DOCKER_WORKDIR}/config/ ./config/
 COPY --from=build ${DOCKER_WORKDIR}/constants ./constants
 COPY --from=build ${DOCKER_WORKDIR}/static ./static