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

build(Makefile): fix CONTAINER_NAME for unworxdb

Browse Source
This commit is contained in:
Sarah Vaupel 2024-10-23 01:57:47 +02:00
parent 72301adfe3
commit e4fdeafc8b
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -7,7 +7,7 @@ export CONTAINER_COMMAND ?= podman
export CONTAINER_BGRUN ?= $(CONTAINER_COMMAND) run -dit --network=host export CONTAINER_BGRUN ?= $(CONTAINER_COMMAND) run -dit --network=host
export CONTAINER_FGRUN ?= $(CONTAINER_COMMAND) run -it --network=host export CONTAINER_FGRUN ?= $(CONTAINER_COMMAND) run -it --network=host
export CONTAINER_NAME = $(FRADRIVE_SERVICE) export CONTAINER_NAME ?= $(FRADRIVE_SERVICE)
export IN_CONTAINER ?= false export IN_CONTAINER ?= false
export IN_CI ?= false export IN_CI ?= false
@ -200,6 +200,7 @@ well-known: static;
.PHONY: db .PHONY: db
# HELP: clear and fill database. requires running postgres # HELP: clear and fill database. requires running postgres
db: FRADRIVE_SERVICE=backend db: FRADRIVE_SERVICE=backend
db: CONTAINER_NAME=uniworxdb
db: --image-build --containerized---db; db: --image-build --containerized---db;
# TODO (db-m-$MIGRATION-backend): apply migration (see src/Model/Migration/Definition.hs for list of available migrations) # TODO (db-m-$MIGRATION-backend): apply migration (see src/Model/Migration/Definition.hs for list of available migrations)
--db-backend: .stack --db-backend: .stack
@ -289,7 +290,7 @@ image-rebuild-%:
$(CONTAINER_COMMAND) build $(NO_CACHE) -v $(PWD):$${MOUNT_DIR} --env IN_CONTAINER=true --build-arg MOUNT_DIR=$${MOUNT_DIR} --build-arg PROJECT_DIR=$${PROJECT_DIR} --tag fradrive/$(FRADRIVE_SERVICE) --file $(PWD)/.Dockerfile ; \ $(CONTAINER_COMMAND) build $(NO_CACHE) -v $(PWD):$${MOUNT_DIR} --env IN_CONTAINER=true --build-arg MOUNT_DIR=$${MOUNT_DIR} --build-arg PROJECT_DIR=$${PROJECT_DIR} --tag fradrive/$(FRADRIVE_SERVICE) --file $(PWD)/.Dockerfile ; \
fi fi
--image-run-%: CONTAINER_NAME = $(FRADRIVE_SERVICE) --image-run-%: CONTAINER_NAME ?= $(FRADRIVE_SERVICE)
--image-run-%: docker/$(FRADRIVE_SERVICE)/Dockerfile --image-run-%: docker/$(FRADRIVE_SERVICE)/Dockerfile
MOUNT_DIR=/mnt/fradrive; \ MOUNT_DIR=/mnt/fradrive; \
if [ "$(IN_CONTAINER)" == "true" ] ; then \ if [ "$(IN_CONTAINER)" == "true" ] ; then \