Skip to content
This repository has been archived by the owner on Oct 31, 2021. It is now read-only.

Commit

Permalink
Fixing directory error.
Browse files Browse the repository at this point in the history
  • Loading branch information
elliotcourant committed Oct 3, 2021
1 parent 7ba2849 commit e2df8bc
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ OS=$(shell uname -s | tr A-Z a-z)
ENVIRONMENT ?= $(shell echo $${BUIlDKITE_GITHUB_DEPLOYMENT_ENVIRONMENT:-Local})
ENV_LOWER = $(shell echo $(ENVIRONMENT) | tr A-Z a-z)

GENERATED=$(PWD)/generated
GENERATED_YAML=$(GENERATED)/$(ENV_LOWER)
GENERATED_YAML=$(PWD)/generated/$(ENV_LOWER)

ifndef POSTGRES_DB
POSTGRES_DB=postgres
Expand Down Expand Up @@ -128,11 +127,12 @@ TEMPLATE_FILES=$(PWD)/templates/*

$(GENERATED_YAML): $(VALUES_FILES) $(TEMPLATE_FILES)
$(GENERATED_YAML): IMAGE_TAG=$(shell git rev-parse HEAD)
$(GENERATED_YAML): $(HELM) $(SPLIT_YAML) $(GENERATED)
$(GENERATED_YAML): $(HELM) $(SPLIT_YAML)
$(call infoMsg,Generating Kubernetes yaml using Helm output to: $(GENERATED_YAML))
$(call infoMsg,Environment: $(ENVIRONMENT))
$(call infoMsg,Using values file: $(VALUES_FILE))
-rm -rf $(GENERATED_YAML)
-mkdir -p $(GENERATED_YAML)
$(HELM) template rest-api $(PWD) \
--dry-run \
--set image.tag="$(IMAGE_TAG)" \
Expand Down
3 changes: 0 additions & 3 deletions scripts/Dependencies.mk
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ $(LOCAL_BIN):
$(LOCAL_TMP):
@if [ ! -f "$(LOCAL_TMP)" ]; then mkdir -p $(LOCAL_TMP); fi

$(GENERATED):
@if [ ! -f "$(GENERATED)" ]; then mkdir -p $(GENERATED); fi

CURL=$(shell which curl)

# If curl is not installed then we have some basic stuff to install it.
Expand Down

0 comments on commit e2df8bc

Please sign in to comment.