From 8ca94d17a483aa6702ddf593f4cb3540eb7b8c7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Wed, 24 May 2023 16:00:48 +0200 Subject: [PATCH 1/2] Upgrade node version in '.nvmrc' files to v20.2.0 --- backend/.nvmrc | 2 +- webapp/.nvmrc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/.nvmrc b/backend/.nvmrc index cb77acbfe..58b8c2a00 100644 --- a/backend/.nvmrc +++ b/backend/.nvmrc @@ -1 +1 @@ -v19.4.0 \ No newline at end of file +v20.2.0 \ No newline at end of file diff --git a/webapp/.nvmrc b/webapp/.nvmrc index cb77acbfe..58b8c2a00 100644 --- a/webapp/.nvmrc +++ b/webapp/.nvmrc @@ -1 +1 @@ -v19.4.0 \ No newline at end of file +v20.2.0 \ No newline at end of file From 1b484b1e3e6ddae95243f8a259747920e4e5f9cb Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Fri, 2 Jun 2023 12:40:02 +0200 Subject: [PATCH 2/2] corrected path in braded images for backend build folder(former dist) --- deployment/src/docker/backend.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/src/docker/backend.Dockerfile b/deployment/src/docker/backend.Dockerfile index 6d458c9d7..2d8132d0c 100644 --- a/deployment/src/docker/backend.Dockerfile +++ b/deployment/src/docker/backend.Dockerfile @@ -34,7 +34,7 @@ FROM $APP_IMAGE_BASE as branded # TODO - do all copying with one COPY command to have one layer # Copy "binary"-files from build image -COPY --from=build ${DOCKER_WORKDIR}/dist ./dist +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/