diff --git a/jenkins-agent/Dockerfile b/jenkins-agent/Dockerfile index 2ef8464..e1703bc 100644 --- a/jenkins-agent/Dockerfile +++ b/jenkins-agent/Dockerfile @@ -24,9 +24,9 @@ RUN INSTALL_PKGS="tar hostname device-mapper-persistent-data lvm2 java-1.8.0-ope yum --disableplugin=subscription-manager -y install --setopt=tsflags=nodocs ${INSTALL_PKGS} ### Install your application here -- add all other necessary items to build your image -ENV JENKINS_AGENT_VERSION dcar-1.8 -ENV JENKINS_SWARM_VERSION 3.24 -ENV JNLP_SLAVE_VERSION 4.6 +ENV JENKINS_AGENT_VERSION dcar-2.0 +ENV JENKINS_SWARM_VERSION 3.25 +ENV JNLP_SLAVE_VERSION 4.8 ENV HOME /root ENV JAVA_HOME /usr/lib/jvm/java diff --git a/jenkins-agent/prebuild/build-dep.sh b/jenkins-agent/prebuild/build-dep.sh index 4a199ec..9381f3d 100755 --- a/jenkins-agent/prebuild/build-dep.sh +++ b/jenkins-agent/prebuild/build-dep.sh @@ -2,7 +2,7 @@ set -xe -JENKINS_AGENT_VERSION=dcar-1.8 +JENKINS_AGENT_VERSION=dcar-2.0 cd /root/prebuild rm -f dependencies/docker-ce/coreutils-8.30-8.el8.x86_64.rpm diff --git a/jenkins-agent/prebuild/jenkins-agent-dependencies-dcar-1.8.sha256 b/jenkins-agent/prebuild/jenkins-agent-dependencies-dcar-1.8.sha256 deleted file mode 100644 index 1104577..0000000 --- a/jenkins-agent/prebuild/jenkins-agent-dependencies-dcar-1.8.sha256 +++ /dev/null @@ -1 +0,0 @@ -fbee09e2336ea7513a2f1287efd0bec7133f0b94b4c5f899c10c5cca509c6905 diff --git a/jenkins-agent/prebuild/jenkins-agent-dependencies-dcar-1.8.sig b/jenkins-agent/prebuild/jenkins-agent-dependencies-dcar-1.8.sig deleted file mode 100644 index f3248e8..0000000 Binary files a/jenkins-agent/prebuild/jenkins-agent-dependencies-dcar-1.8.sig and /dev/null differ diff --git a/jenkins-agent/prebuild/jenkins-agent-dependencies-dcar-2.0.sha256 b/jenkins-agent/prebuild/jenkins-agent-dependencies-dcar-2.0.sha256 new file mode 100644 index 0000000..a816e2c --- /dev/null +++ b/jenkins-agent/prebuild/jenkins-agent-dependencies-dcar-2.0.sha256 @@ -0,0 +1 @@ +dc2d4c21f6939758a0ca9814ffcca73f02f69188e303033ec5398eb4cdfd4405 diff --git a/jenkins-agent/prebuild/jenkins-agent-dependencies-dcar-2.0.sig b/jenkins-agent/prebuild/jenkins-agent-dependencies-dcar-2.0.sig new file mode 100644 index 0000000..8644b8c Binary files /dev/null and b/jenkins-agent/prebuild/jenkins-agent-dependencies-dcar-2.0.sig differ diff --git a/jenkins-agent/prebuild/pull-from-centos.sh b/jenkins-agent/prebuild/pull-from-centos.sh index 166e51c..1751893 100755 --- a/jenkins-agent/prebuild/pull-from-centos.sh +++ b/jenkins-agent/prebuild/pull-from-centos.sh @@ -2,9 +2,9 @@ set -xe -JENKINS_AGENT_VERSION=dcar-1.8 -JENKINS_SWARM_VERSION=3.24 -JNLP_SLAVE_VERSION=4.6 +JENKINS_AGENT_VERSION=dcar-2.0 +JENKINS_SWARM_VERSION=3.25 +JNLP_SLAVE_VERSION=4.8 rm -rf /root/prebuild/dependencies mkdir -p /root/prebuild/dependencies/swarm-client /root/prebuild/dependencies/agent /root/prebuild/dependencies/docker-ce /root/prebuild/dependencies/pip3 /root/prebuild/dependencies/docker-compose /root/prebuild/dependencies/supervisor /root/prebuild/dependencies/hostname diff --git a/jenkins-agent/prebuild/pull-from-ubi.sh b/jenkins-agent/prebuild/pull-from-ubi.sh index a35071a..dbd9ed5 100755 --- a/jenkins-agent/prebuild/pull-from-ubi.sh +++ b/jenkins-agent/prebuild/pull-from-ubi.sh @@ -2,9 +2,9 @@ set -xe -JENKINS_AGENT_VERSION=dcar-1.8 -JENKINS_SWARM_VERSION=3.24 -JNLP_SLAVE_VERSION=4.6 +JENKINS_AGENT_VERSION=dcar-2.0 +JENKINS_SWARM_VERSION=3.25 +JNLP_SLAVE_VERSION=4.8 curl --create-dirs -sSLo /root/prebuild/dependencies/swarm-client/swarm-client-${JENKINS_SWARM_VERSION}.jar http://repo.jenkins-ci.org/releases/org/jenkins-ci/plugins/swarm-client/${JENKINS_SWARM_VERSION}/swarm-client-${JENKINS_SWARM_VERSION}.jar curl --create-dirs -sSLo /root/prebuild/dependencies/agent/remoting-${JNLP_SLAVE_VERSION}.jar http://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/${JNLP_SLAVE_VERSION}/remoting-${JNLP_SLAVE_VERSION}.jar diff --git a/openshift_helm/Dockerfile b/openshift_helm/Dockerfile index 64a68ed..1f1dae6 100644 --- a/openshift_helm/Dockerfile +++ b/openshift_helm/Dockerfile @@ -15,7 +15,7 @@ LABEL name="Solutions Delivery Platform: Helm" \ summary="A container used by the openshift and kubernetes libraries within the Solutions Delivery Platform" \ description="A container used by the openshift and kubernetes libraries within the Solutions Delivery Platform" -ARG SDP_BUILD_DEPENDENCY_VERSION=dcar-1.8 +ARG SDP_BUILD_DEPENDENCY_VERSION=dcar-2.0 ARG user=sdp ARG group=sdp ARG uid=1000 diff --git a/openshift_helm/prebuild/build-dep.sh b/openshift_helm/prebuild/build-dep.sh index acadc37..f8d1164 100755 --- a/openshift_helm/prebuild/build-dep.sh +++ b/openshift_helm/prebuild/build-dep.sh @@ -2,10 +2,10 @@ set -xe -SDP_BUILD_DEPENDENCY_VERSION=dcar-1.8 +SDP_BUILD_DEPENDENCY_VERSION=dcar-2.0 OC_VERSION=v3.11.0 -HELM_VERSION=v3.5.2 -KUBECTL_VERSION=v1.20.0 +HELM_VERSION=v3.5.4 +KUBECTL_VERSION=v1.21.1 rm -rf /root/prebuild/dependencies mkdir -p /root/prebuild/dependencies diff --git a/openshift_helm/prebuild/helm-dependencies-dcar-1.8.sha256 b/openshift_helm/prebuild/helm-dependencies-dcar-1.8.sha256 deleted file mode 100644 index 5abbcbc..0000000 --- a/openshift_helm/prebuild/helm-dependencies-dcar-1.8.sha256 +++ /dev/null @@ -1 +0,0 @@ -0740d1eded0d544bc3612117671cf8024aba066ee6fcf9d007491318541c9bed diff --git a/openshift_helm/prebuild/helm-dependencies-dcar-1.8.sig b/openshift_helm/prebuild/helm-dependencies-dcar-1.8.sig deleted file mode 100644 index 5aa0357..0000000 Binary files a/openshift_helm/prebuild/helm-dependencies-dcar-1.8.sig and /dev/null differ diff --git a/openshift_helm/prebuild/helm-dependencies-dcar-2.0.sha256 b/openshift_helm/prebuild/helm-dependencies-dcar-2.0.sha256 new file mode 100644 index 0000000..746fb1a --- /dev/null +++ b/openshift_helm/prebuild/helm-dependencies-dcar-2.0.sha256 @@ -0,0 +1 @@ +ace37d3b3026023163f166b7e3508f73b4d6f1d62869590416efa11b9062a2da diff --git a/openshift_helm/prebuild/helm-dependencies-dcar-2.0.sig b/openshift_helm/prebuild/helm-dependencies-dcar-2.0.sig new file mode 100644 index 0000000..8c2d33b Binary files /dev/null and b/openshift_helm/prebuild/helm-dependencies-dcar-2.0.sig differ diff --git a/owasp-dep-check/Dockerfile b/owasp-dep-check/Dockerfile index 8701777..32324bc 100644 --- a/owasp-dep-check/Dockerfile +++ b/owasp-dep-check/Dockerfile @@ -7,8 +7,8 @@ FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} LABEL name="Solutions Delivery Platform: Jenkins Agent" \ maintainer="terrana_steven@bah.com" \ vendor="Booz Allen Hamilton" \ - version="6.1.2" \ - release="6.1.2" \ + version="6.1.6" \ + release="6.1.6" \ summary="OWASP Dependency Check container" \ description="The OWASP Dependency Check container image for the Solutions Delivery Platform" @@ -20,8 +20,8 @@ RUN INSTALL_PKGS="java-1.8.0-openjdk-devel ruby glibc glibc-common" && \ yum -y update-minimal --setopt=tsflags=nodocs --security && \ yum -y install --setopt=tsflags=nodocs ${INSTALL_PKGS} -ENV SDP_DCAR_OWASP_DEP_CHK_VERSION dcar-1.8 -ENV OWASP_DEP_CHK_VERSION 6.1.1 +ENV SDP_DCAR_OWASP_DEP_CHK_VERSION dcar-2.0 +ENV OWASP_DEP_CHK_VERSION 6.1.6 ENV HOME /root ENV JAVA_HOME /usr/lib/jvm/java diff --git a/owasp-dep-check/Makefile b/owasp-dep-check/Makefile index 891b911..e51ee44 100644 --- a/owasp-dep-check/Makefile +++ b/owasp-dep-check/Makefile @@ -1,7 +1,7 @@ OWNER = boozallen REPO = sdp-images IMAGE = owasp-dep-check -VERSION = 6.1.1 +VERSION = 6.1.6 REGISTRY = docker.pkg.github.com/$(OWNER)/$(REPO) TAG = $(REGISTRY)/$(IMAGE):$(VERSION) diff --git a/owasp-dep-check/prebuild/build-dep.sh b/owasp-dep-check/prebuild/build-dep.sh index 65b7a60..300b233 100755 --- a/owasp-dep-check/prebuild/build-dep.sh +++ b/owasp-dep-check/prebuild/build-dep.sh @@ -2,7 +2,7 @@ set -xe -SDP_DCAR_OWASP_DEP_CHK_VERSION=dcar-1.8 +SDP_DCAR_OWASP_DEP_CHK_VERSION=dcar-2.0 cd /root/prebuild tar czvf owasp-dep-check-dependencies-$SDP_DCAR_OWASP_DEP_CHK_VERSION.tar.gz dependencies diff --git a/owasp-dep-check/prebuild/owasp-dep-check-dependencies-dcar-1.8.sha256 b/owasp-dep-check/prebuild/owasp-dep-check-dependencies-dcar-1.8.sha256 deleted file mode 100644 index a3d3565..0000000 --- a/owasp-dep-check/prebuild/owasp-dep-check-dependencies-dcar-1.8.sha256 +++ /dev/null @@ -1 +0,0 @@ -70031abeaf417204a50333269c2c6cd51926bb4734c4fef9d62bcd4f4808c40d diff --git a/owasp-dep-check/prebuild/owasp-dep-check-dependencies-dcar-1.8.sig b/owasp-dep-check/prebuild/owasp-dep-check-dependencies-dcar-1.8.sig deleted file mode 100644 index 79f0f7d..0000000 Binary files a/owasp-dep-check/prebuild/owasp-dep-check-dependencies-dcar-1.8.sig and /dev/null differ diff --git a/owasp-dep-check/prebuild/owasp-dep-check-dependencies-dcar-2.0.sha256 b/owasp-dep-check/prebuild/owasp-dep-check-dependencies-dcar-2.0.sha256 new file mode 100644 index 0000000..fce77c0 --- /dev/null +++ b/owasp-dep-check/prebuild/owasp-dep-check-dependencies-dcar-2.0.sha256 @@ -0,0 +1 @@ +d7b63bd74d7e916f0dd43d297dc393138452d2a0cef458ae4a4109093979e86d diff --git a/owasp-dep-check/prebuild/owasp-dep-check-dependencies-dcar-2.0.sig b/owasp-dep-check/prebuild/owasp-dep-check-dependencies-dcar-2.0.sig new file mode 100644 index 0000000..f381eb0 Binary files /dev/null and b/owasp-dep-check/prebuild/owasp-dep-check-dependencies-dcar-2.0.sig differ diff --git a/owasp-dep-check/prebuild/pull-from-centos.sh b/owasp-dep-check/prebuild/pull-from-centos.sh index a7bf3e9..d01cb8b 100755 --- a/owasp-dep-check/prebuild/pull-from-centos.sh +++ b/owasp-dep-check/prebuild/pull-from-centos.sh @@ -2,8 +2,8 @@ set -xe -OWASP_DEP_CHK_VERSION=6.1.1 -SDP_DCAR_OWASP_DEP_CHK_VERSION=dcar-1.8 +OWASP_DEP_CHK_VERSION=6.1.6 +SDP_DCAR_OWASP_DEP_CHK_VERSION=dcar-2.0 rm -rf /root/prebuild/dependencies @@ -20,7 +20,11 @@ yumdownloader glibc -y --resolve --destdir /root/prebuild/dependencies/mono-comp yumdownloader glibc-common -y --resolve --destdir /root/prebuild/dependencies/mono-complete --disableplugin=subscription-manager # fetch dependency-check upstream binary -curl -sSLo /root/prebuild/dependencies/owasp/dependency-check-${OWASP_DEP_CHK_VERSION}-release.zip https://dl.bintray.com/jeremy-long/owasp/dependency-check-${OWASP_DEP_CHK_VERSION}-release.zip +#curl -sSLo /root/prebuild/dependencies/owasp/dependency-check-${OWASP_DEP_CHK_VERSION}-release.zip https://dl.bintray.com/jeremy-long/owasp/dependency-check-${OWASP_DEP_CHK_VERSION}-release.zip + +curl -sSLo /root/prebuild/dependencies/owasp/dependency-check-${OWASP_DEP_CHK_VERSION}-release.zip https://github.com/jeremylong/DependencyCheck/releases/download/v6.1.6/dependency-check-${OWASP_DEP_CHK_VERSION}-release.zip + + yum install -y ruby # fetch ruby dependencies diff --git a/sonar-scanner/Dockerfile b/sonar-scanner/Dockerfile index 1ea5cdd..f5eff7d 100644 --- a/sonar-scanner/Dockerfile +++ b/sonar-scanner/Dockerfile @@ -29,8 +29,8 @@ RUN INSTALL_PKGS="java-1.8.0-openjdk curl grep sed which" && \ yum --disableplugin=subscription-manager -y install --setopt=tsflags=nodocs ${INSTALL_PKGS} ### define necessary variables like PATH to application -ARG SDP_BUILD_DEPENDENCY_VERSION=dcar-1.8 -ARG SONAR_SCANNER_VERSION=4.6.0.2311 +ARG SDP_BUILD_DEPENDENCY_VERSION=dcar-2.0 +ARG SONAR_SCANNER_VERSION=4.6.2.2472 ENV SONAR_SCANNER_FILE=sonar-scanner-${SONAR_SCANNER_VERSION}-linux ENV TARBALL=sonar-scanner-dependencies-${SDP_BUILD_DEPENDENCY_VERSION} ENV user=sonarscanner diff --git a/sonar-scanner/Makefile b/sonar-scanner/Makefile index 1cbbe5b..9450b50 100644 --- a/sonar-scanner/Makefile +++ b/sonar-scanner/Makefile @@ -1,7 +1,7 @@ OWNER = boozallen REPO = sdp-images IMAGE = sonar-scanner -VERSION = 4.6.0.2311 +VERSION = 4.6.2.2472 REGISTRY = docker.pkg.github.com/$(OWNER)/$(REPO) TAG = $(REGISTRY)/$(IMAGE):$(VERSION) diff --git a/sonar-scanner/prebuild/build-dep.sh b/sonar-scanner/prebuild/build-dep.sh index b14fbc1..20fcaa8 100755 --- a/sonar-scanner/prebuild/build-dep.sh +++ b/sonar-scanner/prebuild/build-dep.sh @@ -2,7 +2,7 @@ set -xe -SDP_BUILD_DEPENDENCY_VERSION=dcar-1.8 +SDP_BUILD_DEPENDENCY_VERSION=dcar-2.0 cd /root/prebuild tar czvf sonar-scanner-dependencies-$SDP_BUILD_DEPENDENCY_VERSION.tar.gz dependencies diff --git a/sonar-scanner/prebuild/pull-from-ubi.sh b/sonar-scanner/prebuild/pull-from-ubi.sh index f61feff..e95b81f 100755 --- a/sonar-scanner/prebuild/pull-from-ubi.sh +++ b/sonar-scanner/prebuild/pull-from-ubi.sh @@ -2,7 +2,7 @@ set -xe -SONAR_SCANNER_VERSION=4.6.0.2311 +SONAR_SCANNER_VERSION=4.6.2.2472 rm -rf /root/prebuild/dependencies mkdir -p /root/prebuild/dependencies/sonar-scanner diff --git a/sonar-scanner/prebuild/sonar-scanner-dependencies-dcar-1.8.sha256 b/sonar-scanner/prebuild/sonar-scanner-dependencies-dcar-1.8.sha256 deleted file mode 100644 index 9fc0caf..0000000 --- a/sonar-scanner/prebuild/sonar-scanner-dependencies-dcar-1.8.sha256 +++ /dev/null @@ -1 +0,0 @@ -feb322a7243edcfb422df49c9cd71df46146d1a3c03986bbccf1ba0f6863d943 diff --git a/sonar-scanner/prebuild/sonar-scanner-dependencies-dcar-1.8.sig b/sonar-scanner/prebuild/sonar-scanner-dependencies-dcar-1.8.sig deleted file mode 100644 index 88d5098..0000000 Binary files a/sonar-scanner/prebuild/sonar-scanner-dependencies-dcar-1.8.sig and /dev/null differ diff --git a/sonar-scanner/prebuild/sonar-scanner-dependencies-dcar-2.0.sha256 b/sonar-scanner/prebuild/sonar-scanner-dependencies-dcar-2.0.sha256 new file mode 100644 index 0000000..4cd8ea1 --- /dev/null +++ b/sonar-scanner/prebuild/sonar-scanner-dependencies-dcar-2.0.sha256 @@ -0,0 +1 @@ +3ef060f54f3dbcc6cffa43aef96f706eb5076b0b4dad2e1885f7137ce098356c diff --git a/sonar-scanner/prebuild/sonar-scanner-dependencies-dcar-2.0.sig b/sonar-scanner/prebuild/sonar-scanner-dependencies-dcar-2.0.sig new file mode 100644 index 0000000..c612bff Binary files /dev/null and b/sonar-scanner/prebuild/sonar-scanner-dependencies-dcar-2.0.sig differ