From 18b76f6118c587ea97853b922034bfe44fa7b6ce Mon Sep 17 00:00:00 2001 From: David Eliahu Date: Thu, 24 Sep 2020 21:56:52 -0700 Subject: [PATCH] Support env file for Makefile cluster commands --- Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index c3db155e4b..b3eb4b68a7 100644 --- a/Makefile +++ b/Makefile @@ -47,44 +47,44 @@ cluster-up: @$(MAKE) registry-all @$(MAKE) cli @kill $(shell pgrep -f rerun) >/dev/null 2>&1 || true - @./bin/cortex -c=./dev/config/cluster.yaml cluster up + @source ./dev/config/env.sh 2>/dev/null; ./bin/cortex --config=./dev/config/cluster.yaml cluster up @$(MAKE) kubectl cluster-up-y: @$(MAKE) registry-all @$(MAKE) cli @kill $(shell pgrep -f rerun) >/dev/null 2>&1 || true - @./bin/cortex -c=./dev/config/cluster.yaml cluster up --yes + @source ./dev/config/env.sh 2>/dev/null; ./bin/cortex --config=./dev/config/cluster.yaml cluster up --yes @$(MAKE) kubectl cluster-down: @$(MAKE) manager-local @$(MAKE) cli @kill $(shell pgrep -f rerun) >/dev/null 2>&1 || true - @./bin/cortex -c=./dev/config/cluster.yaml cluster down + @source ./dev/config/env.sh 2>/dev/null; ./bin/cortex --config=./dev/config/cluster.yaml cluster down cluster-down-y: @$(MAKE) manager-local @$(MAKE) cli @kill $(shell pgrep -f rerun) >/dev/null 2>&1 || true - @./bin/cortex -c=./dev/config/cluster.yaml cluster down --yes + @source ./dev/config/env.sh 2>/dev/null; ./bin/cortex --config=./dev/config/cluster.yaml cluster down --yes cluster-info: @$(MAKE) manager-local @$(MAKE) cli - @./bin/cortex -c=./dev/config/cluster.yaml cluster info + @source ./dev/config/env.sh 2>/dev/null; ./bin/cortex --config=./dev/config/cluster.yaml cluster info cluster-configure: @$(MAKE) registry-all @$(MAKE) cli @kill $(shell pgrep -f rerun) >/dev/null 2>&1 || true - @./bin/cortex -c=./dev/config/cluster.yaml cluster configure + @source ./dev/config/env.sh 2>/dev/null; ./bin/cortex --config=./dev/config/cluster.yaml cluster configure cluster-configure-y: @$(MAKE) registry-all @$(MAKE) cli @kill $(shell pgrep -f rerun) >/dev/null 2>&1 || true - @./bin/cortex -c=./dev/config/cluster.yaml cluster configure --yes + @source ./dev/config/env.sh 2>/dev/null; ./bin/cortex --config=./dev/config/cluster.yaml cluster configure --yes # stop the in-cluster operator operator-stop: