Merge branch 'development' into 'master'

merge development into master

See merge request !2

5.2.4/Dockerfile

 ARG BASE_REGISTRY=registry.access.redhat.com
 ARG BASE_IMAGE=ubi7/ubi
-ARG BASE_TAG=7.7
+ARG BASE_TAG=7.8
 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 
 MAINTAINER terrana_steven@bah.com
 
 ### Required Atomic/OpenShift Labels - https://github.com/projectatomic/ContainerApplicationGenericLabels
+ARG OWASP_DEP_CHK_VERSION=5.2.4
 LABEL name="Solutions Delivery Platform: OWASP Dependency Checker" \
       maintainer="terrana_steven@bah.com" \
       vendor="Booz Allen Hamilton" \
-      version="5.2.4" \
-      release="5.2.4" \
+      version="${OWASP_DEP_CHK_VERSION}" \
+      release="${OWASP_DEP_CHK_VERSION}" \
       summary="An OWASP Dependency Checker container" \
       description="The OWASP Dependency Check container image for the Solutions Delivery Platform"
 
@@ -37,7 +38,6 @@ RUN INSTALL_PKGS="java-1.8.0-openjdk-devel mono-devel ruby unzip" && \
 
 ### Install your application here -- add all other necessary items to build your image
 ARG user=dependencycheck
-ARG OWASP_DEP_CHK_VERSION=5.2.4
 
 RUN gem install "rubygems-update:<3.0.0" --no-document                      && \
     update_rubygems                                                         && \