Skip to content

Commit c58fde6

Browse files
committed
feat(Makefile): set docker build flags via environment variable
1 parent 167e26f commit c58fde6

4 files changed

Lines changed: 5 additions & 5 deletions

File tree

grafana/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ uninstall: kube-delete
1515
upgrade: kube-update
1616

1717
docker-build:
18-
docker build -t ${IMAGE} rootfs
18+
docker build ${DOCKER_BUILD_FLAGS} -t ${IMAGE} rootfs
1919
docker tag ${IMAGE} ${MUTABLE_IMAGE}
2020

2121
clean: check-docker

influxdb/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ uninstall: kube-delete
1515
upgrade: kube-update
1616

1717
docker-build:
18-
docker build -t ${IMAGE} rootfs
18+
docker build ${DOCKER_BUILD_FLAGS} -t ${IMAGE} rootfs
1919
docker tag ${IMAGE} ${MUTABLE_IMAGE}
2020

2121
clean: check-docker
@@ -36,4 +36,4 @@ kube-delete: update-manifests
3636

3737
kube-update: update-manifests
3838
kubectl delete -f manifests/deis-monitor-influxdb-rc.tmp.yaml
39-
kubectl create -f manifests/deis-monitor-influxdb-rc.tmp.yaml
39+
kubectl create -f manifests/deis-monitor-influxdb-rc.tmp.yaml

telegraf/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ uninstall: kube-delete
1515
upgrade: kube-update
1616

1717
docker-build:
18-
docker build --no-cache -t ${IMAGE} rootfs
18+
docker build ${DOCKER_BUILD_FLAGS} -t ${IMAGE} rootfs
1919
docker tag ${IMAGE} ${MUTABLE_IMAGE}
2020

2121
clean: check-docker

telegraf/versioning.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ docker-immutable-push:
1919

2020
.PHONY: docker-mutable-push
2121
docker-mutable-push:
22-
docker push ${MUTABLE_IMAGE}
22+
docker push ${MUTABLE_IMAGE}

0 commit comments

Comments
 (0)