Merge branch 'development' into 'master'

Development

See merge request !66

Dockerfile

@@ -6,7 +6,7 @@ FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 USER 0
 
 # Set up environment variables
-ENV FLUENTD_VERSION="1.13.0" \
+ENV FLUENTD_VERSION="1.13.1" \
     DESCRIPTION="Fluentd docker image" \
     FLUENT_USER="fluent" \
     FLUENT_UID="1000" \

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.0"
+- "1.13.1"
 - "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.0"
+  org.opencontainers.image.version: "1.13.1"
   mil.dso.ironbank.image.keywords: "fluentd, data collector"
   mil.dso.ironbank.image.type: "opensource"
   mil.dso.ironbank.product.name: "fluentd"
@@ -31,15 +31,15 @@ labels:
 # List of resources to make available to the offline build context
 resources:
 - filename: fluentd.gem
-  url: https://rubygems.org/downloads/fluentd-1.13.0.gem
+  url: https://rubygems.org/downloads/fluentd-1.13.1.gem
   validation:
     type: sha256
-    value: 23af8a10e05d0d3a58db35ef0940e48fab3a48476ab845a2a40aeb14fda9b5fd
+    value: 37b721d193053351a21aca198d9c515b5a4add1ff8b8c56bcaa7d24af79ef9bc
 - filename: oj.gem
-  url: https://rubygems.org/downloads/oj-3.11.6.gem
+  url: https://rubygems.org/downloads/oj-3.11.7.gem
   validation:
     type: sha256
-    value: c188f210a942b473eb19b52028ef3f00498a8677279b68084e5e9cd3573427e4
+    value: f87ac70b7912aec1e12a23fd84064ddb31f964628f32adec0be378788d4fe7d7
 - filename: cool.io.gem
   url: https://rubygems.org/downloads/cool.io-1.7.1.gem
   validation: