From 50d58108ed8f28fd5e16129aef2939c4cbacd252 Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <sarah.vaupel@uniworx.de>
Date: Tue, 1 Oct 2024 09:56:40 +0200
Subject: [PATCH] build(Makefile): fix serve-backend; rename uniworxdb-target

---
 Makefile | 45 +++++++++++++++++++++++++--------------------
 1 file changed, 25 insertions(+), 20 deletions(-)

diff --git a/Makefile b/Makefile
index 19703432c..77524d580 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,9 @@
 SHELL=bash
+# MAKE=make -d
 
 export CONTAINER_COMMAND ?= podman
 export CONTAINER_INTERACTIVE
-export CONTAINER_PORTS
+export CONTAINER_PORTS ?= --network=host
 export IN_CONTAINER ?= false
 export IN_CI ?= false
 export WATCH
@@ -52,8 +53,8 @@ release:
 	./.gitlab-ci/version.pl -changelog CHANGELOG.md
 	git add CHANGELOG.md
 	VERSION=`.gitlab-ci/version.pl`
-	git tag ${VERSION}
-	git commit -m "chore(release): ${VERSION}"
+	git tag $${VERSION}
+	git commit -m "chore(release): $${VERSION}"
 	git push
 
 .PHONY: %-shell
@@ -203,19 +204,11 @@ serve-backend:
 --test-backend:
 	stack build --test --coverage --fast --flag uniworx:library-only $(stackopts)
 
-.PHONY: serve-database
-# HELP: serve database
-serve-database: CONTAINER_INTERACTIVE=-it
-serve-database: --containerized-database
-
-.PHONY: %-database
-%-database:
-	$(MAKE) -- --containerized---$*-database-backend
-.PHONY: --%-database
---%-database: .stack
+.PHONY: --db-%-backend
+--db-%-dev-backend: .stack
 	SERVER_SESSION_ACID_FALLBACK=${SERVER_SESSION_ACID_FALLBACK:-true} ; \
 	AVSPASS=${AVSPASS:-nopasswordset} ; \
-	stack exec uniworxdb -- $*
+	stack exec uniworxdb -- -$*
 
 .stack: stack.yaml stack.yaml.lock
 .stack:
@@ -232,18 +225,30 @@ serve-database: --containerized-database
 ###########################
 
 
-#############################
-##### CONTAINER TARGETS #####
+############################
+##### DATABASE TARGETS #####
+
+.PHONY: serve-database
+# HELP: serve database
+serve-database: CONTAINER_INTERACTIVE=-it
+serve-database: --containerized-database;
 
 .PHONY: --containerized-database
 --containerized-database: FRADRIVE_SERVICE=database
 # port forwarding is disabled in --network=host mode; nevertheless it is stated here for documentation reasons
---containerized-database: CONTAINER_PORTS=-p 5432:5432/tcp
---containerized-database: --image-build
+# --containerized-database: CONTAINER_PORTS=--network=host -p 5432:5432/tcp
+--containerized-database: docker/database/initdb.sh docker/database/pg_hba.conf docker/database/postgresql.conf docker/database/schema.sql --image-build
 	if [ "$(IN_CONTAINER)" == "false" ] ; then \
 	  $(CONTAINER_COMMAND) run -it $(CONTAINER_PORTS) --name fradrive.$(FRADRIVE_SERVICE).$$(date +'%Y-%m-%dT%H-%M-%S') fradrive/$(FRADRIVE_SERVICE) ; \
 	fi
 
+##### DATABASE TARGETS #####
+############################
+
+
+#############################
+##### CONTAINER TARGETS #####
+
 .PHONY: --containerized-%-frontend
 --containerized-%-frontend: FRADRIVE_SERVICE=frontend
 #--containerized-%-frontend: --image-build --image-run-%-frontend;
@@ -253,7 +258,7 @@ serve-database: --containerized-database
 .PHONY: --containerized-%-backend
 --containerized-%-backend: FRADRIVE_SERVICE=backend
 #--containerized-%-backend: --image-build --image-run-%-backend;
---containerized-%-backend: CONTAINER_PORTS=-p 127.0.0.1:$(DEV_PORT_HTTP):3000/tcp -p 127.0.0.1:$(DEV_PORT_HTTPS):3443/tcp
+# --containerized-%-backend: CONTAINER_PORTS=--network=host -p $(DEV_PORT_HTTP):3000 -p $(DEV_PORT_HTTPS):3443
 --containerized-%-backend: --image-build
 	$(MAKE) -- --image-run-$*-backend 
 
@@ -280,7 +285,7 @@ image-rebuild-%:
 	if [ "$(IN_CONTAINER)" == "true" ] ; then \
 	  $(MAKE) -- $* ; \
 	else \
-	  $(CONTAINER_COMMAND) run $(CONTAINER_INTERACTIVE) -v $(PWD):$${MOUNT_DIR} $(CONTAINER_PORTS) --env IN_CONTAINER=true --env FRADRIVE_MAKE_TARGET=$* --env WATCH=$(WATCH) --name fradrive.$(FRADRIVE_SERVICE).$$(date +'%Y-%m-%dT%H-%M-%S') fradrive/$(FRADRIVE_SERVICE) ; \
+	  $(CONTAINER_COMMAND) run $(CONTAINER_INTERACTIVE) -v $(PWD):$${MOUNT_DIR} $(CONTAINER_PORTS) --env IN_CONTAINER=true --env FRADRIVE_MAKE_TARGET=$* --env WATCH=$(WATCH) --name fradrive.$(FRADRIVE_SERVICE).$$(date +'%Y-%m-%dT%H-%M-%S') localhost/fradrive/$(FRADRIVE_SERVICE) ; \
 	fi
 
 ##### CONTAINER TARGETS #####