From 86b1e76be6139a44303273e0bc6dc9c21c297873 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Thu, 24 Oct 2024 01:38:41 +0200 Subject: [PATCH 1/4] build(Makefile): more fixes on CONTAINER_NAME --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 7f4aa7bf3..bc3699005 100644 --- a/Makefile +++ b/Makefile @@ -252,6 +252,7 @@ db: --image-build --containerized---db; --containerized---db: --containerized-db-backend; --containerized-%-database: FRADRIVE_SERVICE=database +--containerized-%-database: CONTAINER_NAME=database --containerized-%-database: --image-build $(MAKE) -- --image-run-$*-database From 4c75196361492f90a2b83a1d2700b9d324d1b45a Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Thu, 24 Oct 2024 01:51:01 +0200 Subject: [PATCH 2/4] build(Makefile): revise container naming scheme --- Makefile | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/Makefile b/Makefile index bc3699005..a9618bf2a 100644 --- a/Makefile +++ b/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,21 +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: CONTAINER_NAME=database ---containerized-%-database: --image-build - $(MAKE) -- --image-run-$*-database # --containerized-%-minio: FRADRIVE_SERVICE=minio # --containerized-%-minio: --image-build @@ -263,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 @@ -272,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 @@ -298,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 From c4df5fc0a782814581ebbe78868ade54b7a5b602 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Thu, 24 Oct 2024 02:00:04 +0200 Subject: [PATCH 3/4] build(Makefile): improve hoogle container naming --- Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index a9618bf2a..8a0f7dda3 100644 --- a/Makefile +++ b/Makefile @@ -246,11 +246,13 @@ db: --image-build --containerized---db; $(MAKE) -- --image-run-$*-frontend --containerized-%-backend: FRADRIVE_SERVICE=backend ---containerized-%-backend: CONTAINER_NAME=backend +--containerized-%-backend: CONTAINER_NAME?=backend --containerized-%-backend: --image-build $(MAKE) -- --image-run-$*-backend +--containerized-%-hoogle: FRADRIVE_SERVICE=backend --containerized-%-hoogle: CONTAINER_NAME=hoogle ---containerized-%-hoogle: --containerized-%-hoogle-backend; +--containerized-%-hoogle: --image-build + $(MAKE) -- --image-run-$*--hoogle-backend # --containerized-%-minio: FRADRIVE_SERVICE=minio # --containerized-%-minio: --image-build From 57bb495c82acf9b45079bebd31a178719dcffaf7 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Thu, 24 Oct 2024 02:01:21 +0200 Subject: [PATCH 4/4] build(Makefile): fix hoogle target --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 8a0f7dda3..3aecdc6f1 100644 --- a/Makefile +++ b/Makefile @@ -252,7 +252,7 @@ db: --image-build --containerized---db; --containerized-%-hoogle: FRADRIVE_SERVICE=backend --containerized-%-hoogle: CONTAINER_NAME=hoogle --containerized-%-hoogle: --image-build - $(MAKE) -- --image-run-$*--hoogle-backend + $(MAKE) -- --image-run-$*-hoogle-backend # --containerized-%-minio: FRADRIVE_SERVICE=minio # --containerized-%-minio: --image-build