Update fluentd-es to collect etcd logs and remove merge conflict cruft.

This commit is contained in:
Alex Robinson
2015-07-30 21:41:58 +00:00
parent 9e18c29e9f
commit 69ab7026af
3 changed files with 9 additions and 16 deletions

View File

@@ -1,7 +1,7 @@
.PHONY: build push
IMAGE = fluentd-elasticsearch
TAG = 1.6
TAG = 1.7
build:
docker build -t gcr.io/google_containers/$(IMAGE):$(TAG) .