feat(Makefile): set docker build flags via environment variable

deis · Jan 20, 2017 · c58fde6 · c58fde6
1 parent 167e26f
commit c58fde6
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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
+	kubectl create -f manifests/deis-monitor-influxdb-rc.tmp.yaml
diff --git 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
@@ -19,4 +19,4 @@ docker-immutable-push:
 
 .PHONY: docker-mutable-push
 docker-mutable-push:
-	docker push ${MUTABLE_IMAGE}
+	docker push ${MUTABLE_IMAGE}