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

build(Makefile): always run containers interactively for better cancellation

Browse Source
This commit is contained in:
Sarah Vaupel 2024-10-06 02:05:53 +02:00
parent bae8ccc45a
commit 67e659521e
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@ -2,7 +2,6 @@ SHELL=bash
# MAKE=make -d
export CONTAINER_COMMAND ?= podman
export CONTAINER_INTERACTIVE
export CONTAINER_PORTS ?= --network=host
export IN_CONTAINER ?= false
export IN_CI ?= false
@ -83,7 +82,6 @@ release:
# - additionally provide targets for termination of running containers
.PHONY: serve
# HELP: serve frontend, backend, and database
serve: CONTAINER_INTERACTIVE=-it
serve:
$(MAKE) serve-database &
$(MAKE) serve-memcached &
@ -123,7 +121,6 @@ test: test-frontend test-backend i18n-check
.PHONY: serve-frontend
# HELP: serve frontend (watch file changes)
serve-frontend: CONTAINER_INTERACTIVE=-it
serve-frontend:
$(MAKE) -- --containerized---compile-frontend WATCH=--watch
@ -181,7 +178,6 @@ static: node_modules esbuild.config.mjs assets
.PHONY: serve-backend
# HELP: serve backend
serve-backend: CONTAINER_INTERACTIVE=-it
serve-backend:
DEV_PORT_HTTP=`docker/backend/dev_port.pl 3000 | tee .dev-port-http`; \
DEV_PORT_HTTPS=`docker/backend/dev_port.pl 3443 | tee .dev-port-https`; \
@ -230,7 +226,6 @@ PHONY: --db-%-backend
.PHONY: serve-database
# HELP: serve database
serve-database: CONTAINER_INTERACTIVE=-it
serve-database: --containerized-database;
--containerized-database: FRADRIVE_SERVICE=database
@ -289,7 +284,7 @@ image-rebuild-%:
if [ "$(IN_CONTAINER)" == "true" ] ; then \
$(MAKE) -- $* ; \
else \
$(CONTAINER_COMMAND) run $(CONTAINER_INTERACTIVE) -v $(PWD):$${MOUNT_DIR} $(CONTAINER_PORTS) --env IN_CONTAINER=true --env FRADRIVE_MAKE_TARGET=$* --env WATCH=$(WATCH) --name fradrive.$(FRADRIVE_SERVICE).$$(date +'%Y-%m-%dT%H-%M-%S') localhost/fradrive/$(FRADRIVE_SERVICE) ; \
$(CONTAINER_COMMAND) run -it -v $(PWD):$${MOUNT_DIR} $(CONTAINER_PORTS) --env IN_CONTAINER=true --env FRADRIVE_MAKE_TARGET=$* --env WATCH=$(WATCH) --name fradrive.$(FRADRIVE_SERVICE).$$(date +'%Y-%m-%dT%H-%M-%S') localhost/fradrive/$(FRADRIVE_SERVICE) ; \
fi
##### CONTAINER TARGETS #####