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

build(Makefile): Fixed start postgres

Browse Source
This commit is contained in:
Stephan Barth 2024-11-04 17:52:56 +01:00
parent ba6a502591
commit ad8edfd448
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Makefile
View File

@ -83,7 +83,12 @@ compile:
$(MAKE) compile-backend $(MAKE) compile-backend
.PHONY: start .PHONY: start
start: start-postgres start-memcached start-minio start-frontend start-backend; start:
$(MAKE) start-postgres
$(MAKE) start-memcached
$(MAKE) start-minio
$(MAKE) start-frontend
$(MAKE) start-backend
.PHONY: %-backend .PHONY: %-backend
%-backend: SERVICE=backend %-backend: SERVICE=backend
@ -113,16 +118,19 @@ start: start-postgres start-memcached start-minio start-frontend start-backend;
.PHONY: %-postgres .PHONY: %-postgres
%-postgres: SERVICE=postgres %-postgres: SERVICE=postgres
%-postgres: SERVICE_VARIANT=postgres
%-postgres: BASE_PORTS = "PGPORT=5432" %-postgres: BASE_PORTS = "PGPORT=5432"
%-postgres: CONTAINER_CMD=localhost/fradrive/postgres %-postgres: CONTAINER_CMD=localhost/fradrive/postgres
.PHONY: %-memcached .PHONY: %-memcached
%-memcached: SERVICE=memcached %-memcached: SERVICE=memcached
%-memcached: SERVICE_VARIANT=memcached
%-memcached: CONTAINER_CMD=$(MEMCACHED_IMAGE) --port=`cat $(CONTAINER_FILE) | grep 'MEMCACHED_PORT=' | sed 's/MEMCACHED_PORT=//'` %-memcached: CONTAINER_CMD=$(MEMCACHED_IMAGE) --port=`cat $(CONTAINER_FILE) | grep 'MEMCACHED_PORT=' | sed 's/MEMCACHED_PORT=//'`
%-memcached: BASE_PORTS = "MEMCACHED_PORT=11211" %-memcached: BASE_PORTS = "MEMCACHED_PORT=11211"
.PHONY: %-minio .PHONY: %-minio
%-minio: SERVICE=minio %-minio: SERVICE=minio
%-minio: SERVICE_VARIANT=minio
%-minio: CONTAINER_CMD=$(MINIO_IMAGE) -- server `mktemp` --address=:`cat $(CONTAINER_FILE) | grep 'UPLOAD_S3_PORT=' | sed 's/UPLOAD_S3_PORT=//'`: %-minio: CONTAINER_CMD=$(MINIO_IMAGE) -- server `mktemp` --address=:`cat $(CONTAINER_FILE) | grep 'UPLOAD_S3_PORT=' | sed 's/UPLOAD_S3_PORT=//'`:
%-minio: BASE_PORTS = "UPLOAD_S3_PORT=9000" %-minio: BASE_PORTS = "UPLOAD_S3_PORT=9000"
@ -154,6 +162,7 @@ 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
echo "--develop ################## ATTACHED: $(CONTAINER_ATTACHED)"
DEVELOP=develop/`cat develop/.current` ; \ DEVELOP=develop/`cat develop/.current` ; \
echo "$(SERVICE_PARALLEL)" ; \ echo "$(SERVICE_PARALLEL)" ; \
if [[ "$(SERVICE_PARALLEL)" == "false" ]] ; then \ if [[ "$(SERVICE_PARALLEL)" == "false" ]] ; then \
@ -166,8 +175,9 @@ lint-%: --act ;
else \ else \
DEVDIR=$${DEVELOP}/$(CF_PREFIX)$(SERVICE_VARIANT) ; \ DEVDIR=$${DEVELOP}/$(CF_PREFIX)$(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=$${I}" ; \
J=$$(($${I}+1)) ; \ J=$$(($${I}+1)) ; \
echo "J=$${J}" ; \
CONTAINER_FILE=$${DEVDIR}-$${J} ; \ CONTAINER_FILE=$${DEVDIR}-$${J} ; \
JOB_ID=$(JOB)-$${J} ; \ JOB_ID=$(JOB)-$${J} ; \
fi ; \ fi ; \
@ -195,6 +205,7 @@ else
endif endif
--containerized: --image-build --containerized: --image-build
echo "--containerized ################## ATTACHED: $(CONTAINER_ATTACHED)"
DEVELOP=`cat develop/.current` ; \ 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) ; \
@ -208,7 +219,8 @@ endif
$(CONTAINER_CMD) \ $(CONTAINER_CMD) \
` ; \ ` ; \
printf "CONTAINER_ID=$${CONTAINER_ID}" >> "$(CONTAINER_FILE)" ; \ printf "CONTAINER_ID=$${CONTAINER_ID}" >> "$(CONTAINER_FILE)" ; \
if [[ "true" -eq "$(CONTAINER_ATTACHED)" ]] ; then \ if [[ "true" == "$(CONTAINER_ATTACHED)" ]] ; then \
echo "###!!! postgres shall not go here!" ; \
$(CONTAINER_COMMAND) attach $${CONTAINER_ID} || : ; \ $(CONTAINER_COMMAND) attach $${CONTAINER_ID} || : ; \
fi fi