From f27da5dc11d1017d5415cb1f557b8785cd754611 Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <sarah.vaupel@uniworx.de>
Date: Sun, 13 Oct 2024 00:49:27 +0200
Subject: [PATCH] build(Makefile): work on start

---
 Makefile | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 4382ae0e5..d0369e8e2 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ SHELL=bash
 # MAKE=make -d
 
 export CONTAINER_COMMAND ?= podman
-export CONTAINER_RUN ?= $(CONTAINER_COMMAND) run -it -d --network=host
+export CONTAINER_RUN ?= $(CONTAINER_COMMAND) run -dit --network=host
 
 export IN_CONTAINER ?= false
 export IN_CI ?= false
@@ -267,6 +267,10 @@ serve-database: --containerized-database;
 --containerized-%-memcached: --image-build
 	$(MAKE) -- --image-run-$*-memcached
 
+--containerized-%-database: FRADRIVE_SERVICE=database
+--containerized-%-database: --image-build
+	$(MAKE) -- --image-run-$*-database
+
 .PHONY: image-rebuild
 # HELP: rebuild the stated docker image (frontend, backend, database instead of %)
 image-rebuild-%:
@@ -283,7 +287,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-%:
+--image-run-%: docker/$(FRADRIVE_SERVICE)/Dockerfile
 	MOUNT_DIR=/mnt/fradrive; \
 	if [ "$(IN_CONTAINER)" == "true" ] ; then \
 	  $(MAKE) -- $* ; \
@@ -338,14 +342,18 @@ start: develop start-database start-memcached start-minio start-frontend start-b
 
 start-database:  BASE_PORTS = "PGPORT=5432"
 start-database:  SINGLETON = true
+
 start-memcached: BASE_PORTS = "MEMCACHED_PORT=11211"
 start-memcached: SINGLETON = true
+
 start-minio:     BASE_PORTS = "UPLOAD_S3_PORT=9000"
 start-minio:     SINGLETON = true
 
 start-backend:   BASE_PORTS = "DEV_PORT_HTTP=3000" "DEV_PORT_HTTPS=3443"
 start-backend:   SINGLETON = false
+
 start-hoogle:    BASE_PORT = "HOOGLE_PORT=8081"
+start-hoogle:    SINGLETON=true
 
 start-frontend:  SINGLETON = false
 start-frontend:  WATCH = true
@@ -375,12 +383,8 @@ start-%: --ensure-develop
 	HOOGLE_PORT=`cat $(CONTAINER_FILE) | grep 'HOOGLE_PORT=' | sed 's/HOOGLE_PORT=//'` ; \
 	./utils/watchrun.sh "$(CONTAINER_FILE)" ./hoogle.sh
 
---containerized---start-database: FRADRIVE_SERVICE=database
-# port forwarding is disabled in --network=host mode; nevertheless it is stated here for documentation reasons
---containerized---start-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_RUN) --name fradrive.$(FRADRIVE_SERVICE).$$(date +'%Y-%m-%dT%H-%M-%S') fradrive/$(FRADRIVE_SERVICE) ; \
-	fi
+# --start-database: docker/database/initdb.sh docker/database/pg_hba.conf docker/database/postgresql.conf docker/database/schema.sql;
+#	./utils/watchrun.sh "$(CONTAINER_FILE)" 
 
 # TODO: mkdir inside develop/$(DATE)/minio instead of mktemp
 # TODO: remove dir in stop-minio