Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix path #55

Merged
merged 2 commits into from
May 2, 2018
Merged

Fix path #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c6ee6f
Fix path env
osterman May 2, 2018
ec4306b
rely on search path
osterman May 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.*
Expand Down
4 changes: 2 additions & 2 deletions modules/chamber/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
9 changes: 4 additions & 5 deletions modules/helm/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
4 changes: 2 additions & 2 deletions modules/helmfile/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down