fraport/fradrive-old
fraport/fradrive-old
Archived
3
1
Fork 0
Code Issues 65 Pull Requests 5 Actions Packages Projects Releases 197 Wiki Activity

build(Makefile): do not always detach containers; introduce foreground and background container runs

Browse Source
This commit is contained in:
Sarah Vaupel 2024-10-18 18:55:30 +02:00
parent 0f990db1ea
commit db2a5cb45e
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile
View File

@ -2,7 +2,8 @@ SHELL=bash
# MAKE=make -d
export CONTAINER_COMMAND ?= podman
export CONTAINER_RUN ?= $(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 IN_CONTAINER ?= false
export IN_CI ?= false
@ -46,7 +47,7 @@ export LOGSIZE ?= 1024
# HELP: print out this help message
help:
@if [ -z "$$(which perl 2>/dev/null)" ] ; then \
$(CONTAINER_RUN) .:/mnt 'debian:12.5' '/mnt/utils/makehelp.pl' '/mnt/Makefile' ; \
$(CONTAINER_FGRUN) .:/mnt 'debian:12.5' '/mnt/utils/makehelp.pl' '/mnt/Makefile' ; \
else \
utils/makehelp.pl Makefile ; \
fi
@ -84,7 +85,7 @@ release:
MOUNT_DIR=/mnt/fradrive ; \
FRADRIVE_SERVICE=$* ; \
$(MAKE) -- --image-build FRADRIVE_SERVICE=$${FRADRIVE_SERVICE} ; \
$(CONTAINER_RUN) -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.$${FRADRIVE_SERVICE}.interactive.$$(date +'%Y-%m-%dT%H-%M-%S') fradrive/$${FRADRIVE_SERVICE}
##### GENERAL TARGETS #####
###########################
@ -237,7 +238,7 @@ serve-database: --containerized-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_RUN) --name fradrive.$(FRADRIVE_SERVICE).$$(date +'%Y-%m-%dT%H-%M-%S') fradrive/$(FRADRIVE_SERVICE) ; \
$(CONTAINER_BGRUN) --name fradrive.$(FRADRIVE_SERVICE).$$(date +'%Y-%m-%dT%H-%M-%S') fradrive/$(FRADRIVE_SERVICE) ; \
fi
##### DATABASE TARGETS #####
@ -263,7 +264,7 @@ serve-database: --containerized-database;
--containerized---start-minio:
MINIO_DIR=`mktemp` ; \
./utils/watchcontainerrun.sh "$(CONTAINER_COMMAND)" "$(CONTAINER_FILE)" "" "rm -rf $${MINIO_DIR}" & \
CONTAINER_ID=`$(CONTAINER_RUN) --name fradrive.minio.$$(date +'%Y-%m-%dT%H-%M-%S') $(MINIO_IMAGE) -- server $${MINIO_DIR}` ; \
CONTAINER_ID=`$(CONTAINER_BGRUN) --name fradrive.minio.$$(date +'%Y-%m-%dT%H-%M-%S') $(MINIO_IMAGE) -- server $${MINIO_DIR}` ; \
echo "CONTAINER_ID=$${CONTAINER_ID}" >> $(CONTAINER_FILE)
# --containerized-%-memcached: FRADRIVE_SERVICE=memcached