From cf4b1313e1c0db8854b6ad6bd44491c1e8dd15af Mon Sep 17 00:00:00 2001
From: CSpicer-BAH <spicer_casey@bah.com>
Date: Mon, 2 Nov 2020 16:45:54 -0500
Subject: [PATCH 1/3] added healthcheck and temporary directory

---
 Dockerfile | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 9b4fb27..0307adf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,8 @@
 ARG BASE_REGISTRY=registry.access.redhat.com
 ARG BASE_IMAGE=ubi8/ubi
 ARG BASE_TAG=8.2
-FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
+#FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
+FROM registry.access.redhat.com/ubi8/ubi:8.2
 
 ### Required Atomic/OpenShift Labels - https://github.com/projectatomic/ContainerApplicationGenericLabels
 LABEL name="Solutions Delivery Platform: OWASP Dependency Check" \
@@ -63,13 +64,20 @@ 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}
 
+ENV URL=https://google.com
+ARG JAVA_OPTS
+ENV JAVA ${JAVA_OPTS:- '-Djava.io.tmp=/tempdir'}
+
 VOLUME ["/src" "/usr/share/dependency-check/data" "/report"]
 WORKDIR /src
 
 CMD []
 ENTRYPOINT [ "/bin/sh", "/usr/share/dependency-check/bin/container-entrypoint.sh" ]
+HEALTHCHECK --interval=30s --timeout=30s --start-period=5s --retries=3 CMD curl $URL
-- 
GitLab


From 6568f749d85bed2f0b9ac533d6a359f7d9716511 Mon Sep 17 00:00:00 2001
From: CSpicer-BAH <spicer_casey@bah.com>
Date: Mon, 2 Nov 2020 16:58:36 -0500
Subject: [PATCH 2/3] corrected FROM statement

---
 Dockerfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 0307adf..f513bcf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,7 @@
 ARG BASE_REGISTRY=registry.access.redhat.com
 ARG BASE_IMAGE=ubi8/ubi
 ARG BASE_TAG=8.2
-#FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
-FROM registry.access.redhat.com/ubi8/ubi:8.2
+FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 
 ### Required Atomic/OpenShift Labels - https://github.com/projectatomic/ContainerApplicationGenericLabels
 LABEL name="Solutions Delivery Platform: OWASP Dependency Check" \
-- 
GitLab


From af525c777621c289ff2ffc6cf527ddfa9086c470 Mon Sep 17 00:00:00 2001
From: CSpicer-BAH <spicer_casey@bah.com>
Date: Tue, 3 Nov 2020 13:13:57 -0500
Subject: [PATCH 3/3] removed healthcheck

---
 Dockerfile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index f513bcf..c2d481a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -69,8 +69,7 @@ RUN useradd -ms /bin/bash ${user}                                           && \
     [ ! -d /var/cache/yum ] || rm -rf /var/cache/yum
 
 USER ${user}
-
-ENV URL=https://google.com
+#Point java to use a dedicated directory for ephemeral use
 ARG JAVA_OPTS
 ENV JAVA ${JAVA_OPTS:- '-Djava.io.tmp=/tempdir'}
 
@@ -79,4 +78,3 @@ WORKDIR /src
 
 CMD []
 ENTRYPOINT [ "/bin/sh", "/usr/share/dependency-check/bin/container-entrypoint.sh" ]
-HEALTHCHECK --interval=30s --timeout=30s --start-period=5s --retries=3 CMD curl $URL
-- 
GitLab