Updated jenkins-agent, sonar-scanner, helm, and dependency check

boozallen · May 19, 2021 · 2fe033a · 2fe033a
1 parent b2871c1
commit 2fe033a
Show file tree

Hide file tree

Showing 30 changed files with 36 additions and 32 deletions.
diff --git 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
@@ -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
diff --git a/jenkins-agent/prebuild/jenkins-agent-dependencies-dcar-1.8.sig b/jenkins-agent/prebuild/jenkins-agent-dependencies-dcar-1.8.sig
diff --git a/jenkins-agent/prebuild/jenkins-agent-dependencies-dcar-2.0.sha256 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
diff --git 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
@@ -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
@@ -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
@@ -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
diff --git a/openshift_helm/prebuild/helm-dependencies-dcar-1.8.sig b/openshift_helm/prebuild/helm-dependencies-dcar-1.8.sig
diff --git a/openshift_helm/prebuild/helm-dependencies-dcar-2.0.sha256 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
diff --git 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="[email protected]" \
       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
@@ -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
@@ -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
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
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
@@ -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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/sonar-scanner/prebuild/sonar-scanner-dependencies-dcar-1.8.sig b/sonar-scanner/prebuild/sonar-scanner-dependencies-dcar-1.8.sig
diff --git a/sonar-scanner/prebuild/sonar-scanner-dependencies-dcar-2.0.sha256 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