From c58fde69e32fcd118862e927527c565b2c8e8a9c Mon Sep 17 00:00:00 2001 From: Matt Boersma Date: Wed, 18 Jan 2017 13:41:46 -0700 Subject: [PATCH] feat(Makefile): set docker build flags via environment variable --- grafana/Makefile | 2 +- influxdb/Makefile | 4 ++-- telegraf/Makefile | 2 +- telegraf/versioning.mk | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/grafana/Makefile b/grafana/Makefile index 7b8d011..fa0cb9a 100644 --- a/grafana/Makefile +++ b/grafana/Makefile @@ -15,7 +15,7 @@ uninstall: kube-delete upgrade: kube-update docker-build: - docker build -t ${IMAGE} rootfs + docker build ${DOCKER_BUILD_FLAGS} -t ${IMAGE} rootfs docker tag ${IMAGE} ${MUTABLE_IMAGE} clean: check-docker diff --git a/influxdb/Makefile b/influxdb/Makefile index a30d78b..fb11a3f 100644 --- a/influxdb/Makefile +++ b/influxdb/Makefile @@ -15,7 +15,7 @@ uninstall: kube-delete upgrade: kube-update docker-build: - docker build -t ${IMAGE} rootfs + docker build ${DOCKER_BUILD_FLAGS} -t ${IMAGE} rootfs docker tag ${IMAGE} ${MUTABLE_IMAGE} clean: check-docker @@ -36,4 +36,4 @@ kube-delete: update-manifests kube-update: update-manifests kubectl delete -f manifests/deis-monitor-influxdb-rc.tmp.yaml - kubectl create -f manifests/deis-monitor-influxdb-rc.tmp.yaml \ No newline at end of file + kubectl create -f manifests/deis-monitor-influxdb-rc.tmp.yaml diff --git a/telegraf/Makefile b/telegraf/Makefile index 6f9dc14..cb624cc 100644 --- a/telegraf/Makefile +++ b/telegraf/Makefile @@ -15,7 +15,7 @@ uninstall: kube-delete upgrade: kube-update docker-build: - docker build --no-cache -t ${IMAGE} rootfs + docker build ${DOCKER_BUILD_FLAGS} -t ${IMAGE} rootfs docker tag ${IMAGE} ${MUTABLE_IMAGE} clean: check-docker diff --git a/telegraf/versioning.mk b/telegraf/versioning.mk index facd85f..beb4ba1 100644 --- a/telegraf/versioning.mk +++ b/telegraf/versioning.mk @@ -19,4 +19,4 @@ docker-immutable-push: .PHONY: docker-mutable-push docker-mutable-push: - docker push ${MUTABLE_IMAGE} \ No newline at end of file + docker push ${MUTABLE_IMAGE}