Merge branch 'development' into 'master'

Development

See merge request !81

Dockerfile

@@ -6,7 +6,7 @@ FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 USER 0
 
 # Set up environment variables
-ENV FLUENTD_VERSION="1.13.2" \
+ENV FLUENTD_VERSION="1.13.3" \
     DESCRIPTION="Fluentd docker image" \
     FLUENT_USER="fluent" \
     FLUENT_UID="1000" \
@@ -69,8 +69,8 @@ RUN yum update -y && \
 
     # 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.2/test/plugin_helper/data/*/*/*.pem && \
-    rm -f /usr/local/bundle/gems/fluentd-1.13.2/test/plugin_helper/data/cert/cert-key.pem
+    rm -f /usr/local/bundle/gems/fluentd-1.13.3/test/plugin_helper/data/*/*/*.pem && \
+    rm -f /usr/local/bundle/gems/fluentd-1.13.3/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.2"
+- "1.13.3"
 - "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.2"
+  org.opencontainers.image.version: "1.13.3"
   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.2.gem
+  url: https://rubygems.org/downloads/fluentd-1.13.3.gem
   validation:
     type: sha256
-    value: cfe5fa58aaf6c96647a09710113d12a829002a50292ca8000f187d2caf451f4e
+    value: 9b9ddabae9419ee86b5f8d4ac84ee70e68d43110309085e988aef401525a698a
 - filename: oj.gem
   url: https://rubygems.org/downloads/oj-3.12.2.gem
   validation: