Merge branch 'development' into 'master'

Merge Development branch to Master

See merge request !15

Dockerfile

@@ -10,13 +10,14 @@ FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 USER 0
 
 ENV GRADLE_HOME=/opt/gradle
-COPY gradle-6.8.3-bin.zip /
+COPY gradle-bin.zip /
 
 RUN dnf update -y && \
     dnf install -y unzip && \
-    unzip -d ${GRADLE_HOME} /gradle-6.8.3-bin.zip && \
-    rm -f gradle-6.7.1-bin.zip && \
-    ln -s /opt/gradle/gradle-6.8.3/bin/gradle /usr/bin/gradle && \
+    unzip -d ${GRADLE_HOME} /gradle-bin.zip && \
+    rm -f gradle-bin.zip && \
+    mv /opt/gradle/gradle-* /opt/gradle/gradle && \
+    ln -s /opt/gradle/gradle/bin/gradle /usr/bin/gradle && \
     dnf clean all && \
     rm -rf /var/cache/dnf
 

hardening_manifest.yaml

@@ -8,7 +8,7 @@ name: "opensource/gradle/gradle-jre8"
 # The most specific version should be the first tag and will be shown
 # on ironbank.dsop.io
 tags:
-- "6.8.3"
+- "7.1.1"
 - "latest"
 
 # Build args passed to Dockerfile ARGs
@@ -27,7 +27,7 @@ labels:
   org.opencontainers.image.url: "https://gradle.org/releases/"
   ## Name of the distributing entity, organization or individual
   org.opencontainers.image.vendor: "Gradle Inc. 2020"
-  org.opencontainers.image.version: "6.8.3"
+  org.opencontainers.image.version: "7.1.1"
   ## Keywords to help with search (ex. "cicd,gitops,golang")
   mil.dso.ironbank.image.keywords: "gradle-jre11,gradle"
   ## This value can be "opensource" or "commercial"
@@ -37,11 +37,11 @@ labels:
 
 # List of resources to make available to the offline build context
 resources:
-- filename: gradle-6.8.3-bin.zip
-  url: https://services.gradle.org/distributions/gradle-6.8.3-bin.zip
+- filename: gradle-bin.zip
+  url: https://services.gradle.org/distributions/gradle-7.1.1-bin.zip
   validation:
     type: sha256
-    value: 7faa7198769f872826c8ef4f1450f839ec27f0b4d5d1e51bade63667cbccd205
+    value: bf8b869948901d422e9bb7d1fa61da6a6e19411baa7ad6ee929073df85d6365d
 
 maintainers:
 - email: "melissari_sean@bah.com"