fraport/fradrive-old
Archived
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build(Makefile): fix stack dependencies

Browse Source
This commit is contained in:
Sarah Vaupel 2024-10-18 20:10:31 +02:00
parent db2a5cb45e
commit 7227ee60e8
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@ -216,10 +216,14 @@ db: --image-build --containerized---db;
AVSPASS=${AVSPASS:-nopasswordset} ; \ AVSPASS=${AVSPASS:-nopasswordset} ; \
stack exec uniworxdb -- $(UNIWORXDB_OPTS) stack exec uniworxdb -- $(UNIWORXDB_OPTS)
.stack: stack.yaml stack.yaml.lock package.yaml .PHONY: .stack
.stack: .stack:
$(MAKE) -- --image-run---.stack if [ "$(IN_CONTAINER)" == "true" ] ; then \
--.stack: stack.yaml stack.yaml.lock $(MAKE) -- --.stack ; \
else \
$(MAKE) -- --image-run---.stack ; \
fi
--.stack: stack.yaml stack.yaml.lock package.yaml
stack build --fast --only-dependencies $(stackopts) stack build --fast --only-dependencies $(stackopts)
##### BACKEND TARGETS ##### ##### BACKEND TARGETS #####

2
docker/backend/Dockerfile
View File

@ -20,7 +20,7 @@ ENV HOME="${PROJECT_DIR}"
RUN mkdir -p "${PROJECT_DIR}/.stack" RUN mkdir -p "${PROJECT_DIR}/.stack"
ENV STACK_ROOT="${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 # RUN stack build yesod-bin
ENV FRADRIVE_MAKE_TARGET=serve-backend ENV FRADRIVE_MAKE_TARGET=serve-backend