This repository was archived by the owner on Oct 31, 2021. It is now read-only.
File tree 2 files changed +3
-6
lines changed
2 files changed +3
-6
lines changed Original file line number Diff line number Diff line change @@ -14,8 +14,7 @@ OS=$(shell uname -s | tr A-Z a-z)
14
14
ENVIRONMENT ?= $(shell echo $${BUIlDKITE_GITHUB_DEPLOYMENT_ENVIRONMENT:-Local})
15
15
ENV_LOWER = $(shell echo $(ENVIRONMENT ) | tr A-Z a-z)
16
16
17
- GENERATED =$(PWD ) /generated
18
- GENERATED_YAML =$(GENERATED ) /$(ENV_LOWER )
17
+ GENERATED_YAML =$(PWD ) /generated/$(ENV_LOWER )
19
18
20
19
ifndef POSTGRES_DB
21
20
POSTGRES_DB =postgres
@@ -128,11 +127,12 @@ TEMPLATE_FILES=$(PWD)/templates/*
128
127
129
128
$(GENERATED_YAML ) : $(VALUES_FILES ) $(TEMPLATE_FILES )
130
129
$(GENERATED_YAML ) : IMAGE_TAG=$(shell git rev-parse HEAD)
131
- $(GENERATED_YAML ) : $(HELM ) $(SPLIT_YAML ) $( GENERATED )
130
+ $(GENERATED_YAML ) : $(HELM ) $(SPLIT_YAML )
132
131
$(call infoMsg,Generating Kubernetes yaml using Helm output to: $(GENERATED_YAML ) )
133
132
$(call infoMsg,Environment: $(ENVIRONMENT ) )
134
133
$(call infoMsg,Using values file: $(VALUES_FILE ) )
135
134
-rm -rf $(GENERATED_YAML )
135
+ -mkdir -p $(GENERATED_YAML )
136
136
$(HELM ) template rest-api $(PWD ) \
137
137
--dry-run \
138
138
--set image.tag=" $( IMAGE_TAG) " \
Original file line number Diff line number Diff line change @@ -4,9 +4,6 @@ $(LOCAL_BIN):
4
4
$(LOCAL_TMP ) :
5
5
@if [ ! -f " $( LOCAL_TMP) " ]; then mkdir -p $(LOCAL_TMP ) ; fi
6
6
7
- $(GENERATED ) :
8
- @if [ ! -f " $( GENERATED) " ]; then mkdir -p $(GENERATED ) ; fi
9
-
10
7
CURL =$(shell which curl)
11
8
12
9
# If curl is not installed then we have some basic stuff to install it.
You can’t perform that action at this time.
0 commit comments