Skip to content

Commit b5bee5e

Browse files
Upgrade to UBI 8.2
1 parent cd9ce71 commit b5bee5e

8 files changed

+7
-7
lines changed

owasp-dep-check/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM registry.access.redhat.com/ubi8/ubi:8.1-408
1+
FROM registry.access.redhat.com/ubi8/ubi:8.2
22

33
### Required Atomic/OpenShift Labels - https://github.com/projectatomic/ContainerApplicationGenericLabels
44
LABEL name="Solutions Delivery Platform: Jenkins Agent" \
@@ -17,7 +17,7 @@ RUN INSTALL_PKGS="java-1.8.0-openjdk-devel ruby unzip" && \
1717
yum -y update-minimal --setopt=tsflags=nodocs --security && \
1818
yum -y install --setopt=tsflags=nodocs ${INSTALL_PKGS}
1919

20-
ENV SDP_DCAR_OWASP_DEP_CHK_VERSION dcar-0.9
20+
ENV SDP_DCAR_OWASP_DEP_CHK_VERSION dcar-1.1
2121
ENV OWASP_DEP_CHK_VERSION 5.3.2
2222
ENV HOME /root
2323
ENV JAVA_HOME /usr/lib/jvm/java

owasp-dep-check/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ push: ## builds and publishes container image
2929

3030
build-dep: ## build container dependencies
3131
$(eval dir := $(shell pwd))
32-
docker run -it -v $(dir)/prebuild:/root/prebuild:z centos:8 /root/prebuild/pull-from-centos.sh
33-
docker run -it -v $(dir)/prebuild:/root/prebuild:z registry.access.redhat.com/ubi8/ubi:8.1-408 /root/prebuild/build-dep.sh
32+
docker run -it -v $(dir)/prebuild:/root/prebuild:z registry.access.redhat.com/ubi8/ubi:8.2 /root/prebuild/pull-from-centos.sh
33+
docker run -it -v $(dir)/prebuild:/root/prebuild:z registry.access.redhat.com/ubi8/ubi:8.2 /root/prebuild/build-dep.sh
3434

3535
info:
3636
@echo "$(TAG) -> $$(dirname $$(git ls-files --full-name Makefile))"

owasp-dep-check/prebuild/build-dep.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
set -xe
44

5-
SDP_DCAR_OWASP_DEP_CHK_VERSION=dcar-0.9
5+
SDP_DCAR_OWASP_DEP_CHK_VERSION=dcar-1.1
66

77
cd /root/prebuild
88
tar czvf owasp-dep-check-dependencies-$SDP_DCAR_OWASP_DEP_CHK_VERSION.tar.gz dependencies

owasp-dep-check/prebuild/owasp-dep-check-dependencies-dcar-0.9.sha256

-1
This file was deleted.
Binary file not shown.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
5f8313632c442d700301edc5c72ee492f377fe4f72eb98d1907e7c9cdb403a0f
Binary file not shown.

owasp-dep-check/prebuild/pull-from-centos.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
set -xe
44

55
OWASP_DEP_CHK_VERSION=5.3.2
6-
SDP_DCAR_OWASP_DEP_CHK_VERSION=dcar-0.9
6+
SDP_DCAR_OWASP_DEP_CHK_VERSION=dcar-1.1
77

88
rm -rf /root/prebuild/dependencies
99

0 commit comments

Comments
 (0)