Merge branch 'development' into 'master'

Development

See merge request !41

Dockerfile

-ARG BASE_REGISTRY=registry.access.redhat.com
-ARG BASE_IMAGE=ubi8/ubi
-ARG BASE_TAG=8.2
+ARG BASE_REGISTRY=registry1.dsop.io
+ARG BASE_IMAGE=redhat/openjdk/openjdk8
+ARG BASE_TAG=1.8.0
 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
-
-### Required Atomic/OpenShift Labels - https://github.com/projectatomic/ContainerApplicationGenericLabels
-LABEL name="Solutions Delivery Platform: OWASP Dependency Check" \
-      maintainer="terrana_steven@bah.com" \
-      vendor="Booz Allen Hamilton" \
-      version="5.3.2" \
-      release="5.3.2" \
-      summary="OWASP Dependency Check container" \
-      description="The OWASP Dependency Check container image for the Solutions Delivery Platform"
+USER root
 
 ### add licenses to this directory
 COPY LICENSE /licenses
 
 ### Install packages from ubi base repo
-RUN INSTALL_PKGS="java-1.8.0-openjdk ruby unzip" && \
+RUN INSTALL_PKGS="ruby unzip" && \
     yum clean metadata && \
     yum -y update --setopt=tsflags=nodocs && \
     yum -y install --setopt=tsflags=nodocs ${INSTALL_PKGS} && \
     yum -y -v clean all && \
     [ ! -d /var/cache/yum ] || rm -rf /var/cache/yum
 
-
-
 ### Arguments and Environment variables
 ENV user dependencycheck
-ARG SDP_BUILD_DEPENDENCY_VERSION="dcar-1.1"
-ENV OWASP_DEP_CHK_VERSION 5.3.2
+ARG SDP_BUILD_DEPENDENCY_VERSION="dcar-2.0"
+ENV OWASP_DEP_CHK_VERSION 6.1.6
 
 ### Fetch dependency bundle
 RUN mkdir /root/tmp
@@ -40,11 +30,12 @@ RUN cd /root/tmp && \
     rpm -ivh --replacepkgs --replacefiles --force /root/tmp/dependencies/mono-complete/*.rpm && \
     rm /root/tmp/owasp-dep-check-dependencies-$OWASP_DEP_CHK_VERSION.tar.gz
 
-### Install ruby dependencies
+### Install ruby dependencies and update rdoc
 RUN cd /root/tmp && \
     gem install --force --local /root/tmp/dependencies/bundle-audit/*.gem --no-document --no-rdoc --no-ri && \
     gem cleanup
     
+
 ### Install OWASP Dependency Check binaries
 RUN cd /root/tmp/dependencies/owasp && \
     unzip dependency-check-${OWASP_DEP_CHK_VERSION}-release.zip    && \
@@ -63,10 +54,15 @@ RUN useradd -ms /bin/bash ${user}                                           && \
     chown -R ${user}:${user} /usr/share/dependency-check                    && \
     mkdir /report                                                           && \
     chown -R ${user}:${user} /report                                        && \
+    mkdir /tempdir                                                          && \
+    chown -R ${user}:${user} /tempdir                                       && \
     yum -y -v clean all                                                     && \
     [ ! -d /var/cache/yum ] || rm -rf /var/cache/yum
 
 USER ${user}
+#Point java to use a dedicated directory for ephemeral use
+ARG JAVA_OPTS
+ENV JAVA ${JAVA_OPTS:- '-Djava.io.tmp=/tempdir'}
 
 VOLUME ["/src" "/usr/share/dependency-check/data" "/report"]
 WORKDIR /src

Jenkinsfile

-@Library('DCCSCR@master') _
-dccscrPipeline(version: "5.3.2")

README.md

-# OWASP Dependency Check  Container Version 5.3.2
+# OWASP Dependency Check  Container Version 6.1.6
 
 ## Introduction
 
@@ -11,7 +11,7 @@ The following is a list of variables:
 ARG BASE_REGISTRY         = defines the registry portion of the OS image to be used in the FROM command.
 ARG BASE_IMAGE            = defines the image portion of the OS image to be used in the FROM command.
 ARG BASE_TAG              = defines the tag portion of the OS image to be used in the FROM command.
-ARG SDP_BUILD_DEPENDENCY_VERSION  = defines the release in https://github.com/boozallen/sdp-images/releases that the dependency bundle should be pulled from - default dcar-0.9
+ARG SDP_BUILD_DEPENDENCY_VERSION  = defines the release in https://github.com/boozallen/sdp-images/releases that the dependency bundle should be pulled from - default dcar-2.0
 ```
 
 Recommended resources for the image:

download.yaml

-resources:
-  - url: "https://github.com/boozallen/sdp-images/releases/download/dcar-1.1/owasp-dep-check-dependencies-dcar-1.1.tar.gz"
-    filename: "owasp-dep-check-dependencies-dcar-1.1.tar.gz" 
-    validation:
-      type: "sha256"
-      value: "650c054fba0881434aa50d099fbdf1f0d7bbca7add3eb2aaf6e672158997e448"

hardening_manifest.yaml

+---
+apiVersion: v1
+
+# The repository name in registry1, excluding /ironbank/
+name: "solutions-delivery-platform/dependency-check/dependency-check"
+
+# List of tags to push for the repository in registry1
+# The most specific version should be the first tag and will be shown
+# on ironbank.dsop.io
+tags:
+- "6.1.6"
+- "latest"
+
+# Build args passed to Dockerfile ARGs
+args:
+  BASE_IMAGE: "redhat/openjdk/openjdk8"
+  BASE_TAG: "1.8.0"
+
+# Docker image labels
+labels:
+  org.opencontainers.image.title: "dependency-check"
+  ## Human-readable description of the software packaged in the image
+  org.opencontainers.image.description: "OWASP Dependency Check for vulnerability scanning code dependency files"
+  ## License(s) under which contained software is distributed
+  org.opencontainers.image.licenses: "Booz Allen Public License v1.0"
+  ## URL to find more information on the image
+  org.opencontainers.image.url: "https://github.com/boozallen/sdp-images"
+  ## Name of the distributing entity, organization or individual
+  org.opencontainers.image.vendor: "Booz Allen Hamilton"
+  org.opencontainers.image.version: "6.1.6"
+  ## Keywords to help with search (ex. "cicd,gitops,golang")
+  mil.dso.ironbank.image.keywords: "OWASP, dependency, check, dependency-check, SDP, cve, scanner, scan"
+  ## This value can be "opensource" or "commercial"
+  mil.dso.ironbank.image.type: "opensource"
+  ## Product the image belongs to for grouping multiple images
+  mil.dso.ironbank.product.name: "Solutions Delivery Platform"
+
+# List of resources to make available to the offline build context
+resources:
+- filename: owasp-dep-check-dependencies-dcar-2.0.tar.gz
+  url: https://github.com/boozallen/sdp-images/releases/download/dcar-2.0/owasp-dep-check-dependencies-dcar-2.0.tar.gz
+  validation:
+    type: sha256
+    value: 0bfbeedf54fea7b3633103a9e9fdc20ab1427b1a0f48921d88551717316647ec
+
+# List of project maintainers
+# FIXME: Fill in the following details for the current container owner in the whitelist
+# FIXME: Include any other vendor information if applicable
+maintainers:
+- email: "spicer_casey@bah.com"
+#   # The name of the current container owner
+  name: "Casey Spicer"
+#   # The gitlab username of the current container owner
+  username: "cspicer"
+#   cht_member: true # FIXME: Uncomment if the maintainer is a member of CHT
+- name: "Al Fontaine"
+  username: "alfontaine"
+  email: "alan.fontaine@centauricorp.com"