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

build(Makefile): fix typos in date and SERVICE_VARIANT

Browse Source
This commit is contained in:
Stephan Barth 2024-11-04 16:55:04 +01:00
parent 2efd49f21c
commit bdca968818
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Makefile
View File

@ -16,10 +16,7 @@ export CONTAINER_FILE
export CF_PREFIX export CF_PREFIX
export DEVELOP export DEVELOP
export MOUNT_DIR=/mnt/fradrive export MOUNT_DIR=/mnt/fradrive
# CONTAINER_RUNMODE variants: export CONTAINER_ATTACHED
# detached: detached container
# attached: attached container
export CONTAINER_RUNMODE ?= detached
export SERVICE export SERVICE
export SERVICE_VARIANT ?= $(SERVICE) export SERVICE_VARIANT ?= $(SERVICE)
@ -111,7 +108,7 @@ start: start-postgres start-memcached start-minio start-frontend start-backend;
.PHONY: %-frontend .PHONY: %-frontend
%-frontend: SERVICE=frontend %-frontend: SERVICE=frontend
%-backend: SERVICE_VARIANT=frontend %-frontend: SERVICE_VARIANT=frontend
%-frontend: CONTAINER_CMD=localhost/fradrive/frontend %-frontend: CONTAINER_CMD=localhost/fradrive/frontend
.PHONY: %-postgres .PHONY: %-postgres
@ -131,43 +128,44 @@ start: start-postgres start-memcached start-minio start-frontend start-backend;
.PHONY: start-% .PHONY: start-%
start-%: JOB=start start-%: JOB=start
start-%: CF_PREFIX = "start-" start-%: CF_PREFIX = start-
start-%: CONTAINER_ATTACHED = false
start-%: --act ; start-%: --act ;
.PHONY: compile-% .PHONY: compile-%
compile-%: JOB=compile compile-%: JOB=compile
compile-%: CF_PREFIX = "compile-" compile-%: CF_PREFIX = compile-
compile-%: CONTAINER_RUNMODE = "attached" compile-%: CONTAINER_ATTACHED = true
compile-%: --act ; compile-%: --act ;
.PHONY: test-% .PHONY: test-%
test-%: JOB=test test-%: JOB=test
test-%: CF_PREFIX = "test-" test-%: CF_PREFIX = test-
test-%: CONTAINER_RUNMODE = "attached" test-%: CONTAINER_ATTACHED = true
test-%: --act ; test-%: --act ;
.PHONY: lint-% .PHONY: lint-%
lint-%: JOB=lint lint-%: JOB=lint
lint-%: CF_PREFIX = "lint-" lint-%: CF_PREFIX = lint-
lint-%: CONTAINER_RUNMODE = "attached" lint-%: CONTAINER_ATTACHED = true
lint-%: --act ; lint-%: --act ;
--act: --develop_containerized; --act: --develop_containerized;
--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
$(SET_DEVELOP) DEVELOP=develop/`cat develop/.current` ; \
echo "$(SERVICE_PARALLEL)" ; \ echo "$(SERVICE_PARALLEL)" ; \
if [[ "$(SERVICE_PARALLEL)" == "false" ]] ; then \ if [[ "$(SERVICE_PARALLEL)" == "false" ]] ; then \
CONTAINER_FILE=$(DEVELOP)/$(CF_PREFIX)$(SERVICE_VARIANT) ; \ CONTAINER_FILE=$${DEVELOP}/$(CF_PREFIX)$(SERVICE_VARIANT) ; \
JOB_ID=$(JOB) ; \ JOB_ID=$(JOB) ; \
if [[ -e $${CONTAINER_FILE} ]]; then \ 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." ; \ >&2 echo "Another $* service is already running! Use \"make new-develop\" to start a new develop instance despite currently running services." ; \
exit 1 ; \ exit 1 ; \
fi ; \ fi ; \
else \ else \
DEVDIR=$(DEVELOP)/$(SERVICE_VARIANT) ; \ DEVDIR=$${DEVELOP}/$(SERVICE_VARIANT) ; \
I=`ls $(DEVELOP) | grep '$(SERVICE_VARIANT)' | sed 's/$(SERVICE_VARIANT)-//' | sort -n | tail -n1` ; \ I=`ls $${DEVELOP} | grep '$(SERVICE_VARIANT)' | sed 's/$(SERVICE_VARIANT)-//' | sort -n | tail -n1` ; \
echo "$${I}" ; \ echo "$${I}" ; \
J=$$(($${I}+1)) ; \ J=$$(($${I}+1)) ; \
CONTAINER_FILE=$${DEVDIR}-$${J} ; \ CONTAINER_FILE=$${DEVDIR}-$${J} ; \
@ -197,6 +195,7 @@ else
endif endif
--containerized: --image-build --containerized: --image-build
DEVELOP=`cat develop/.current` ; \
./utils/watchcontainerrun.sh "$(CONTAINER_COMMAND)" "$(CONTAINER_FILE)" & \ ./utils/watchcontainerrun.sh "$(CONTAINER_COMMAND)" "$(CONTAINER_FILE)" & \
CONTAINER_NAME=fradrive.$(CURR_DEV).$(SERVICE_VARIANT).$(JOB_ID) ; \ CONTAINER_NAME=fradrive.$(CURR_DEV).$(SERVICE_VARIANT).$(JOB_ID) ; \
CONTAINER_ID=`$(CONTAINER_BGRUN) \ CONTAINER_ID=`$(CONTAINER_BGRUN) \
@ -209,7 +208,7 @@ endif
$(CONTAINER_CMD) \ $(CONTAINER_CMD) \
` ; \ ` ; \
printf "CONTAINER_ID=$${CONTAINER_ID}" >> "$(CONTAINER_FILE)" ; \ printf "CONTAINER_ID=$${CONTAINER_ID}" >> "$(CONTAINER_FILE)" ; \
if [[ "attached" -eq $(CONTAINER_RUNMODE) ]] ; then \ if [[ "true" -eq "$(CONTAINER_ATTACHED)" ]] ; then \
$(CONTAINER_COMMAND) attach $${CONTAINER_ID} || : ; \ $(CONTAINER_COMMAND) attach $${CONTAINER_ID} || : ; \
fi fi