Makefile

@@ -94,9 +94,14 @@ release:
 ############################################
 ##### UNIFIED FRONTEND/BACKEND TARGETS #####
 
-.PHONY: start
-# HELP: start database services, frontend and backend
-start: new-develop start-database start-memcached start-minio start-frontend start-backend;
+# TODO: rewrite all serve-targets to do the following:
+#   - return immediately
+#   - podman-run with -d (detached mode) and save the container id in a file
+#   - provide commands (make-targets?) to access logs of running containers
+#   - additionally provide targets for termination of running containers
+.PHONY: serve
+# HELP: serve frontend, backend, and database
+serve: serve-database serve-memcached serve-minio serve-frontend serve-backend;
 
 .PHONY: compile
 # HELP: compile frontend and backend
@@ -271,8 +276,7 @@ serve-database: --containerized-database;
 # 	$(MAKE) -- --image-run-$*-memcached
 --containerized---start-memcached:
 	./utils/watchcontainerrun.sh "$(CONTAINER_COMMAND)" "$(CONTAINER_FILE)" &
-	CONTAINER_ID=`$(CONTAINER_BGRUN) $(MEMCACHED_IMAGE)` ; \
-	echo "CONTAINER_ID=$${CONTAINER_ID}" >> $(CONTAINER_FILE)
+	$(CONTAINER_RUN) $(MEMCACHED_IMAGE)
 
 --containerized-%-database: FRADRIVE_SERVICE=database
 --containerized-%-database: --image-build
@@ -299,11 +303,11 @@ image-rebuild-%:
 	if [ "$(IN_CONTAINER)" == "true" ] ; then \
 	  $(MAKE) -- $* ; \
 	else \
-	  if [ -z "$(CONTAINER_FILE)" ] ; then \
-	    $(CONTAINER_FGRUN) -v $(PWD):$${MOUNT_DIR} --env IN_CONTAINER=true --env FRADRIVE_MAKE_TARGET=$* --env CONTAINER_FILE=$(CONTAINER_FILE) --env CONTAINER_FILE_CONTENT=$(CONTAINER_FILE_CONTENT) --env WATCH=$(WATCH) --name fradrive.$(FRADRIVE_SERVICE).$$(date +'%Y-%m-%dT%H-%M-%S') localhost/fradrive/$(FRADRIVE_SERVICE) ; \
-	  else \
-	    CONTAINER_ID=`$(CONTAINER_BGRUN) -v $(PWD):$${MOUNT_DIR} --env IN_CONTAINER=true --env FRADRIVE_MAKE_TARGET=$* --env CONTAINER_FILE=$(CONTAINER_FILE) --env CONTAINER_FILE_CONTENT=$(CONTAINER_FILE_CONTENT) --env WATCH=$(WATCH) --name fradrive.$(FRADRIVE_SERVICE).$$(date +'%Y-%m-%dT%H-%M-%S') localhost/fradrive/$(FRADRIVE_SERVICE)` ; \
+	  CONTAINER_ID=`$(CONTAINER_RUN) -v $(PWD):$${MOUNT_DIR} --env IN_CONTAINER=true --env FRADRIVE_MAKE_TARGET=$* --env CONTAINER_FILE=$(CONTAINER_FILE) --env CONTAINER_FILE_CONTENT=$(CONTAINER_FILE_CONTENT) --env WATCH=$(WATCH) --name fradrive.$(FRADRIVE_SERVICE).$$(date +'%Y-%m-%dT%H-%M-%S') localhost/fradrive/$(FRADRIVE_SERVICE)` ; \
+	  if [ -e "$(CONTAINER_FILE)" ] ; then \
 	    echo "CONTAINER_ID=$${CONTAINER_ID}" >> "$(CONTAINER_FILE)"; \
+	  else \
+	    $(CONTAINER_COMMAND) attach $${CONTAINER_ID} ; \
 	  fi \
 	fi
 
@@ -354,6 +358,8 @@ develop/.current:
 	$(SET_DEVELOP)
 	echo "$(DEVELOP)" > develop/.current
 
+start: develop start-database start-memcached start-minio start-frontend start-backend;
+
 start-database:  BASE_PORTS = "PGPORT=5432"
 start-database:  SINGLETON = true
 
@@ -368,7 +374,7 @@ start-backend:   SINGLETON = false
 start-backend:   static
 
 start-hoogle:    BASE_PORTS = "HOOGLE_PORT=8081"
-start-hoogle:    SINGLETON = true
+start-hoogle:    SINGLETON=true
 
 start-frontend:  SINGLETON = false
 start-frontend:  WATCH = false