diff --git a/Makefile b/Makefile index 56ebd24d2..48aec5d41 100644 --- a/Makefile +++ b/Makefile @@ -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