Merge remote-tracking branch 'upstream/main' into kubernetes-add-local-storage

Author: YuryHrytsuk

services/metabase/Makefile

@@ -1,10 +1,23 @@
 REPO_BASE_DIR := $(shell git rev-parse --show-toplevel)
 
-include ${REPO_BASE_DIR}/scripts/common.Makefile
 include ${REPO_BASE_DIR}/scripts/common-services.Makefile
+# common-services.Makefile should be included first as common.Makefile
+#relies on STACK_NAME var which is defined in common-services.Makefile
+include ${REPO_BASE_DIR}/scripts/common.Makefile
 
 .PHONY: up
-up: ${TEMP_COMPOSE}  ## Deploys metabase stack
+up: ${TEMP_COMPOSE} prune-docker-stack-configs ## Deploys metabase stack
+	@docker stack deploy --with-registry-auth --prune --compose-file ${TEMP_COMPOSE} ${STACK_NAME}
+
+up-aws: up
+
+up-master: up
+
+up-dalco: up
+
+up-local: up
+
+up-public: up
 
 ${TEMP_COMPOSE}: docker-compose.yml .env
 	@${REPO_BASE_DIR}/scripts/docker-stack-config.bash -e .env $< > $@