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

build(Makefile): remove parallelization option of services

Browse Source
This commit is contained in:
Sarah Vaupel 2024-11-07 16:53:48 +01:00
parent 365b7024c7
commit 8bc133f0ed
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Makefile
View File

@ -24,7 +24,6 @@ export CONTAINER_ATTACHED
export SERVICE export SERVICE
export SERVICE_VARIANT ?= $(SERVICE) export SERVICE_VARIANT ?= $(SERVICE)
export SERVICE_PARALLEL ?= false
export JOB export JOB
export CONTAINER_CMD export CONTAINER_CMD
export SET_CONTAINER_CMD export SET_CONTAINER_CMD
@ -98,7 +97,6 @@ start:
.PHONY: %-backend .PHONY: %-backend
%-backend: SERVICE=backend %-backend: SERVICE=backend
%-backend: SERVICE_VARIANT=backend %-backend: SERVICE_VARIANT=backend
%-backend: SERVICE_PARALLEL=true
%-backend: CONTAINER_CMD=localhost/fradrive/backend %-backend: CONTAINER_CMD=localhost/fradrive/backend
%-backend: BASE_PORTS = "DEV_PORT_HTTP=3000" "DEV_PORT_HTTPS=3443" %-backend: BASE_PORTS = "DEV_PORT_HTTP=3000" "DEV_PORT_HTTPS=3443"
@ -174,18 +172,12 @@ lint-%: --act ;
--develop_%: PORTS = $(foreach PORT,$(BASE_PORTS),$(shell utils/next_free_port.pl $(PORT))) --develop_%: PORTS = $(foreach PORT,$(BASE_PORTS),$(shell utils/next_free_port.pl $(PORT)))
--develop_%: --ensure-develop --develop_%: --ensure-develop
DEVELOP=develop/`cat develop/.current` ; \ DEVELOP=develop/`cat develop/.current` ; \
if [[ "$(SERVICE_PARALLEL)" == "false" ]] ; then \ CONTAINER_IDENT=$(CF_PREFIX)$(SERVICE_VARIANT) ; \
CONTAINER_IDENT=$(CF_PREFIX)$(SERVICE_VARIANT) ; \
if [[ -e $${DEVELOP}/$${CONTAINER_IDENT} ]]; then \
>&2 echo "Another $* service is already running! Use \"make new-develop\" to start a new develop instance despite currently running services." ; \
exit 1 ; \
fi ; \
else \
I=`ls $${DEVELOP} | grep '$(SERVICE_VARIANT)' | sed 's/$(SERVICE_VARIANT)-//' | sort -n | tail -n1` ; \
J=$$(($${I}+1)) ; \
CONTAINER_IDENT=$(CF_PREFIX)$(SERVICE_VARIANT)-$${J} ; \
fi ; \
CONTAINER_FILE=$${DEVELOP}/$${CONTAINER_IDENT} ; \ CONTAINER_FILE=$${DEVELOP}/$${CONTAINER_IDENT} ; \
if [[ -e $${CONTAINER_FILE} ]]; then \
>&2 echo "Another $* service is already running! Use \"make new-develop\" to start a new develop instance despite currently running services." ; \
exit 1 ; \
fi ; \
echo "$(PORTS)" | sed 's/ /\n/g' > $${CONTAINER_FILE} ; \ echo "$(PORTS)" | sed 's/ /\n/g' > $${CONTAINER_FILE} ; \
$(MAKE) -- --$* CONTAINER_FILE=$${CONTAINER_FILE} CONTAINER_IDENT=$${CONTAINER_IDENT} $(MAKE) -- --$* CONTAINER_FILE=$${CONTAINER_FILE} CONTAINER_IDENT=$${CONTAINER_IDENT}