diff --git a/helm-chart-collator/Makefile b/helm-chart-collator/Makefile index 7858c21..95f86fc 100644 --- a/helm-chart-collator/Makefile +++ b/helm-chart-collator/Makefile @@ -23,7 +23,7 @@ DOCKER_REGISTRY ?= quay.io IMAGE_PREFIX ?= airshipit IMAGE_TAG ?= latest DISTRO ?= debian_stable -CHARTS ?= \"$(cat "config/charts.yaml")\" +CHARTS ?= config/charts.yaml IMAGE := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${IMAGE_TAG} SH_TO_CHECK := $(wildcard files/*.sh ) PROXY ?= http://proxy.foo.com:8000 @@ -76,7 +76,7 @@ build_collator: ifeq ($(IMAGE_ID), none) ifeq ($(USE_PROXY), true) ./build-image-make.sh \ - config/charts.yaml \ + $(CHARTS) \ $(IMAGE_NAME) \ $(IMAGE) \ $(LABEL) \ @@ -86,7 +86,7 @@ ifeq ($(USE_PROXY), true) $(NO_PROXY) else ./build-image-make.sh \ - config/charts.yaml \ + $(CHARTS) \ $(IMAGE_NAME) \ $(IMAGE) \ $(LABEL) \ diff --git a/helm-chart-collator/build-image-make.sh b/helm-chart-collator/build-image-make.sh index 7c8c108..95960af 100755 --- a/helm-chart-collator/build-image-make.sh +++ b/helm-chart-collator/build-image-make.sh @@ -5,7 +5,7 @@ if [[ $# < 5 ]]; then echo "usage:" echo " $0 \\\n" - echo " \\\n" + echo " \\\n" echo " \\\n" echo " \\\n" echo "