diff --git a/Makefile b/Makefile index fbf26f40..a97cfe2f 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,7 @@ export BUILD_HARNESS_PATH ?= $(shell 'pwd') export OS ?= $(shell uname -s | tr '[:upper:]' '[:lower:]') export SELF ?= make +export PATH := $(BUILD_HARNESS_PATH)/vendor:$(PATH) # Import Makefiles into current context include $(BUILD_HARNESS_PATH)/Makefile.* diff --git a/modules/chamber/Makefile b/modules/chamber/Makefile index 25b4033a..1a9eb91c 100644 --- a/modules/chamber/Makefile +++ b/modules/chamber/Makefile @@ -1,6 +1,6 @@ -CURL := $(shell which curl) +CURL ?= curl CHAMBER_VERSION ?= 2.0.0 -CHAMBER := $(shell which chamber) +CHAMBER ?= chamber ## Install chamber chamber/install: packages/install/chamber diff --git a/modules/helm/Makefile b/modules/helm/Makefile index 3ed8d68c..7cd114e2 100644 --- a/modules/helm/Makefile +++ b/modules/helm/Makefile @@ -1,17 +1,16 @@ -CURL := $(shell which curl) +CURL ?= curl export HELM_VERSION ?= 2.9.0 HELM_PLATFORM ?= $(OS)-amd64 -HELM := $(shell which helm) +HELM ?= helm HELM_HOME ?= $(HOME)/.helm - HELM_REPO_PATH ?= ./$(REPO_NAME) HELM_PACKAGE_PATH ?= ./packages/$(REPO_NAME) ## Install helm helm/install: packages/install/helm packages/install/yq - @helm init --client-only + @$(HELM) init --client-only @chmod -R 777 "$(HELM_HOME)" - @helm repo remove local || true + @$(HELM) repo remove local || true ## Build index for serve helm charts helm/serve/index: diff --git a/modules/helmfile/Makefile b/modules/helmfile/Makefile index d5487ebd..77ccd665 100644 --- a/modules/helmfile/Makefile +++ b/modules/helmfile/Makefile @@ -1,6 +1,6 @@ -CURL := $(shell which curl) +CURL ?= curl HELMFILE_VERSION ?= 0.12.0 -HELMFILE := $(shell which helm) +HELMFILE ?= helmfile ## Install helmfile helmfile/install: packages/install/helmfile packages/install/kubectl packages/install/helm