diff --git a/deployment/src/docker/backend.Dockerfile b/deployment/src/docker/backend.Dockerfile index ccb0f9b2f..0bf1c2cc1 100644 --- a/deployment/src/docker/backend.Dockerfile +++ b/deployment/src/docker/backend.Dockerfile @@ -11,11 +11,21 @@ FROM $APP_IMAGE_CODE as code ARG CONFIGURATION=example +# alt Wolle # copy public constants and email templates into the Docker image to brand it +# COPY configurations/${CONFIGURATION}/branding/constants/emails.ts src/config/ +# COPY configurations/${CONFIGURATION}/branding/constants/logos.ts src/config/ +# COPY configurations/${CONFIGURATION}/branding/constants/metadata.ts src/config/ +# COPY configurations/${CONFIGURATION}/branding/email/ src/middleware/helpers/email/ + +# Wolle # copy public constants and email templates into the Docker image to brand it +# COPY configurations/${CONFIGURATION}/branding/constants/ src/config/ +# COPY configurations/${CONFIGURATION}/branding/constants/ src/constants/ +# # links.ts does only work in frontend, not backend +# RUN rm -Rf src/config/links.ts src/constants/links.ts +# 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/constants/ src/config/ -COPY configurations/${CONFIGURATION}/branding/constants/ src/constants/ -# links.ts does only work in frontend, not backend -RUN rm -Rf src/config/links.ts src/constants/links.ts +COPY configurations/${CONFIGURATION}/branding/config/ 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 95501252c..34f529b2d 100644 --- a/deployment/src/docker/maintenance.Dockerfile +++ b/deployment/src/docker/maintenance.Dockerfile @@ -13,8 +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/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/ +RUN /bin/sh -c 'cd branding && for f in *.ts; do mv -- "$f" "${f%.ts}.js"; done' # locales COPY configurations/${CONFIGURATION}/branding/locales/*.json locales/tmp/ diff --git a/deployment/src/docker/webapp.Dockerfile b/deployment/src/docker/webapp.Dockerfile index d811219c3..ee5796382 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/ -COPY configurations/${CONFIGURATION}/branding/constants/ constants/ -RUN /bin/sh -c 'cd constants && for f in *.ts; do mv -- "$f" "${f%.ts}.js"; done' +# Wolle COPY configurations/${CONFIGURATION}/branding/constants/ constants/ +COPY configurations/${CONFIGURATION}/branding/config/ 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/ COPY configurations/${CONFIGURATION}/branding/assets/fonts/ assets/fonts/