From 9894abb29aa7f10111eb9870cc9b5d6114b93d4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Mon, 7 Jun 2021 19:03:55 +0200
Subject: [PATCH] Revert remove of '${DOCKER_WORKDIR}'

---
 backend/Dockerfile | 8 ++++----
 webapp/Dockerfile  | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/backend/Dockerfile b/backend/Dockerfile
index ecfd63f74..0ebdfb1eb 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -90,13 +90,13 @@ CMD /bin/sh -c "yarn run dev"
 FROM base as production
 
 # Copy "binary"-files from build image
-COPY --from=build ./dist ./dist
+COPY --from=build ${DOCKER_WORKDIR}/dist ./dist
 # Copy static files
 # TODO - externalize the uploads so we can copy the whole folder
-COPY --from=build ./public/img/ ./public/img/
-COPY --from=build ./public/providers.json ./public/providers.json
+COPY --from=build ${DOCKER_WORKDIR}/public/img/ ./public/img/
+COPY --from=build ${DOCKER_WORKDIR}/public/providers.json ./public/providers.json
 # Copy package.json for script definitions (lock file should not be needed)
-COPY --from=build ./package.json ./package.json
+COPY --from=build ${DOCKER_WORKDIR}/package.json ./package.json
 
 # Run command
 CMD /bin/sh -c "yarn run start"
diff --git a/webapp/Dockerfile b/webapp/Dockerfile
index 3e3b5765a..8d830a9d5 100644
--- a/webapp/Dockerfile
+++ b/webapp/Dockerfile
@@ -91,11 +91,11 @@ FROM base as production
 
 # TODO - do all copying with one COPY command to have one layer
 # Copy "binary"-files from build image
-COPY --from=build ./.nuxt ./.nuxt
-COPY --from=build ./node_modules ./node_modules
-COPY --from=build ./nuxt.config.js ./nuxt.config.js
+COPY --from=build ${DOCKER_WORKDIR}/.nuxt ./.nuxt
+COPY --from=build ${DOCKER_WORKDIR}/node_modules ./node_modules
+COPY --from=build ${DOCKER_WORKDIR}/nuxt.config.js ./nuxt.config.js
 # Copy package.json for script definitions (lock file should not be needed)
-COPY --from=build ./package.json ./package.json
+COPY --from=build ${DOCKER_WORKDIR}/package.json ./package.json
 
 # Run command
 CMD /bin/sh -c "yarn run start"