UNCLASSIFIED

Commit 98397ddd authored by Karpagam Balan's avatar Karpagam Balan Committed by Hayden
Browse files

Upgrade to 5.3.2

parent 4098acc5
ARG BASE_REGISTRY=registry.access.redhat.com ARG BASE_REGISTRY=registry.access.redhat.com
ARG BASE_IMAGE=ubi8/ubi ARG BASE_IMAGE=ubi8/ubi
ARG BASE_TAG=8.1-406 ARG BASE_TAG=8.1-408
FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
### Required Atomic/OpenShift Labels - https://github.com/projectatomic/ContainerApplicationGenericLabels ### Required Atomic/OpenShift Labels - https://github.com/projectatomic/ContainerApplicationGenericLabels
LABEL name="Solutions Delivery Platform: OWASP Dependency Check" \ LABEL name="Solutions Delivery Platform: OWASP Dependency Check" \
maintainer="terrana_steven@bah.com" \ maintainer="terrana_steven@bah.com" \
vendor="Booz Allen Hamilton" \ vendor="Booz Allen Hamilton" \
version="5.3.1" \ version="5.3.2" \
release="5.3.1" \ release="5.3.2" \
summary="OWASP Dependency Check container" \ summary="OWASP Dependency Check container" \
description="The OWASP Dependency Check container image for the Solutions Delivery Platform" description="The OWASP Dependency Check container image for the Solutions Delivery Platform"
...@@ -18,8 +18,7 @@ COPY LICENSE /licenses ...@@ -18,8 +18,7 @@ COPY LICENSE /licenses
### Install packages from ubi base repo ### Install packages from ubi base repo
RUN INSTALL_PKGS="java-1.8.0-openjdk ruby unzip" && \ RUN INSTALL_PKGS="java-1.8.0-openjdk ruby unzip" && \
yum clean metadata && \ yum clean metadata && \
yum -y update-minimal --setopt=tsflags=nodocs \ yum -y update-minimal --setopt=tsflags=nodocs --security && \
--security --sec-severity=Important --sec-severity=Critical && \
yum -y install --setopt=tsflags=nodocs ${INSTALL_PKGS} && \ yum -y install --setopt=tsflags=nodocs ${INSTALL_PKGS} && \
yum -y -v clean all && \ yum -y -v clean all && \
[ ! -d /var/cache/yum ] || rm -rf /var/cache/yum [ ! -d /var/cache/yum ] || rm -rf /var/cache/yum
...@@ -28,8 +27,8 @@ RUN INSTALL_PKGS="java-1.8.0-openjdk ruby unzip" && \ ...@@ -28,8 +27,8 @@ RUN INSTALL_PKGS="java-1.8.0-openjdk ruby unzip" && \
### Arguments and Environment variables ### Arguments and Environment variables
ENV user dependencycheck ENV user dependencycheck
ARG SDP_BUILD_DEPENDENCY_VERSION="dcar-0.5" ARG SDP_BUILD_DEPENDENCY_VERSION="dcar-0.9"
ENV OWASP_DEP_CHK_VERSION 5.3.1 ENV OWASP_DEP_CHK_VERSION 5.3.2
### Fetch dependency bundle ### Fetch dependency bundle
RUN mkdir /root/tmp RUN mkdir /root/tmp
...@@ -68,3 +67,4 @@ WORKDIR /src ...@@ -68,3 +67,4 @@ WORKDIR /src
CMD ["--help"] CMD ["--help"]
HEALTHCHECK --interval=30s --timeout=30s --start-period=5s --retries=3 CMD stat /usr/share/dependency-check/bin/dependency-check.sh HEALTHCHECK --interval=30s --timeout=30s --start-period=5s --retries=3 CMD stat /usr/share/dependency-check/bin/dependency-check.sh
ENTRYPOINT ["/usr/share/dependency-check/bin/dependency-check.sh"] ENTRYPOINT ["/usr/share/dependency-check/bin/dependency-check.sh"]
@Library('DCCSCR@master') _ @Library('DCCSCR@master') _
dccscrPipeline(version: "5.3.1") dccscrPipeline(version: "5.3.2")
# OWASP Dependency Check Container Version 5.3.1 # OWASP Dependency Check Container Version 5.3.2
## Introduction ## Introduction
...@@ -11,9 +11,9 @@ The following is a list of variables: ...@@ -11,9 +11,9 @@ 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_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_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 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 form - default dcar-0.5 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
``` ```
Recommended resources for the image: Recommended resources for the image:
The Jenkins agent on the Solutions Delivery Platform will run this container as pasrt of thebuild pipeline. All resources are inherited at runtime from the Jenkins Agent container. The Jenkins agent on the Solutions Delivery Platform will run this container as pasrt of thebuild pipeline. All resources are inherited at runtime from the Jenkins Agent container.
resources: resources:
- url: "https://github.com/boozallen/sdp-images/releases/download/dcar-0.5/owasp-dep-check-dependencies-dcar-0.5.tar.gz" - url: "https://github.com/boozallen/sdp-images/releases/download/dcar-0.9/owasp-dep-check-dependencies-dcar-0.9.tar.gz"
filename: "owasp-dep-check-dependencies-dcar-0.5.tar.gz" filename: "owasp-dep-check-dependencies-dcar-0.9.tar.gz"
validation: validation:
type: "sha256" type: "sha256"
value: "5251f37724e1965ab5e27cfd565b1be4b258c76a1885ab963c0438daf7aa3069" value: "c8171d2736d5b9ba96ae5601439151768081125f1f5b5c640c8603c00a8e6d75"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment