From 4d197732239bbd0250008dea17d37139795c073a Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <sarah.vaupel@uniworx.de>
Date: Tue, 12 Nov 2024 01:15:02 +0100
Subject: [PATCH] build(Makefile): resort to default .stack-work for all jobs

---
 Makefile                  | 16 ++--------------
 docker/backend/Dockerfile |  7 +++----
 2 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/Makefile b/Makefile
index e70f33218..5c3ab799c 100644
--- a/Makefile
+++ b/Makefile
@@ -68,7 +68,7 @@ help:
 clean:
 	rm -rf develop
 	-rm -rf node_modules .npm .cache assets/icons assets/favicons static well-known config/manifest.json
-	-rm -rf .job-*
+	-rm -rf .stack-work .stack-work.lock
 	-rm -rf bin .Dockerfile develop
 	-$(CONTAINER_COMMAND) container prune --force
 .PHONY: clean-all
@@ -106,24 +106,18 @@ start:
 %-backend: SERVICE=backend
 %-backend: SERVICE_VARIANT=backend
 %-backend: CONTAINER_CMD=localhost/fradrive/backend
-# %-backend: CONTAINER_INIT="$(STACK_INIT)"
-# %-backend: CONTAINER_CLEANUP="$(STACK_CLEANUP)"
 %-backend: BASE_PORTS = "DEV_PORT_HTTP=3000" "DEV_PORT_HTTPS=3443"
 
 .PHONY: %-uniworxdb
 %-uniworxdb: SERVICE=backend
 %-uniworxdb: SERVICE_VARIANT=uniworxdb
 %-uniworxdb: CONTAINER_CMD=localhost/fradrive/backend
-# %-uniworxdb: CONTAINER_INIT="$(STACK_INIT)"
-# %-uniworxdb: CONTAINER_CLEANUP="$(STACK_CLEANUP)"
 
 .PHONY: %-hoogle
 %-hoogle: SERVICE=backend
 %-hoogle: SERVICE_VARIANT=hoogle
 %-hoogle: BASE_PORTS = "HOOGLE_PORT=8081"
 %-hoogle: CONTAINER_CMD=localhost/fradrive/backend
-# %-hoogle: CONTAINER_INIT="$(STACK_INIT)"
-# %-hoogle: CONTAINER_CLEANUP="$(STACK_CLEANUP)"
 --start-hoogle:
 	HOOGLE_PORT=`cat $(CONTAINER_FILE) | grep 'HOOGLE_PORT=' | sed 's/HOOGLE_PORT=//'` ; \
 	stack $(STACK_CORES) hoogle -- server --local --port $${HOOGLE_PORT}
@@ -203,7 +197,6 @@ rebuild-%:
 ifeq "$(CONTAINER_CMD)" "localhost/fradrive/$(SERVICE)"
 	rm -f .Dockerfile
 	ln -s docker/$(SERVICE)/Dockerfile .Dockerfile
-	$(MAKE) .job-$(JOB)
 	MOUNT_DIR=/mnt/fradrive; \
 	PROJECT_DIR=/mnt/fradrive; \
 	if [ "$(IN_CI)" == "true" ] ; then \
@@ -223,9 +216,7 @@ else
 	:
 endif
 
---containerized:
-	$(MAKE) .job-$(JOB)
-	$(MAKE) -- --image-build
+--containerized: --image-build
 	DEVELOP=`cat develop/.current` ; \
 	./utils/watchcontainerrun.sh "$(CONTAINER_COMMAND)" "$(CONTAINER_FILE)" "$(CONTAINER_INIT)" "$(CONTAINER_CLEANUP)" & \
 	CONTAINER_NAME=fradrive.$(CURR_DEV).$(CONTAINER_IDENT) ; \
@@ -280,9 +271,6 @@ endif
 # HELP(test-backend): test backend
 --test-backend:
 	stack build $(STACK_CORES) --test --coverage --fast --flag uniworx:library-only $(--DEVELOPMENT)
-.PHONY: .job-%
-.job-%:
-	./utils/dirsymlink.pl ".job-$*" .stack-work
 
 # HELP(compile-frontend): compile frontend assets
 --compile-frontend: node_modules assets esbuild.config.mjs
diff --git a/docker/backend/Dockerfile b/docker/backend/Dockerfile
index 999c83c8c..21081debd 100644
--- a/docker/backend/Dockerfile
+++ b/docker/backend/Dockerfile
@@ -18,12 +18,11 @@ RUN if [ "${PROJECT_DIR}" != "${MOUNT_DIR}" ] ; then cp -r "${MOUNT_DIR}"/* "${P
 RUN mkdir -p "${PROJECT_DIR}/.stack"
 ENV STACK_ROOT="${PROJECT_DIR}/.stack"
 
-WORKDIR "${PROJECT_DIR}/.job-${JOB}"
-ENV HOME="${PROJECT_DIR}/.job-${JOB}"
+WORKDIR ${PROJECT_DIR}
+ENV HOME=${PROJECT_DIR}
 RUN make -- --dependencies-backend STACK_ROOT=${STACK_ROOT} IN_CONTAINER=true JOB=${JOB}
 
-RUN cd "${PROJECT_DIR}" && make .job-start
-RUN cd "${PROJECT_DIR}/.job-start" && STACK_ROOT=${STACK_ROOT} stack install yesod-bin
+RUN stack install yesod-bin
 
 ENV FRADRIVE_MAKE_TARGET=--start-backend
 ENTRYPOINT make -- ${FRADRIVE_MAKE_TARGET} STACK_ROOT="${STACK_ROOT}" IN_CONTAINER=true CONTAINER_FILE="${CONTAINER_FILE}" JOB="${JOB}"