From 0e605386cc3997bb00ff45ac2313952700ed57b0 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Mon, 2 Dec 2024 16:32:41 +0100 Subject: [PATCH] build(Makefile): add SRC option to ghci target --- Makefile | 6 ++++-- docker/backend/Dockerfile | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index a105940f6..cfe1c5776 100644 --- a/Makefile +++ b/Makefile @@ -39,6 +39,7 @@ export STACK_CORES = $(shell echo $(($(CPU_CORES)/2))) export BASE_PORTS export UNIWORXDB_OPTS ?= -cf export PROD ?= false +export SRC ifneq ($(PROD),true) export --DEVELOPMENT=--flag uniworx:dev @@ -245,6 +246,7 @@ endif --env CONTAINER_FILE=$(CONTAINER_FILE) \ --env CONTAINER_NAME=$${CONTAINER_NAME} \ --env JOB=$(JOB) \ + --env SRC=$(SRC) \ --name $${CONTAINER_NAME} \ $${CONTAINER_CMD} \ ` ; \ @@ -293,7 +295,7 @@ uniworx.cabal: --start-frontend: --compile-frontend; --dependencies-frontend: node_modules assets static well-known; node_modules: package.json package-lock.json - npm ci --cache .npm --prefer-offline + npm install --cache .npm --prefer-offline package-lock.json: package.json npm install --cache .npm --prefer-offline assets: assets/favicons assets/icons; @@ -315,7 +317,7 @@ well-known: static; ./bin/uniworxdb $(UNIWORXDB_OPTS) --shell-ghci: - stack exec -- ghci + stack exec -- ghci $(SRC) # --main-is uniworx:exe:uniworx # HELP(shell-{backend,frontend,memcached,minio,postgres}): enter (bash) shell inside a new container of a given service diff --git a/docker/backend/Dockerfile b/docker/backend/Dockerfile index 4b4279d99..64872a038 100644 --- a/docker/backend/Dockerfile +++ b/docker/backend/Dockerfile @@ -32,7 +32,7 @@ RUN stack install yesod-bin RUN stack install hpack ENV FRADRIVE_MAKE_TARGET=--start-backend -ENTRYPOINT make -- ${FRADRIVE_MAKE_TARGET} STACK_ROOT="${STACK_ROOT}" IN_CONTAINER=true CONTAINER_FILE="${CONTAINER_FILE}" JOB="${JOB}" +ENTRYPOINT make -- ${FRADRIVE_MAKE_TARGET} STACK_ROOT="${STACK_ROOT}" IN_CONTAINER=true CONTAINER_FILE="${CONTAINER_FILE}" JOB="${JOB}" SRC="${SRC}" EXPOSE 3000/tcp EXPOSE 3443/tcp