From e4fdeafc8b3d350646c62e046863b93261b7d263 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Wed, 23 Oct 2024 01:57:47 +0200 Subject: [PATCH] build(Makefile): fix CONTAINER_NAME for unworxdb --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index a8c53d848..45ac0b8f2 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ export CONTAINER_COMMAND ?= podman export CONTAINER_BGRUN ?= $(CONTAINER_COMMAND) run -dit --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_CI ?= false @@ -200,6 +200,7 @@ well-known: static; .PHONY: db # HELP: clear and fill database. requires running postgres db: FRADRIVE_SERVICE=backend +db: CONTAINER_NAME=uniworxdb db: --image-build --containerized---db; # TODO (db-m-$MIGRATION-backend): apply migration (see src/Model/Migration/Definition.hs for list of available migrations) --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 ; \ fi ---image-run-%: CONTAINER_NAME = $(FRADRIVE_SERVICE) +--image-run-%: CONTAINER_NAME ?= $(FRADRIVE_SERVICE) --image-run-%: docker/$(FRADRIVE_SERVICE)/Dockerfile MOUNT_DIR=/mnt/fradrive; \ if [ "$(IN_CONTAINER)" == "true" ] ; then \