Merge branch 'development' into 'master'

Merge Development branch to Master branch

See merge request !76

Dockerfile

@@ -6,7 +6,7 @@ FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 USER 0
 
 # Set up environment variables
-ENV FLUENTD_VERSION="1.13.1" \
+ENV FLUENTD_VERSION="1.13.2" \
     DESCRIPTION="Fluentd docker image" \
     FLUENT_USER="fluent" \
     FLUENT_UID="1000" \
@@ -25,21 +25,52 @@ COPY cool.io.gem fluentd.gem oj.gem http_parser.gem msgpack.gem \
 # Install development tools
 RUN yum update -y && \
     yum install -y make gcc bzip2 && \
-    gem install --force --local -N /opt/*.gem && \
+
+    # Ruby doesn't autogenerate proper dependency trees when installing via
+    # a wildcard such as *.gem. Therefor, we install them individually and
+    # in the correct order.
+    gem install --local -N \
+        /opt/concurrent-ruby.gem \
+        /opt/strptime.gem \
+        /opt/sigdump.gem \
+        /opt/tzinfo.gem \
+        /opt/tzinfo-data.gem \
+        /opt/bigdecimal.gem \
+        /opt/cool.io.gem \
+        /opt/http_parser.gem \
+        /opt/json.gem \
+        /opt/msgpack.gem \
+        /opt/oj.gem \
+        /opt/webrick.gem \
+        /opt/yajl-ruby.gem \
+        /opt/serverengine.gem \
+        /opt/fluentd.gem && \
+
+    # Install tini
     mv /opt/tini /usr/local/bin && \
     chmod +x /usr/local/bin/tini && \
-    tini -h && \
-    cd /opt && mkdir jemalloc && tar --strip-components=1 --no-same-owner -C jemalloc -xjf jemalloc.tar.bz2 && cd jemalloc && \
-    ./configure && make && \
+
+    # Build jemalloc
+    cd /opt && mkdir jemalloc && \
+    tar --strip-components=1 --no-same-owner -C jemalloc -xjf jemalloc.tar.bz2 && \
+    cd jemalloc && \
+    ./configure && \
+    make && \
     mv lib/libjemalloc.so.2 /usr/lib && \
+    cd /opt && \
+    rm -rf jemalloc && \
+
     mv /opt/{entrypoint.sh,fix-permissions} /usr/local/bin && \
     chmod a+rx /usr/local/bin/{entrypoint.sh,fix-permissions} && \
+
+    # Cleanup
     yum erase -y make gcc bzip2 && \
     yum clean all && \
-    echo 'Packages removed' && \
+
+    # Delete unecessary PEM files used for testing by various GEMs
     rm -rf /opt/*.gem /var/opt/* /usr/lib/ruby/gems/*/cache/*.gem /var/cache/yum && \
-    rm -f /usr/local/bundle/gems/fluentd-1.13.1/test/plugin_helper/data/*/*/*.pem && \
-    rm -f /usr/local/bundle/gems/fluentd-1.13.1/test/plugin_helper/data/cert/cert-key.pem
+    rm -f /usr/local/bundle/gems/fluentd-1.13.2/test/plugin_helper/data/*/*/*.pem && \
+    rm -f /usr/local/bundle/gems/fluentd-1.13.2/test/plugin_helper/data/cert/cert-key.pem
     
     
 

hardening_manifest.yaml

@@ -8,7 +8,7 @@ name: "opensource/fluentd/fluentd"
 # The most specific version should be the first tag and will be shown
 # on ironbank.dsop.io
 tags:
-- "1.13.1"
+- "1.13.2"
 - "latest"
 
 # Build args passed to Dockerfile ARGs
@@ -23,7 +23,7 @@ labels:
   org.opencontainers.image.licenses: "Apache License v2.0"
   org.opencontainers.image.url: "https://www.fluentd.org/architecture"
   org.opencontainers.image.vendor: "fluend"
-  org.opencontainers.image.version: "1.13.1"
+  org.opencontainers.image.version: "1.13.2"
   mil.dso.ironbank.image.keywords: "fluentd, data collector"
   mil.dso.ironbank.image.type: "opensource"
   mil.dso.ironbank.product.name: "fluentd"
@@ -31,10 +31,10 @@ labels:
 # List of resources to make available to the offline build context
 resources:
 - filename: fluentd.gem
-  url: https://rubygems.org/downloads/fluentd-1.13.1.gem
+  url: https://rubygems.org/downloads/fluentd-1.13.2.gem
   validation:
     type: sha256
-    value: 37b721d193053351a21aca198d9c515b5a4add1ff8b8c56bcaa7d24af79ef9bc
+    value: cfe5fa58aaf6c96647a09710113d12a829002a50292ca8000f187d2caf451f4e
 - filename: oj.gem
   url: https://rubygems.org/downloads/oj-3.12.1.gem
   validation: