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

build(Makefile): add SRC option to ghci target

Browse Source
This commit is contained in:
Sarah Vaupel 2024-12-02 16:32:41 +01:00
parent 082dd74bb0
commit 0e605386cc
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -39,6 +39,7 @@ export STACK_CORES = $(shell echo $(($(CPU_CORES)/2)))
export BASE_PORTS export BASE_PORTS
export UNIWORXDB_OPTS ?= -cf export UNIWORXDB_OPTS ?= -cf
export PROD ?= false export PROD ?= false
export SRC
ifneq ($(PROD),true) ifneq ($(PROD),true)
export --DEVELOPMENT=--flag uniworx:dev export --DEVELOPMENT=--flag uniworx:dev
@ -245,6 +246,7 @@ endif
--env CONTAINER_FILE=$(CONTAINER_FILE) \ --env CONTAINER_FILE=$(CONTAINER_FILE) \
--env CONTAINER_NAME=$${CONTAINER_NAME} \ --env CONTAINER_NAME=$${CONTAINER_NAME} \
--env JOB=$(JOB) \ --env JOB=$(JOB) \
--env SRC=$(SRC) \
--name $${CONTAINER_NAME} \ --name $${CONTAINER_NAME} \
$${CONTAINER_CMD} \ $${CONTAINER_CMD} \
` ; \ ` ; \
@ -293,7 +295,7 @@ uniworx.cabal:
--start-frontend: --compile-frontend; --start-frontend: --compile-frontend;
--dependencies-frontend: node_modules assets static well-known; --dependencies-frontend: node_modules assets static well-known;
node_modules: package.json package-lock.json node_modules: package.json package-lock.json
npm ci --cache .npm --prefer-offline npm install --cache .npm --prefer-offline
package-lock.json: package.json package-lock.json: package.json
npm install --cache .npm --prefer-offline npm install --cache .npm --prefer-offline
assets: assets/favicons assets/icons; assets: assets/favicons assets/icons;
@ -315,7 +317,7 @@ well-known: static;
./bin/uniworxdb $(UNIWORXDB_OPTS) ./bin/uniworxdb $(UNIWORXDB_OPTS)
--shell-ghci: --shell-ghci:
stack exec -- ghci stack exec -- ghci $(SRC)
# --main-is uniworx:exe:uniworx # --main-is uniworx:exe:uniworx
# HELP(shell-{backend,frontend,memcached,minio,postgres}): enter (bash) shell inside a new container of a given service # HELP(shell-{backend,frontend,memcached,minio,postgres}): enter (bash) shell inside a new container of a given service

2
docker/backend/Dockerfile
View File

@ -32,7 +32,7 @@ RUN stack install yesod-bin
RUN stack install hpack RUN stack install hpack
ENV FRADRIVE_MAKE_TARGET=--start-backend 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 3000/tcp
EXPOSE 3443/tcp EXPOSE 3443/tcp