fraport/fradrive
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build(Makefile): improve container names for distinction between backend, hoogle and uniworxdb containers

Browse Source
This commit is contained in:
Sarah Vaupel 2024-10-23 01:50:40 +02:00
parent f669eed080
commit 72301adfe3
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Makefile
View File

@ -7,6 +7,8 @@ export CONTAINER_COMMAND ?= podman
export CONTAINER_BGRUN ?= $(CONTAINER_COMMAND) run -dit --network=host export CONTAINER_BGRUN ?= $(CONTAINER_COMMAND) run -dit --network=host
export CONTAINER_FGRUN ?= $(CONTAINER_COMMAND) run -it --network=host export CONTAINER_FGRUN ?= $(CONTAINER_COMMAND) run -it --network=host
export CONTAINER_NAME = $(FRADRIVE_SERVICE)
export IN_CONTAINER ?= false export IN_CONTAINER ?= false
export IN_CI ?= false export IN_CI ?= false
@ -243,9 +245,15 @@ db: --image-build --containerized---db;
--containerized-%-backend: FRADRIVE_SERVICE=backend --containerized-%-backend: FRADRIVE_SERVICE=backend
--containerized-%-backend: --image-build --containerized-%-backend: --image-build
$(MAKE) -- --image-run-$*-backend $(MAKE) -- --image-run-$*-backend
--containerized-%-hoogle: CONTAINER_NAME=hoogle
--containerized-%-hoogle: --containerized-%-hoogle-backend; --containerized-%-hoogle: --containerized-%-hoogle-backend;
--containerized---db: CONTAINER_NAME=uniworxdb
--containerized---db: --containerized-db-backend; --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: FRADRIVE_SERVICE=minio
# --containerized-%-minio: --image-build # --containerized-%-minio: --image-build
# $(MAKE) -- --image-run-$*-minio # $(MAKE) -- --image-run-$*-minio
@ -265,10 +273,6 @@ db: --image-build --containerized---db;
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.memcached.$$(date +'%Y-%m-%dT%H-%M-%S') $(MEMCACHED_IMAGE) --port=$${MEMCACHED_PORT}` ; \
printf "CONTAINER_ID=$${CONTAINER_ID}\nMEMCACHED_PORT=$${MEMCACHED_PORT}" >> $(CONTAINER_FILE) printf "CONTAINER_ID=$${CONTAINER_ID}\nMEMCACHED_PORT=$${MEMCACHED_PORT}" >> $(CONTAINER_FILE)
--containerized-%-database: FRADRIVE_SERVICE=database
--containerized-%-database: --image-build
$(MAKE) -- --image-run-$*-database
.PHONY: image-rebuild .PHONY: image-rebuild
# HELP(image-rebuild-{backend,frontend,database,memcached,minio}): force-rebuild the stated docker image # HELP(image-rebuild-{backend,frontend,database,memcached,minio}): force-rebuild the stated docker image
image-rebuild-%: image-rebuild-%:
@ -285,16 +289,17 @@ 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 ; \ $(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 fi
--image-run-%: CONTAINER_NAME = $(FRADRIVE_SERVICE)
--image-run-%: docker/$(FRADRIVE_SERVICE)/Dockerfile --image-run-%: docker/$(FRADRIVE_SERVICE)/Dockerfile
MOUNT_DIR=/mnt/fradrive; \ MOUNT_DIR=/mnt/fradrive; \
if [ "$(IN_CONTAINER)" == "true" ] ; then \ if [ "$(IN_CONTAINER)" == "true" ] ; then \
$(MAKE) -- $* ; \ $(MAKE) -- $* ; \
else \ else \
if [ -z "$(CONTAINER_FILE)" ] ; then \ 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) ; \ $(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) ; \
else \ else \
./utils/watchcontainerrun.sh "$(CONTAINER_COMMAND)" "$(CONTAINER_FILE)" & \ ./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.$(FRADRIVE_SERVICE).$$(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.$(CONTAINER_NAME).$$(date +'%Y-%m-%dT%H-%M-%S') localhost/fradrive/$(FRADRIVE_SERVICE)` ; \
echo "CONTAINER_ID=$${CONTAINER_ID}" >> "$(CONTAINER_FILE)"; \ echo "CONTAINER_ID=$${CONTAINER_ID}" >> "$(CONTAINER_FILE)"; \
fi \ fi \
fi fi