Updated application to latest version

boozallen · Dec 3, 2020 · 7db5307 · 7db5307
1 parent f56bbf2
commit 7db5307
Show file tree

Hide file tree

Showing 32 changed files with 45 additions and 47 deletions.
diff --git a/jenkins/kubernetes/Dockerfile b/jenkins/kubernetes/Dockerfile
@@ -7,8 +7,8 @@ FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 LABEL name="Solutions Delivery Platform: Jenkins Master" \
       maintainer="[email protected]" \
       vendor="Booz Allen Hamilton" \
-      version="2.249.1" \
-      release="2.249.1" \
+      version="2.263.1" \
+      release="2.263.1" \
       summary="A Jenkins Master container" \
       description="The Jenkins Master container image for the Solutions Delivery Platform"
 
@@ -35,12 +35,12 @@ ENV JENKINS_SLAVE_AGENT_PORT ${agent_port}
 ENV REF $REF
 
 # Use tini as subreaper in Docker container to adopt zombie processes
-ARG SDP_BUILD_DEPENDENCY_VERSION=dcar-1.6
+ARG SDP_BUILD_DEPENDENCY_VERSION=dcar-1.7
 ARG TINI_VERSION=v0.19.0
 
 # jenkins version being bundled in this docker image
 ARG JENKINS_VERSION
-ENV JENKINS_VERSION ${JENKINS_VERSION:-2.249.1}
+ENV JENKINS_VERSION ${JENKINS_VERSION:-2.263.1}
 
 # Jenkins is run with user `jenkins`, uid = 1000
 # If you bind mount a volume from the host or a data container,

diff --git a/jenkins/kubernetes/Makefile b/jenkins/kubernetes/Makefile
@@ -1,8 +1,8 @@
 OWNER    = boozallen
 REPO     = sdp-images
 IMAGE    = jenkins
-VERSION  = dcar-1.6
-JENKINS_VERSION=2.249.1
+VERSION  = dcar-1.7
+JENKINS_VERSION=2.263.1
 
 REGISTRY = docker.pkg.github.com/$(OWNER)/$(REPO)
 TAG      = $(REGISTRY)/$(IMAGE):$(VERSION)

diff --git a/jenkins/kubernetes/prebuild/build-dep.sh b/jenkins/kubernetes/prebuild/build-dep.sh
@@ -2,7 +2,7 @@
 
 set -xe
 
-SDP_BUILD_DEPENDENCY_VERSION=dcar-1.6
+SDP_BUILD_DEPENDENCY_VERSION=dcar-1.7
 
 cd /root/prebuild
 tar czvf jenkins-dependencies-$SDP_BUILD_DEPENDENCY_VERSION.tar.gz dependencies

diff --git a/jenkins/kubernetes/prebuild/jenkins-dependencies-dcar-1.6.sha256 b/jenkins/kubernetes/prebuild/jenkins-dependencies-dcar-1.6.sha256
diff --git a/jenkins/kubernetes/prebuild/jenkins-dependencies-dcar-1.6.sig b/jenkins/kubernetes/prebuild/jenkins-dependencies-dcar-1.6.sig
diff --git a/jenkins/kubernetes/prebuild/jenkins-dependencies-dcar-1.7.sha256 b/jenkins/kubernetes/prebuild/jenkins-dependencies-dcar-1.7.sha256
@@ -0,0 +1 @@
+89483cae37e179bfe1c645be1a9e1c2928374fd266734588c4d79273f0cbf242
diff --git a/jenkins/kubernetes/prebuild/jenkins-dependencies-dcar-1.7.sig b/jenkins/kubernetes/prebuild/jenkins-dependencies-dcar-1.7.sig
diff --git a/jenkins/kubernetes/prebuild/plugins.txt b/jenkins/kubernetes/prebuild/plugins.txt
@@ -1,2 +1 @@
 templating-engine:1.7.1
-mailer:1.32.1
diff --git a/jenkins/kubernetes/prebuild/pull-from-centos.sh b/jenkins/kubernetes/prebuild/pull-from-centos.sh
@@ -4,7 +4,7 @@ set -xe
 
 
 TINI_VERSION=v0.19.0
-JENKINS_VERSION=2.249.1
+JENKINS_VERSION=2.263.1
 
 mkdir /root/prebuild/dependencies/tini/
 curl -kfsSL https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-static-amd64 -o /root/prebuild/dependencies/tini/tini-${TINI_VERSION}

diff --git a/openshift_helm/Dockerfile b/openshift_helm/Dockerfile
@@ -2,7 +2,7 @@
 # This software package is licensed under the Booz Allen Public License. The license can be found in the License file or at http://boozallen.github.io/licenses/bapl
 ARG BASE_REGISTRY=registry.access.redhat.com
 ARG BASE_IMAGE=ubi8/ubi
-ARG BASE_TAG=8.2
+ARG BASE_TAG=8.3
 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 MAINTAINER [email protected]
 
@@ -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.4
+ARG SDP_BUILD_DEPENDENCY_VERSION=dcar-1.7
 ARG user=sdp
 ARG group=sdp
 ARG uid=1000

diff --git a/openshift_helm/Makefile b/openshift_helm/Makefile
@@ -29,7 +29,7 @@ push: ## builds and publishes container image
 
 build-dep: ## build container dependencies
 	$(eval dir := $(shell pwd))
-	docker run -it -v $(dir)/prebuild:/root/prebuild:z registry.access.redhat.com/ubi8/ubi:8.2 /root/prebuild/build-dep.sh
+	docker run -it -v $(dir)/prebuild:/root/prebuild:z registry.access.redhat.com/ubi8/ubi:8.3 /root/prebuild/build-dep.sh
 
 info:
 	@echo "$(TAG) -> $$(dirname $$(git ls-files --full-name Makefile))"

diff --git a/openshift_helm/prebuild/build-dep.sh b/openshift_helm/prebuild/build-dep.sh
@@ -2,9 +2,10 @@
 
 set -xe
 
+SDP_BUILD_DEPENDENCY_VERSION=dcar-1.7
 OC_VERSION=v3.11.0
-HELM_VERSION=v3.3.0
-KUBECTL_VERSION=v1.18.0
+HELM_VERSION=v3.4.1
+KUBECTL_VERSION=v1.19.0
 
 rm -rf /root/prebuild/dependencies
 mkdir -p /root/prebuild/dependencies
@@ -27,8 +28,6 @@ rm -rf ${file2}.tar.gz
 #kubectl ${file3}
 curl -ko /root/prebuild/dependencies/${file3} https://storage.googleapis.com/kubernetes-release/release/${KUBECTL_VERSION}/bin/linux/amd64/kubectl
 
-SDP_BUILD_DEPENDENCY_VERSION=dcar-1.4
-
 cd /root/prebuild
 tar czvf helm-dependencies-$SDP_BUILD_DEPENDENCY_VERSION.tar.gz dependencies
 gpg --import /root/prebuild/BAH-public.key

diff --git a/openshift_helm/prebuild/helm-dependencies-dcar-1.4.sha256 b/openshift_helm/prebuild/helm-dependencies-dcar-1.4.sha256
diff --git a/openshift_helm/prebuild/helm-dependencies-dcar-1.4.sig b/openshift_helm/prebuild/helm-dependencies-dcar-1.4.sig
diff --git a/openshift_helm/prebuild/helm-dependencies-dcar-1.7.sha256 b/openshift_helm/prebuild/helm-dependencies-dcar-1.7.sha256
@@ -0,0 +1 @@
+a68209d455917dec1c76bee1f88e92b8b4942a4f64f204fc34715e8ff56dda8a
diff --git a/openshift_helm/prebuild/helm-dependencies-dcar-1.7.sig b/openshift_helm/prebuild/helm-dependencies-dcar-1.7.sig
diff --git a/owasp-dep-check/Dockerfile b/owasp-dep-check/Dockerfile
@@ -1,14 +1,14 @@
 ARG BASE_REGISTRY=registry.access.redhat.com
 ARG BASE_IMAGE=ubi8/ubi
-ARG BASE_TAG=8.2
+ARG BASE_TAG=8.3
 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 
 ### Required Atomic/OpenShift Labels - https://github.com/projectatomic/ContainerApplicationGenericLabels
 LABEL name="Solutions Delivery Platform: Jenkins Agent" \
       maintainer="[email protected]" \
       vendor="Booz Allen Hamilton" \
-      version="5.3.2" \
-      release="5.3.2" \
+      version="6.0.3" \
+      release="6.0.3" \
       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 " && \
     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.1
-ENV OWASP_DEP_CHK_VERSION 5.3.2
+ENV SDP_DCAR_OWASP_DEP_CHK_VERSION dcar-1.7
+ENV OWASP_DEP_CHK_VERSION 6.0.3
 ENV HOME /root
 ENV JAVA_HOME /usr/lib/jvm/java
 
@@ -30,7 +30,7 @@ ARG user=dependencycheck
 # Pull dependencies from sdp-images release artifacts and verify contents
 RUN mkdir /root/tmp
 RUN curl -sSLo /root/tmp/owasp-dep-check-dependencies-$SDP_DCAR_OWASP_DEP_CHK_VERSION.tar.gz https://github.com/boozallen/sdp-images/releases/download/$SDP_DCAR_OWASP_DEP_CHK_VERSION/owasp-dep-check-dependencies-$SDP_DCAR_OWASP_DEP_CHK_VERSION.tar.gz
-#COPY owasp-dep-check-dependencies-$SDP_DCAR_OWASP_DEP_CHK_VERSION.tar.gz /root/tmp/owasp-dep-check-dependencies-$SDP_DCAR_OWASP_DEP_CHK_VERSION.tar.gz
+#COPY prebuild/owasp-dep-check-dependencies-$SDP_DCAR_OWASP_DEP_CHK_VERSION.tar.gz /root/tmp/owasp-dep-check-dependencies-$SDP_DCAR_OWASP_DEP_CHK_VERSION.tar.gz
 
 COPY prebuild/BAH-public.key /root/tmp/.
 COPY prebuild/owasp-dep-check-dependencies-$SDP_DCAR_OWASP_DEP_CHK_VERSION.sig /root/tmp/.

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  = 5.3.2
+VERSION  = 6.0.3
 
 REGISTRY = docker.pkg.github.com/$(OWNER)/$(REPO)
 TAG      = $(REGISTRY)/$(IMAGE):$(VERSION)
@@ -30,8 +30,8 @@ push: ## builds and publishes container image
 build-dep: ## build container dependencies
 	$(eval dir := $(shell pwd))
 	docker run -it -v $(dir)/prebuild:/root/prebuild:z centos:8  /root/prebuild/pull-from-centos.sh
-	docker run -u root -it -v $(dir)/prebuild:/root/prebuild:z registry.access.redhat.com/ubi8/ubi:8.2 /root/prebuild/dependency-handling.sh
-	docker run -it -v $(dir)/prebuild:/root/prebuild:z registry.access.redhat.com/ubi8/ubi:8.2 /root/prebuild/build-dep.sh
+	docker run -u root -it -v $(dir)/prebuild:/root/prebuild:z registry.access.redhat.com/ubi8/ubi:8.3 /root/prebuild/dependency-handling.sh
+	docker run -it -v $(dir)/prebuild:/root/prebuild:z registry.access.redhat.com/ubi8/ubi:8.3 /root/prebuild/build-dep.sh
 
 info:
 	@echo "$(TAG) -> $$(dirname $$(git ls-files --full-name Makefile))"

diff --git a/owasp-dep-check/prebuild/build-dep.sh b/owasp-dep-check/prebuild/build-dep.sh
@@ -2,9 +2,9 @@
 
 set -xe
 
-SDP_DCAR_OWASP_DEP_CHK_VERSION=dcar-1.1
+SDP_DCAR_OWASP_DEP_CHK_VERSION=dcar-1.7
 
-cd /root/prebuild 
+cd /root/prebuild
 tar czvf owasp-dep-check-dependencies-$SDP_DCAR_OWASP_DEP_CHK_VERSION.tar.gz dependencies
 gpg --import /root/prebuild/BAH-public.key
 gpg --import --allow-secret-key-import  /root/prebuild/BAH-private.key

diff --git a/owasp-dep-check/prebuild/owasp-dep-check-dependencies-dcar-1.1.sha256 b/owasp-dep-check/prebuild/owasp-dep-check-dependencies-dcar-1.1.sha256
diff --git a/owasp-dep-check/prebuild/owasp-dep-check-dependencies-dcar-1.1.sig b/owasp-dep-check/prebuild/owasp-dep-check-dependencies-dcar-1.1.sig
diff --git a/owasp-dep-check/prebuild/owasp-dep-check-dependencies-dcar-1.7.sha256 b/owasp-dep-check/prebuild/owasp-dep-check-dependencies-dcar-1.7.sha256
@@ -0,0 +1 @@
+5149b91bbb24ea18da7e692e15aa1cd0c61262072125830d263ccc1be43f54ad
diff --git a/owasp-dep-check/prebuild/owasp-dep-check-dependencies-dcar-1.7.sig b/owasp-dep-check/prebuild/owasp-dep-check-dependencies-dcar-1.7.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=5.3.2
-SDP_DCAR_OWASP_DEP_CHK_VERSION=dcar-1.1
+OWASP_DEP_CHK_VERSION=6.0.3
+SDP_DCAR_OWASP_DEP_CHK_VERSION=dcar-1.7
 
 rm -rf /root/prebuild/dependencies
 
@@ -19,11 +19,11 @@ yumdownloader mono-complete -y --resolve --destdir /root/prebuild/dependencies/m
 
 
 # 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
 
-yum install -y ruby 
+yum install -y ruby
 # fetch ruby dependencies
 gem install bundle-audit  -i /root/prebuild/dependencies/temp/bundle-audit --no-document --no-rdoc --no-ri && \
 cp /root/prebuild/dependencies/temp/bundle-audit/cache/* /root/prebuild/dependencies/bundle-audit && \
-gem install --force --local /root/prebuild/dependencies/bundle-audit/*.gem 
+gem install --force --local /root/prebuild/dependencies/bundle-audit/*.gem
 rm -rf /root/prebuild/dependencies/temp
diff --git a/sonar-scanner/Dockerfile b/sonar-scanner/Dockerfile
@@ -3,16 +3,16 @@
 
 ARG BASE_REGISTRY=registry.access.redhat.com
 ARG BASE_IMAGE=ubi8/ubi
-ARG BASE_TAG=8.2
+ARG BASE_TAG=8.3
 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 
 
 ### Required Atomic/OpenShift Labels - https://github.com/projectatomic/ContainerApplicationGenericLabels
 LABEL name="Solutions Delivery Platform: Sonar Scanner" \
       maintainer="[email protected]" \
       vendor="Booz Allen Hamilton" \
-      version="4.4.0.2170" \
-      release="4.4.0.2170" \
+      version="4.5.0.2216" \
+      release="4.5.0.2216" \
       summary="A sonar-scanner container used by the SonarQube library of the Solutions Delivery Platform" \
       description="A sonar-scanner container used by the SonarQube library of the Solutions Delivery Platform"
 
@@ -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.2
-ARG SONAR_SCANNER_VERSION=4.4.0.2170
+ARG SDP_BUILD_DEPENDENCY_VERSION=dcar-1.7
+ARG SONAR_SCANNER_VERSION=4.5.0.2216
 ENV SONAR_SCANNER_FILE=sonar-scanner-${SONAR_SCANNER_VERSION}-linux
 ENV TARBALL=sonar-scanner-dependencies-${SDP_BUILD_DEPENDENCY_VERSION}
 ENV user=sonarscanner
@@ -40,7 +40,7 @@ ENV PATH $PATH:/usr/share/${SONAR_SCANNER_FILE}/bin
 ### Install Sonar Scanner
 RUN mkdir /root/tmp
 RUN curl -sSLo /root/tmp/${TARBALL}.tar.gz https://github.com/boozallen/sdp-images/releases/download/${SDP_BUILD_DEPENDENCY_VERSION}/${TARBALL}.tar.gz
-#COPY ${TARBALL}.tar.gz /root/tmp/${TARBALL}.tar.gz
+#COPY prebuild/${TARBALL}.tar.gz /root/tmp/${TARBALL}.tar.gz
 
 COPY prebuild/BAH-public.key /root/tmp/.
 COPY prebuild/${TARBALL}.sig /root/tmp/.

diff --git a/sonar-scanner/Makefile b/sonar-scanner/Makefile
@@ -1,7 +1,7 @@
 OWNER    = boozallen
 REPO     = sdp-images
 IMAGE    = sonar-scanner
-VERSION  = 4.4.0.2170
+VERSION  = 4.5.0.2216
 
 REGISTRY = docker.pkg.github.com/$(OWNER)/$(REPO)
 TAG      = $(REGISTRY)/$(IMAGE):$(VERSION)
@@ -28,8 +28,8 @@ push: ## builds and publishes container image
 
 build-dep: ## build container dependencies
 	$(eval dir := $(shell pwd))
-	docker run -u root -it -v $(dir)/prebuild:/root/prebuild:z registry.access.redhat.com/ubi8/ubi:8.1 /root/prebuild/pull-from-ubi.sh
-	docker run -u root -it -v $(dir)/prebuild:/root/prebuild:z registry.access.redhat.com/ubi8/ubi:8.1 /root/prebuild/build-dep.sh
+	docker run -u root -it -v $(dir)/prebuild:/root/prebuild:z registry.access.redhat.com/ubi8/ubi:8.3 /root/prebuild/pull-from-ubi.sh
+	docker run -u root -it -v $(dir)/prebuild:/root/prebuild:z registry.access.redhat.com/ubi8/ubi:8.3 /root/prebuild/build-dep.sh
 
 info:
 	@echo "$(TAG) -> $$(dirname $$(git ls-files --full-name Makefile))"

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.2
+SDP_BUILD_DEPENDENCY_VERSION=dcar-1.7
 
 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.4.0.2170
+SONAR_SCANNER_VERSION=4.5.0.2216
 
 rm -rf /root/prebuild/dependencies
 mkdir -p /root/prebuild/dependencies/sonar-scanner

diff --git a/sonar-scanner/prebuild/sonar-scanner-dependencies-dcar-1.2.sha256 b/sonar-scanner/prebuild/sonar-scanner-dependencies-dcar-1.2.sha256
diff --git a/sonar-scanner/prebuild/sonar-scanner-dependencies-dcar-1.2.sig b/sonar-scanner/prebuild/sonar-scanner-dependencies-dcar-1.2.sig
diff --git a/sonar-scanner/prebuild/sonar-scanner-dependencies-dcar-1.7.sha256 b/sonar-scanner/prebuild/sonar-scanner-dependencies-dcar-1.7.sha256
@@ -0,0 +1 @@
+2fa1b63dae3b0e229bd64a13f791c42152af9c5d65e2c1772e142f6588592065
diff --git a/sonar-scanner/prebuild/sonar-scanner-dependencies-dcar-1.7.sig b/sonar-scanner/prebuild/sonar-scanner-dependencies-dcar-1.7.sig