From e058d4009acea59c909907c9b6e7d84a8b4bc7f2 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Fri, 7 Jul 2023 11:55:42 +0200 Subject: [PATCH 1/3] fix docker file --- deployment/src/docker/backend.Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/deployment/src/docker/backend.Dockerfile b/deployment/src/docker/backend.Dockerfile index 2d8132d0c..a0b6e4ed4 100644 --- a/deployment/src/docker/backend.Dockerfile +++ b/deployment/src/docker/backend.Dockerfile @@ -12,9 +12,9 @@ FROM $APP_IMAGE_CODE as code ARG CONFIGURATION=example # copy public constants and email templates into the Docker image to brand it -COPY configurations/${CONFIGURATION}/branding/constants/emails.js src/config/ -COPY configurations/${CONFIGURATION}/branding/constants/logos.js src/config/ -COPY configurations/${CONFIGURATION}/branding/constants/metadata.js src/config/ +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/ ################################################################################## @@ -38,7 +38,7 @@ COPY --from=build ${DOCKER_WORKDIR}/build ./build COPY --from=build ${DOCKER_WORKDIR}/node_modules ./node_modules # TODO - externalize the uploads so we can copy the whole folder COPY --from=build ${DOCKER_WORKDIR}/public/img/ ./public/img/ -COPY --from=build ${DOCKER_WORKDIR}/public/providers.json ./public/providers.json +COPY --from=build ${DOCKER_WORKDIR}/public/providers.json ./build/public/providers.json # Copy package.json for script definitions (lock file should not be needed) COPY --from=build ${DOCKER_WORKDIR}/package.json ./package.json From 597a6f90151036e5aa1b17727f5bc96e602b1758 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Fri, 7 Jul 2023 11:56:00 +0200 Subject: [PATCH 2/3] start node in build/src --- backend/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/package.json b/backend/package.json index 647a2bc3c..d598ef736 100644 --- a/backend/package.json +++ b/backend/package.json @@ -10,7 +10,7 @@ "scripts": { "__migrate": "migrate --compiler 'ts:./src/db/compiler.ts' --migrations-dir ./src/db/migrations", "prod:migrate": "migrate --migrations-dir ./build/db/migrations --store ./build/db/migrate/store.js", - "start": "node build/", + "start": "node build/src/", "build": "tsc && ./scripts/build.copy.files.sh", "dev": "nodemon --exec ts-node src/ -e js,ts,gql", "dev:debug": "nodemon --exec babel-node --inspect=0.0.0.0:9229 src/ -e js,ts,gql", From 4fb884c9ebf3b64e3d50efd5c470b890fefc4065 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Fri, 7 Jul 2023 11:56:28 +0200 Subject: [PATCH 3/3] fix copy script --- backend/scripts/build.copy.files.sh | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/backend/scripts/build.copy.files.sh b/backend/scripts/build.copy.files.sh index 85022ba9b..9d17f46ae 100755 --- a/backend/scripts/build.copy.files.sh +++ b/backend/scripts/build.copy.files.sh @@ -1,24 +1,24 @@ #!/bin/sh # html files -mkdir -p build/middleware/helpers/email/templates/ -cp -r src/middleware/helpers/email/templates/*.html build/middleware/helpers/email/templates/ +mkdir -p build/src/middleware/helpers/email/templates/ +cp -r src/middleware/helpers/email/templates/*.html build/src/middleware/helpers/email/templates/ -mkdir -p build/middleware/helpers/email/templates/en/ -cp -r src/middleware/helpers/email/templates/en/*.html build/middleware/helpers/email/templates/en/ +mkdir -p build/src/middleware/helpers/email/templates/en/ +cp -r src/middleware/helpers/email/templates/en/*.html build/src/middleware/helpers/email/templates/en/ -mkdir -p build/middleware/helpers/email/templates/de/ -cp -r src/middleware/helpers/email/templates/de/*.html build/middleware/helpers/email/templates/de/ +mkdir -p build/src/middleware/helpers/email/templates/de/ +cp -r src/middleware/helpers/email/templates/de/*.html build/src/middleware/helpers/email/templates/de/ # gql files -mkdir -p build/schema/types/ -cp -r src/schema/types/*.gql build/schema/types/ +mkdir -p build/src/schema/types/ +cp -r src/schema/types/*.gql build/src/schema/types/ -mkdir -p build/schema/types/enum/ -cp -r src/schema/types/enum/*.gql build/schema/types/enum/ +mkdir -p build/src/schema/types/enum/ +cp -r src/schema/types/enum/*.gql build/src/schema/types/enum/ -mkdir -p build/schema/types/scalar/ -cp -r src/schema/types/scalar/*.gql build/schema/types/scalar/ +mkdir -p build/src/schema/types/scalar/ +cp -r src/schema/types/scalar/*.gql build/src/schema/types/scalar/ -mkdir -p build/schema/types/type/ -cp -r src/schema/types/type/*.gql build/schema/types/type/ \ No newline at end of file +mkdir -p build/src/schema/types/type/ +cp -r src/schema/types/type/*.gql build/src/schema/types/type/ \ No newline at end of file