UNCLASSIFIED

Commit cd7c2ae7 authored by Gerard Fulton's avatar Gerard Fulton
Browse files

Merge branch 'gfulton-development-patch-82520' into 'development'

Update Dockerfile

See merge request !10
parents 92f70289 131c34d8
Pipeline #5132 failed with stage
...@@ -16,7 +16,7 @@ LABEL name="Solutions Delivery Platform: OWASP Dependency Check" \ ...@@ -16,7 +16,7 @@ LABEL name="Solutions Delivery Platform: OWASP Dependency Check" \
COPY LICENSE /licenses COPY LICENSE /licenses
### Install packages from ubi base repo ### Install packages from ubi base repo
RUN INSTALL_PKGS="java-1.8.0-openjdk-devel ruby unzip" && \ RUN INSTALL_PKGS="java-1.8.0-openjdk-devel ruby ruby-devel unzip" && \
yum update -y \ yum update -y \
--disablerepo="*" \ --disablerepo="*" \
--enablerepo="*ubi-7*" \ --enablerepo="*ubi-7*" \
...@@ -25,24 +25,28 @@ RUN INSTALL_PKGS="java-1.8.0-openjdk-devel ruby unzip" && \ ...@@ -25,24 +25,28 @@ RUN INSTALL_PKGS="java-1.8.0-openjdk-devel ruby unzip" && \
--security \ --security \
--sec-severity=Important \ --sec-severity=Important \
--sec-severity=Critical && \ --sec-severity=Critical && \
yum install ${INSTALL_PKGS} -y \ yum install -y ${INSTALL_PKGS} \
--disablerepo="*" \ --disablerepo="*" \
--enablerepo="*ubi-7*" \ --enablerepo="*ubi-7*" \
--disableplugin=subscription-manager \ --disableplugin=subscription-manager \
--setopt=tsflags=nodocs --setopt=tsflags=nodocs && \
yum -y -v clean all && \
[ ! -d /var/cache/yum ] || rm -rf /var/cache/yum
### Arguments and Environment variables ### Arguments and Environment variables
ENV user dependencycheck ENV user dependencycheck
ARG SDP_BUILD_DEPENDENCY_VERSION dcar-0.4 ARG SDP_BUILD_DEPENDENCY_VERSION="dcar-0.3"
ENV OWASP_DEP_CHECK_VERSION 5.2.4 ENV OWASP_DEP_CHK_VERSION 5.2.4
### Fetch dependency bundle ### Fetch dependency bundle
RUN mkdir /root/tmp RUN mkdir /root/tmp
COPY owasp-dep-check-dependencies-$SDP_BUILD_DEPENDENCY_VERSION.tar.gz /root/tmp/owasp-dep-check-dependencies-$OWASP_DEP_CHECK_VERSION.tar.gz COPY owasp-dep-check-dependencies-$SDP_BUILD_DEPENDENCY_VERSION.tar.gz /root/tmp/owasp-dep-check-dependencies-$OWASP_DEP_CHK_VERSION.tar.gz
### Install mono-devel ### Install mono-devel
RUN cd /root/tmp && tar -xzf owasp-dep-check-dependencies-$OWASP_DEP_CHECK_VERSION.tar.gz && rpm -ivh --replacepkgs --replacefiles /root/tmp/dependencies/mono-devel/*.rpm && rm /root/tmp/owasp-dep-check-dependencies-$OWASP_DEP_CHECK_VERSION.tar.gz RUN cd /root/tmp && \
tar -xzf owasp-dep-check-dependencies-$OWASP_DEP_CHK_VERSION.tar.gz && \
rpm -ivh --replacepkgs --replacefiles /root/tmp/dependencies/mono-devel/*.rpm && \
rm /root/tmp/owasp-dep-check-dependencies-$OWASP_DEP_CHK_VERSION.tar.gz
### Install ruby dependencies ### Install ruby dependencies
RUN cd /root/tmp && \ RUN cd /root/tmp && \
......
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