From 99356d2a65a8f066d96b762f9756c69a14b65700 Mon Sep 17 00:00:00 2001
From: Satnam Singh <satnam@raintown.org>
Date: Fri, 7 Nov 2014 13:37:39 -0800
Subject: [PATCH] Undo pos_file change which does not seem to be working as
 aspected but keep change to tagging of image.

---
 contrib/logging/fluentd-es-image/Makefile     |  9 +++++++++
 contrib/logging/fluentd-es-image/build.sh     | 20 -------------------
 contrib/logging/fluentd-es-image/push.sh      | 19 ------------------
 .../logging/fluentd-es-image/td-agent.conf    |  1 -
 4 files changed, 9 insertions(+), 40 deletions(-)
 create mode 100644 contrib/logging/fluentd-es-image/Makefile
 delete mode 100755 contrib/logging/fluentd-es-image/build.sh
 delete mode 100755 contrib/logging/fluentd-es-image/push.sh

diff --git a/contrib/logging/fluentd-es-image/Makefile b/contrib/logging/fluentd-es-image/Makefile
new file mode 100644
index 00000000000..d4a7c051930
--- /dev/null
+++ b/contrib/logging/fluentd-es-image/Makefile
@@ -0,0 +1,9 @@
+.PHONY:	build push
+
+TAG = 1.0
+
+build:	
+	sudo docker build -t kubernetes/fluentd-elasticsearch:$(TAG) .
+
+push:	
+	sudo docker push kubernetes/fluentd-elasticsearch:$(TAG)
diff --git a/contrib/logging/fluentd-es-image/build.sh b/contrib/logging/fluentd-es-image/build.sh
deleted file mode 100755
index fd391ae0b31..00000000000
--- a/contrib/logging/fluentd-es-image/build.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-# Copyright 2014 Google Inc. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-# Build the fluentd-elasticsearch image,
-
-sudo docker build -t kubernetes/fluentd-elasticsearch .
diff --git a/contrib/logging/fluentd-es-image/push.sh b/contrib/logging/fluentd-es-image/push.sh
deleted file mode 100755
index e94212bc98e..00000000000
--- a/contrib/logging/fluentd-es-image/push.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-# Copyright 2014 Google Inc. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Push built inmage to kubernetes/fluentd-elasticsearch.
-
-sudo docker push kubernetes/fluentd-elasticsearch
diff --git a/contrib/logging/fluentd-es-image/td-agent.conf b/contrib/logging/fluentd-es-image/td-agent.conf
index 4b3b543dc89..08f7cf5cd71 100644
--- a/contrib/logging/fluentd-es-image/td-agent.conf
+++ b/contrib/logging/fluentd-es-image/td-agent.conf
@@ -38,7 +38,6 @@
   format json
   time_key time
   path /var/lib/docker/containers/*/*-json.log
-  pos_file /var/lib/docker/containers/*/*-json.log.pos
   time_format %Y-%m-%dT%H:%M:%S
   tag docker.container.*
 </source>