Fix portainer makefile (#1131)

* Automatically configure registry in portainer

Creates a single authneticated dockerhub registry that lets pulling
private images (i.e. updating service's image (that is private) in portainer shall work now)

* closes #1089

* Update

* Imrpove wait for it installation

* Fix portainer makefile wrong options

#1125

* fix

* spacing

Author: YuryHrytsuk

services/portainer/Makefile

@@ -15,40 +15,38 @@ include ${REPO_BASE_DIR}/scripts/common.Makefile
 .PHONY: up ## Deploys portainer stack
 up: .init .env secrets ${TEMP_COMPOSE}
 	@docker stack deploy --with-registry-auth --prune --compose-file ${TEMP_COMPOSE} ${STACK_NAME}
-	@$(MAKE) --noprint configure-portainer-registry
+	@$(MAKE) --no-print-directory configure-portainer-registry
 
 .PHONY: up-local ## Deploys portainer stack for local deployment
 up-local: .init .env secrets ${TEMP_COMPOSE} ${TEMP_COMPOSE}-local
 	@docker stack deploy --with-registry-auth --prune --compose-file ${TEMP_COMPOSE}-local ${STACK_NAME}
-	@$(MAKE) --noprint configure-portainer-registry
+	@$(MAKE) --no-print-directory configure-portainer-registry
 
 .PHONY: up-dalco ## Deploys portainer stack for Dalco Cluster
 up-dalco: .init .env secrets ${TEMP_COMPOSE}-dalco
 	@docker stack deploy --with-registry-auth --prune --compose-file ${TEMP_COMPOSE}-dalco ${STACK_NAME}
-	@$(MAKE) --noprint configure-portainer-registry
+	@$(MAKE) --no-print-directory configure-portainer-registry
 
 .PHONY: up-aws ## Deploys portainer stack for AWS
 up-aws: .init .env secrets ${TEMP_COMPOSE}-aws
 	@docker stack deploy --with-registry-auth --prune --compose-file ${TEMP_COMPOSE}-aws ${STACK_NAME}
-	@$(MAKE) --noprint configure-portainer-registry
+	@$(MAKE) --no-print-directory configure-portainer-registry
 
 .PHONY: up-public ## Deploys portainer stack for public access Cluster
 up-public: up-dalco
 
 .PHONY: up-master ## Deploys portainer stack for master Cluster
 up-master: .init .env secrets ${TEMP_COMPOSE}-master
 	@docker stack deploy --with-registry-auth --prune --compose-file ${TEMP_COMPOSE}-master ${STACK_NAME}
-	@$(MAKE) --noprint configure-portainer-registry
-
+	@$(MAKE) --no-print-directory configure-portainer-registry
 
 .PHONY: configure-portainer-registry
 configure-portainer-registry: venv $(VENV_BIN)/python $(WAIT_FOR_IT) ## Add registry to Portainer
-	@$(MAKE) --no-print install REQUIREMENTS_FILE=./scripts/requirements.txt
+	@$(MAKE) --no-print-directory install REQUIREMENTS_FILE=./scripts/requirements.txt
 	@set -o allexport; source $(REPO_CONFIG_LOCATION); set +o allexport; \
 	$(WAIT_FOR_IT) http $$PORTAINER_URL --timeout=120s --interval=5s --expect-status-code 200 && \
 	$(VENV_BIN)/python ./scripts/configure_portainer_registry.py
 
-
 # Helpers -------------------------------------------------
 
 .PHONY: ${TEMP_COMPOSE}