From 40f70d52f29dc2209b1943c74f67bd1d9dce9aa8 Mon Sep 17 00:00:00 2001
From: Ryan Miller <rmiller@sumologic.com>
Date: Thu, 18 Jul 2019 16:18:17 -0700
Subject: [PATCH 1/2] Cleanup Dockerfile and remove Dockerfile-debian

---
 deploy/docker/Dockerfile        |  6 +++---
 deploy/docker/Dockerfile-debian | 34 ---------------------------------
 2 files changed, 3 insertions(+), 37 deletions(-)
 delete mode 100644 deploy/docker/Dockerfile-debian

diff --git a/deploy/docker/Dockerfile b/deploy/docker/Dockerfile
index 79230d27a2..03809c07ab 100644
--- a/deploy/docker/Dockerfile
+++ b/deploy/docker/Dockerfile
@@ -16,6 +16,7 @@ RUN apk add --no-cache --update --virtual .build-deps sudo build-base ruby-dev \
        && gem install lru_redux \
        && gem install snappy
 
+# FluentD plugins from RubyGems
 RUN gem install fluent-plugin-s3 -v 1.1.4 \
        && gem install fluent-plugin-systemd -v 0.3.1 \
        && gem install fluent-plugin-record-modifier \
@@ -26,9 +27,8 @@ RUN gem install fluent-plugin-s3 -v 1.1.4 \
        && gem install fluent-plugin-prometheus -v 1.1.0 \
        && gem install fluent-plugin-kubernetes_sumologic
 
-RUN gem install fluent-plugin-sumologic_output \
-       && gem install fluent-plugin-carbon-v2 \
-       && gem install fluent-plugin-prometheus-format \
+# FluentD plugins from this repository
+RUN gem install fluent-plugin-prometheus-format \
        && gem install fluent-plugin-enhance-k8s-metadata \
        && gem install fluent-plugin-datapoint \
        && gem install fluent-plugin-rewrite-tag-filter \
diff --git a/deploy/docker/Dockerfile-debian b/deploy/docker/Dockerfile-debian
deleted file mode 100644
index 55aa1bfbf1..0000000000
--- a/deploy/docker/Dockerfile-debian
+++ /dev/null
@@ -1,34 +0,0 @@
-FROM fluent/fluentd:v1.4.0-debian-onbuild-1.0
-
-# Use root account to use apt
-USER root
-
-COPY gems/fluent-plugin*.gem ./
-
-RUN buildDeps="sudo make gcc g++ libc-dev ruby-dev" \
- && apt-get update \
- && apt-get install -y --no-install-recommends $buildDeps
-
-RUN sudo apt-get install -y --no-install-recommends python-tk python-setuptools ipython
-
-RUN sudo gem install google-protobuf
-
-# For some reason following gem fail to install ??
-RUN sudo gem install snappy
-
-RUN sudo gem install fluent-plugin-sumologic_output \
- && sudo gem install fluent-plugin-carbon-v2 \
- && sudo gem install fluent-plugin-datapoint \
- && sudo gem install fluent-plugin-rewrite-tag-filter \
- && sudo gem install fluent-plugin-prometheus-format \
- && sudo gem install fluent-plugin-probuf
-
-RUN sudo gem sources --clear-all \
- && SUDO_FORCE_REMOVE=yes \
-    apt-get purge -y --auto-remove \
-                  -o APT::AutoRemove::RecommendsImportant=false \
-                  $buildDeps \
- && rm -rf /var/lib/apt/lists/* \
-           /home/fluent/.gem/ruby/2.3.0/cache/*.gem
-
-USER fluent

From e111ceb5a9f36cbb34412ee801c6ebb9b672b419 Mon Sep 17 00:00:00 2001
From: Ryan Miller <rmiller@sumologic.com>
Date: Thu, 18 Jul 2019 16:44:25 -0700
Subject: [PATCH 2/2] Set kubernetes_sumologic version; Fix test fluent.conf
 file

---
 deploy/docker/Dockerfile  | 2 +-
 deploy/docker/fluent.conf | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/deploy/docker/Dockerfile b/deploy/docker/Dockerfile
index 03809c07ab..f6257a6935 100644
--- a/deploy/docker/Dockerfile
+++ b/deploy/docker/Dockerfile
@@ -25,7 +25,7 @@ RUN gem install fluent-plugin-s3 -v 1.1.4 \
        && gem install fluent-plugin-concat -v 2.3.0 \
        && gem install fluent-plugin-rewrite-tag-filter -v 2.1.0 \
        && gem install fluent-plugin-prometheus -v 1.1.0 \
-       && gem install fluent-plugin-kubernetes_sumologic
+       && gem install fluent-plugin-kubernetes_sumologic -v 2.4.1
 
 # FluentD plugins from this repository
 RUN gem install fluent-plugin-prometheus-format \
diff --git a/deploy/docker/fluent.conf b/deploy/docker/fluent.conf
index 52c6ed2a27..8f0db41dd8 100644
--- a/deploy/docker/fluent.conf
+++ b/deploy/docker/fluent.conf
@@ -14,9 +14,6 @@
 <match FOR_TEST_ONLY>
   @type datapoint
 </match>
-<filter FOR_TEST_ONLY>
-  @type carbon_v2
-</filter>
 <filter FOR_TEST_ONLY>
   @type prometheus_format
 </filter>