Merge branch '145-build-system-rewrite' of gitea.uniworx.systems:fraport/fradrive into 145-build-system-rewrite

Makefile

@@ -91,7 +91,7 @@ release:
 	MOUNT_DIR=/mnt/fradrive ; \
 	FRADRIVE_SERVICE=$* ; \
 	$(MAKE) -- --image-build FRADRIVE_SERVICE=$${FRADRIVE_SERVICE} ; \
-	$(CONTAINER_FGRUN) -v $(PWD):$${MOUNT_DIR} --env IN_CONTAINER=true --env CONTAINER_FILE=$(CONTAINER_FILE) --entrypoint $(ENTRYPOINT) --name fradrive.$${FRADRIVE_SERVICE}.interactive.$$(date +'%Y-%m-%dT%H-%M-%S') fradrive/$${FRADRIVE_SERVICE}
+	$(CONTAINER_FGRUN) -v $(PWD):$${MOUNT_DIR} --env IN_CONTAINER=true --env CONTAINER_FILE=$(CONTAINER_FILE) --entrypoint $(ENTRYPOINT) --name fradrive.$(CURR_DEV).$${FRADRIVE_SERVICE}.shell fradrive/$${FRADRIVE_SERVICE}
 
 ##### GENERAL TARGETS #####
 ###########################
@@ -225,12 +225,13 @@ db: --image-build --containerized---db;
 ############################
 ##### DATABASE TARGETS #####
 
---containerized-database: FRADRIVE_SERVICE=database
-# port forwarding is disabled in --network=host mode; nevertheless it is stated here for documentation reasons
---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_BGRUN) --name fradrive.$(FRADRIVE_SERVICE).$$(date +'%Y-%m-%dT%H-%M-%S') fradrive/$(FRADRIVE_SERVICE) ; \
-	fi
+--containerized---db: CONTAINER_NAME=uniworxdb
+--containerized---db: --containerized-db-backend;
+
+--containerized-%-database: FRADRIVE_SERVICE=database
+--containerized-%-database: CONTAINER_NAME=database
+--containerized-%-database: docker/database/initdb.sh docker/database/pg_hba.conf docker/database/postgresql.conf docker/database/schema.sql --image-build
+	$(MAKE) -- --image-run-$*-database
 
 ##### DATABASE TARGETS #####
 ############################
@@ -240,20 +241,16 @@ db: --image-build --containerized---db;
 ##### CONTAINER TARGETS #####
 
 --containerized-%-frontend: FRADRIVE_SERVICE=frontend
+--containerized-%-frontend: CONTAINER_NAME=frontend
 --containerized-%-frontend: --image-build
 	$(MAKE) -- --image-run-$*-frontend
 
 --containerized-%-backend: FRADRIVE_SERVICE=backend
+--containerized-%-backend: CONTAINER_NAME=backend
 --containerized-%-backend: --image-build
 	$(MAKE) -- --image-run-$*-backend 
 --containerized-%-hoogle: CONTAINER_NAME=hoogle
 --containerized-%-hoogle: --containerized-%-hoogle-backend;
---containerized---db: CONTAINER_NAME=uniworxdb
---containerized---db: --containerized-db-backend;
-
---containerized-%-database: FRADRIVE_SERVICE=database
---containerized-%-database: --image-build
-	$(MAKE) -- --image-run-$*-database
 
 # --containerized-%-minio: FRADRIVE_SERVICE=minio
 # --containerized-%-minio: --image-build
@@ -262,7 +259,7 @@ db: --image-build --containerized---db;
 	UPLOAD_S3_PORT=`cat $(CONTAINER_FILE) | grep 'UPLOAD_S3_PORT=' | sed 's/UPLOAD_S3_PORT=//'`; \
 	MINIO_DIR=`mktemp` ; \
 	./utils/watchcontainerrun.sh "$(CONTAINER_COMMAND)" "$(CONTAINER_FILE)" "" "rm -rf $${MINIO_DIR}" & \
-	CONTAINER_ID=`$(CONTAINER_BGRUN) --name fradrive.minio.$$(date +'%Y-%m-%dT%H-%M-%S') $(MINIO_IMAGE) -- server $${MINIO_DIR} --address=:$${UPLOAD_S3_PORT}` ; \
+	CONTAINER_ID=`$(CONTAINER_BGRUN) --name fradrive.$(CURR_DEV).minio $(MINIO_IMAGE) -- server $${MINIO_DIR} --address=:$${UPLOAD_S3_PORT}` ; \
 	printf "CONTAINER_ID=$${CONTAINER_ID}\nUPLOAD_S3_PORT=$${UPLOAD_S3_PORT}\nMINIO_DIR=$${MINIO_DIR}" >> $(CONTAINER_FILE)
 
 # --containerized-%-memcached: FRADRIVE_SERVICE=memcached
@@ -271,7 +268,7 @@ db: --image-build --containerized---db;
 --containerized---start-memcached:
 	MEMCACHED_PORT=`cat $(CONTAINER_FILE) | grep 'MEMCACHED_PORT=' | sed 's/MEMCACHED_PORT=//'`; \
 	./utils/watchcontainerrun.sh "$(CONTAINER_COMMAND)" "$(CONTAINER_FILE)" & \
-	CONTAINER_ID=`$(CONTAINER_BGRUN) --name fradrive.memcached.$$(date +'%Y-%m-%dT%H-%M-%S') $(MEMCACHED_IMAGE) --port=$${MEMCACHED_PORT}` ; \
+	CONTAINER_ID=`$(CONTAINER_BGRUN) --name fradrive.$(CURR_DEV).memcached $(MEMCACHED_IMAGE) --port=$${MEMCACHED_PORT}` ; \
 	printf "CONTAINER_ID=$${CONTAINER_ID}\nMEMCACHED_PORT=$${MEMCACHED_PORT}" >> $(CONTAINER_FILE)
 
 .PHONY: image-rebuild
@@ -297,10 +294,10 @@ image-rebuild-%:
 	  $(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.$(CONTAINER_NAME).$$(date +'%Y-%m-%dT%H-%M-%S') localhost/fradrive/$(FRADRIVE_SERVICE) ; \
+	    $(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.$(CURR_DEV).$(CONTAINER_NAME) localhost/fradrive/$(FRADRIVE_SERVICE) ; \
 	  else \
 	  	./utils/watchcontainerrun.sh "$(CONTAINER_COMMAND)" "$(CONTAINER_FILE)" & \
-	    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.$(CONTAINER_NAME).$$(date +'%Y-%m-%dT%H-%M-%S') localhost/fradrive/$(FRADRIVE_SERVICE)` ; \
+	    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.$(CURR_DEV).$(CONTAINER_NAME) localhost/fradrive/$(FRADRIVE_SERVICE)` ; \
 	    echo "CONTAINER_ID=$${CONTAINER_ID}" >> "$(CONTAINER_FILE)"; \
 	  fi \
 	fi