From 7227ee60e8b17a4518b18aee1d95676a5b7f39af Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <sarah.vaupel@uniworx.de>
Date: Fri, 18 Oct 2024 20:10:31 +0200
Subject: [PATCH] build(Makefile): fix stack dependencies

---
 Makefile                  | 10 +++++++---
 docker/backend/Dockerfile |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 48aec5d41..3ac10c8af 100644
--- a/Makefile
+++ b/Makefile
@@ -216,10 +216,14 @@ db: --image-build --containerized---db;
 	AVSPASS=${AVSPASS:-nopasswordset} ; \
 	stack exec uniworxdb -- $(UNIWORXDB_OPTS)
 
-.stack: stack.yaml stack.yaml.lock package.yaml
+.PHONY: .stack
 .stack:
-	$(MAKE) -- --image-run---.stack
---.stack: stack.yaml stack.yaml.lock
+	if [ "$(IN_CONTAINER)" == "true" ] ; then \
+	  $(MAKE) -- --.stack ; \
+	else \
+	  $(MAKE) -- --image-run---.stack ; \
+	fi
+--.stack: stack.yaml stack.yaml.lock package.yaml
 	stack build --fast --only-dependencies $(stackopts)
 
 ##### BACKEND TARGETS #####
diff --git a/docker/backend/Dockerfile b/docker/backend/Dockerfile
index 5921cfe54..d73795195 100644
--- a/docker/backend/Dockerfile
+++ b/docker/backend/Dockerfile
@@ -20,7 +20,7 @@ ENV HOME="${PROJECT_DIR}"
 RUN mkdir -p "${PROJECT_DIR}/.stack"
 ENV STACK_ROOT="${PROJECT_DIR}/.stack"
 
-RUN make .stack STACK_ROOT=${STACK_ROOT} IN_CONTAINER=true
+RUN make -- --.stack STACK_ROOT=${STACK_ROOT} IN_CONTAINER=true
 # RUN stack build yesod-bin
 
 ENV FRADRIVE_MAKE_TARGET=serve-backend