diff --git a/Makefile b/Makefile index 8289b5e21..2301638a7 100644 --- a/Makefile +++ b/Makefile @@ -83,7 +83,12 @@ compile: $(MAKE) compile-backend .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 %-backend: SERVICE=backend @@ -113,16 +118,19 @@ start: start-postgres start-memcached start-minio start-frontend start-backend; .PHONY: %-postgres %-postgres: SERVICE=postgres +%-postgres: SERVICE_VARIANT=postgres %-postgres: BASE_PORTS = "PGPORT=5432" %-postgres: CONTAINER_CMD=localhost/fradrive/postgres .PHONY: %-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: BASE_PORTS = "MEMCACHED_PORT=11211" .PHONY: %-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: 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_%: --ensure-develop + echo "--develop ################## ATTACHED: $(CONTAINER_ATTACHED)" DEVELOP=develop/`cat develop/.current` ; \ echo "$(SERVICE_PARALLEL)" ; \ if [[ "$(SERVICE_PARALLEL)" == "false" ]] ; then \ @@ -166,8 +175,9 @@ lint-%: --act ; else \ DEVDIR=$${DEVELOP}/$(CF_PREFIX)$(SERVICE_VARIANT) ; \ I=`ls $${DEVELOP} | grep '$(SERVICE_VARIANT)' | sed 's/$(SERVICE_VARIANT)-//' | sort -n | tail -n1` ; \ - echo "$${I}" ; \ + echo "I=$${I}" ; \ J=$$(($${I}+1)) ; \ + echo "J=$${J}" ; \ CONTAINER_FILE=$${DEVDIR}-$${J} ; \ JOB_ID=$(JOB)-$${J} ; \ fi ; \ @@ -195,6 +205,7 @@ else endif --containerized: --image-build + echo "--containerized ################## ATTACHED: $(CONTAINER_ATTACHED)" DEVELOP=`cat develop/.current` ; \ ./utils/watchcontainerrun.sh "$(CONTAINER_COMMAND)" "$(CONTAINER_FILE)" & \ CONTAINER_NAME=fradrive.$(CURR_DEV).$(SERVICE_VARIANT).$(JOB_ID) ; \ @@ -208,7 +219,8 @@ endif $(CONTAINER_CMD) \ ` ; \ 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} || : ; \ fi