From 20a0905d611a2718f76a7234ba6636fb990c1676 Mon Sep 17 00:00:00 2001
From: Satnam Singh <satnam@google.com>
Date: Mon, 27 Apr 2015 14:44:14 -0700
Subject: [PATCH] New Fluentd to Cloud Logging Dockerfile with args

---
 cluster/addons/fluentd-gcp/fluentd-gcp-image/Dockerfile      | 5 ++---
 cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile        | 2 +-
 .../addons/fluentd-gcp/fluentd-gcp-image/google-fluentd.conf | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/cluster/addons/fluentd-gcp/fluentd-gcp-image/Dockerfile b/cluster/addons/fluentd-gcp/fluentd-gcp-image/Dockerfile
index 3a88a040772..87f6dbb3453 100644
--- a/cluster/addons/fluentd-gcp/fluentd-gcp-image/Dockerfile
+++ b/cluster/addons/fluentd-gcp/fluentd-gcp-image/Dockerfile
@@ -11,10 +11,9 @@ MAINTAINER Satnam Singh "satnam@google.com"
 
 # Disable prompts from apt.
 ENV DEBIAN_FRONTEND noninteractive
-ENV OPTS_APT -y --force-yes --no-install-recommends
 
 RUN apt-get -q update && \
-    apt-get -y install curl && \
+    apt-get install -y curl && \
     apt-get clean && \
     curl -s https://storage.googleapis.com/signals-agents/logging/google-fluentd-install.sh | sudo bash
 
@@ -22,4 +21,4 @@ RUN apt-get -q update && \
 COPY google-fluentd.conf /etc/google-fluentd/google-fluentd.conf
 
 # Start Fluentd to pick up our config that watches Docker container logs.
-CMD /usr/sbin/google-fluentd -qq > /var/log/google-fluentd.log
+CMD /usr/sbin/google-fluentd "$FLUENTD_ARGS" > /var/log/google-fluentd.log
diff --git a/cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile b/cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile
index 20d582715f1..ba668bfb49d 100644
--- a/cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile
+++ b/cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile
@@ -6,7 +6,7 @@
 .PHONY:	build push
 
 
-TAG = 1.3
+TAG = 1.4
 
 build:
 	docker build -t gcr.io/google_containers/fluentd-gcp:$(TAG) .
diff --git a/cluster/addons/fluentd-gcp/fluentd-gcp-image/google-fluentd.conf b/cluster/addons/fluentd-gcp/fluentd-gcp-image/google-fluentd.conf
index 4503ab75f5b..34d0996ba01 100644
--- a/cluster/addons/fluentd-gcp/fluentd-gcp-image/google-fluentd.conf
+++ b/cluster/addons/fluentd-gcp/fluentd-gcp-image/google-fluentd.conf
@@ -16,7 +16,7 @@
   type tail
   format none
   time_key time
-  path /varlog/containers/*/*.log
+  path /varlog/containers/*.log
   pos_file /varlog/gcp-containers.log.pos
   time_format %Y-%m-%dT%H:%M:%S
   tag kubernetes.*