Merge branch 'upgrade-contrib' into 'development'

Upgrade contrib

See merge request !16

Dockerfile

@@ -2,7 +2,7 @@ ARG BASE_REGISTRY=registry1.dso.mil
 ARG BASE_IMAGE=ironbank/redhat/openjdk/openjdk11
 ARG BASE_TAG=1.11
 
-FROM bitnami/redis:6.0.10 as base
+FROM bitnami/redis:6.2.2 as base
 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} as staging
 ARG BITNAMI_HOME=/opt/bitnami
 USER 0
@@ -50,7 +50,8 @@ WORKDIR ${REDIS_HOME}
 
 EXPOSE 6379
 
-HEALTHCHECK NONE
+HEALTHCHECK --start-period=3s --timeout=5s --interval=3s --retries=3 \
+  CMD curl -fs http://localhost:6379 || exit 1
 
 ENTRYPOINT [ "/opt/bitnami/scripts/redis/entrypoint.sh" ]
 CMD [ "/opt/bitnami/scripts/redis/run.sh" ]

hardening_manifest.yaml

@@ -8,7 +8,7 @@ name: "bitnami/redis"
 # The most specific version should be the first tag and will be shown
 # on ironbank.dso.mil
 tags:
-- "6.0.10"
+- "6.2.2"
 
 # Build args passed to Dockerfile ARGs
 args:
@@ -23,10 +23,10 @@ labels:
   ## License(s) under which contained software is distributed
   org.opencontainers.image.licenses: "Apache-2.0"
   ## URL to find more information on the image
-  org.opencontainers.image.url: "https://bitnami.com/stack/redis/containers"
+  org.opencontainers.image.url: "https://github.com/bitnami/bitnami-docker-redis"
   ## Name of the distributing entity, organization or individual
   org.opencontainers.image.vendor: "Bitnami"
-  org.opencontainers.image.version: "6.0.10"
+  org.opencontainers.image.version: "6.2.2"
   ## Keywords to help with search (ex. "cicd,gitops,golang")
   mil.dso.ironbank.image.keywords: "dataflow,streaming"
   ## This value can be "opensource" or "commercial"
@@ -36,8 +36,8 @@ labels:
 
 # List of resources to make available to the offline build context
 resources:
-- tag: bitnami/redis:6.0.10
-  url: docker://docker.io/bitnami/redis@sha256:d01c11dba2e3d76a330092743b8c93ae7e91e1b2f932806a06f76dd2bc9bb2ef
+- tag: bitnami/redis:6.2.2
+  url: docker://docker.io/bitnami/redis@sha256:45fa1b8fa8579a2cd8edebbbe66ba87e91ab48804750b572208db7611975e240
 
 # List of project maintainers
 maintainers: