From c83ed1fc392807493fc8513a9ad47c7bcfc8156c Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <sarah.vaupel@uniworx.de>
Date: Fri, 24 Jan 2025 02:39:28 +0100
Subject: [PATCH] build(Makefile): eliminate MOUNT_DIR in favor of PROJECT_DIR
 [skip ci]

---
 Makefile                   | 13 ++++---------
 docker/frontend/Dockerfile | 11 +----------
 2 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/Makefile b/Makefile
index afa323438..f8ffe0602 100644
--- a/Makefile
+++ b/Makefile
@@ -22,10 +22,10 @@ export CONTAINER_FILE
 export CONTAINER_IDENT
 export CF_PREFIX
 export DEVELOP
-export MOUNT_DIR=/mnt/fradrive
 export CONTAINER_ATTACHED
 export CONTAINER_INIT
 export CONTAINER_CLEANUP
+export PROJECT_DIR=/fradrive
 
 export SERVICE
 export SERVICE_VARIANT ?= $(SERVICE)
@@ -210,15 +210,10 @@ rebuild-%:
 ifeq "$(IMAGE)" "localhost/fradrive/$(SERVICE)"
 	rm -f .Dockerfile
 	ln -s docker/$(SERVICE)/Dockerfile .Dockerfile
-	MOUNT_DIR=/mnt/fradrive; \
-	PROJECT_DIR=/mnt/fradrive; \
-	if [ "$(IN_CI)" == "true" ] ; then \
-	  PROJECT_DIR=/fradrive; \
-	fi; \
+	PROJECT_DIR=/fradrive; \
 	if [ "$(IN_CONTAINER)" == "false" ] ; then \
 	  $(CONTAINER_COMMAND) build $(NO_CACHE) \
-	    -v $(PWD):$${MOUNT_DIR}:rw \
-		--build-arg MOUNT_DIR=$(MOUNT_DIR) \
+	    -v $(PWD):$${PROJECT_DIR}:rw \
 		--build-arg PROJECT_DIR=$${PROJECT_DIR} \
 	    --env IN_CONTAINER=true \
 		--env JOB=$(JOB) \
@@ -240,7 +235,7 @@ endif
 	    IMAGE=$(IMAGE) ; \
 	fi ; \
 	CONTAINER_ID=`$(CONTAINER_BGRUN) \
-	  -v $(PWD):$(MOUNT_DIR) \
+	  -v $(PWD):$(PROJECT_DIR):rw \
 	  --env IN_CONTAINER=true \
 	  --env CONTAINER_FILE=$(CONTAINER_FILE) \
 	  --env CONTAINER_NAME=$${CONTAINER_NAME} \
diff --git a/docker/frontend/Dockerfile b/docker/frontend/Dockerfile
index 53ccb5a54..9edc97a84 100644
--- a/docker/frontend/Dockerfile
+++ b/docker/frontend/Dockerfile
@@ -19,20 +19,11 @@ RUN if [ ! -z "${HTTP_PROXY}" ]; then npm config set proxy ${HTTP_PROXY}; fi
 RUN if [ ! -z "${FRAPORT_NOPROXY}" ]; then npm config set noproxy "${FRAPORT_NOPROXY}"; fi
 ENV NODE_EXTRA_CA_CERTS="/etc/ssl/certs/ca-certificates.crt"
 
-# locally these two should be identical, so that compilation results are written out into the file dir.
-# in CI-pipelines these two should be different, so that the container caches the compilation results.
-ARG MOUNT_DIR=/mnt/fradrive
 ENV PROJECT_DIR=/fradrive
 RUN mkdir -p ${PROJECT_DIR}
-RUN --mount=type=bind,source=.,target=${MOUNT_DIR},rw if [ "${PROJECT_DIR}" != "${MOUNT_DIR}" ] ; then cp -r ${MOUNT_DIR}/* ${PROJECT_DIR} ; fi
 WORKDIR ${PROJECT_DIR}
 ENV HOME=${PROJECT_DIR}
 
 RUN if [ ! -z "${NPM_CUSTOM_REGISTRY}" ]; then \
 printf 'registry=${NPM_CUSTOM_REGISTRY}' > .npmrc \
-; fi
-
-# RUN make -- --dependencies-frontend IN_CONTAINER=true
-
-# ENV FRADRIVE_MAKE_TARGET=--compile-frontend
-# ENTRYPOINT make -- ${FRADRIVE_MAKE_TARGET} IN_CONTAINER=true CHROME_BIN=${CHROME_BIN} PROJECT_DIR=${PROJECT_DIR}
\ No newline at end of file
+; fi
\ No newline at end of file