From 8bc133f0edd4e8a63cb0cf262369cc003f202a28 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Thu, 7 Nov 2024 16:53:48 +0100 Subject: [PATCH] build(Makefile): remove parallelization option of services --- Makefile | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index b23b94144..b8c047f07 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,6 @@ export CONTAINER_ATTACHED export SERVICE export SERVICE_VARIANT ?= $(SERVICE) -export SERVICE_PARALLEL ?= false export JOB export CONTAINER_CMD export SET_CONTAINER_CMD @@ -98,7 +97,6 @@ start: .PHONY: %-backend %-backend: SERVICE=backend %-backend: SERVICE_VARIANT=backend -%-backend: SERVICE_PARALLEL=true %-backend: CONTAINER_CMD=localhost/fradrive/backend %-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_%: --ensure-develop DEVELOP=develop/`cat develop/.current` ; \ - if [[ "$(SERVICE_PARALLEL)" == "false" ]] ; then \ - 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_IDENT=$(CF_PREFIX)$(SERVICE_VARIANT) ; \ 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} ; \ $(MAKE) -- --$* CONTAINER_FILE=$${CONTAINER_FILE} CONTAINER_IDENT=$${CONTAINER_IDENT}