Merge pull request #125 from SumoLogic/rmiller-debian-fluentd-deployment

Switch to Debian fluentd Dockerfile

Author: Ryan Miller

deploy/docker/Dockerfile

@@ -1,16 +1,17 @@
-FROM fluent/fluentd:v1.6.3-1.0
+FROM fluent/fluentd:v1.6.3-debian-1.0
 
-# Use root account to use apk
+# Use root account to use apt
 USER root
 
-COPY gems/fluent-plugin*.gem ./
-
-RUN apk add --no-cache libexecinfo libexecinfo-dev
+# Build dependencies
+RUN buildDeps="sudo make gcc g++ libc-dev ruby-dev libsnappy-dev" \
+ && apt-get update \
+ && apt-get install -y --no-install-recommends $buildDeps
 
-RUN apk add --no-cache snappy g++ snappy-dev
+COPY gems/fluent-plugin*.gem ./
 
-RUN apk add --no-cache --update --virtual .build-deps sudo build-base ruby-dev \
-       && gem install concurrent-ruby \
+# Fluentd plugin dependencies
+RUN gem install concurrent-ruby \
        && gem install google-protobuf \
        && gem install kubeclient \
        && gem install lru_redux \
@@ -40,14 +41,15 @@ RUN gem install fluent-plugin-prometheus-format \
        && gem install fluent-plugin-protobuf \
        && gem install fluent-plugin-events
 
-RUN gem sources --clear-all \
-       && apk del .build-deps \
-       && rm -rf /home/fluent/.gem/ruby/2.5.0/cache/*.gem \
-       && rm -f ./*.gem
-
-RUN mkdir -p /fluentd/conf.d
+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/* \
+ && rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem
 
 COPY ./fluent.conf /fluentd/etc/
-COPY entrypoint.sh /bin/
+COPY ./entrypoint.sh /bin/
 
 USER fluent

deploy/kubernetes/fluentd-sumologic.yaml.tmpl

@@ -328,15 +328,15 @@ spec:
             command:
             - "/bin/sh"
             - "-c"
-            - "[[ $( pgrep ruby | wc -l)  == 2 ]]"
+            - "[ $(pgrep ruby | wc -l) -gt 0 ]"
           initialDelaySeconds: 300
           periodSeconds: 20
         readinessProbe:
           exec:
             command:
             - "/bin/sh"
             - "-c"
-            - "[[ $( pgrep ruby | wc -l)  == 2 ]]"
+            - "[ $(pgrep ruby | wc -l) -gt 0 ]"
           initialDelaySeconds: 30
           periodSeconds: 5
         volumeMounts:
@@ -513,15 +513,15 @@ spec:
             command:
             - "/bin/sh"
             - "-c"
-            - "[[ $( pgrep ruby | wc -l)  == 2 ]]"
+            - "[ $(pgrep ruby | wc -l) -gt 0 ]"
           initialDelaySeconds: 300
           periodSeconds: 20
         readinessProbe:
           exec:
             command:
             - "/bin/sh"
             - "-c"
-            - "[[ $( pgrep ruby | wc -l)  == 2 ]]"
+            - "[ $(pgrep ruby | wc -l) -gt 0 ]"
           initialDelaySeconds: 30
           periodSeconds: 5
         env: