diff --git a/jenkins/kubernetes/Dockerfile b/jenkins/kubernetes/Dockerfile index e507bc3..b6d107b 100644 --- a/jenkins/kubernetes/Dockerfile +++ b/jenkins/kubernetes/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 Master" \ maintainer="terrana_steven@bah.com" \ vendor="Booz Allen Hamilton" \ - version="2.263.1" \ - release="2.263.1" \ + version="2.263.4" \ + release="2.263.4" \ 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.7 +ARG SDP_BUILD_DEPENDENCY_VERSION=dcar-1.8 ARG TINI_VERSION=v0.19.0 # jenkins version being bundled in this docker image ARG JENKINS_VERSION -ENV JENKINS_VERSION ${JENKINS_VERSION:-2.263.1} +ENV JENKINS_VERSION ${JENKINS_VERSION:-2.263.4} # 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 index 0a73f60..64337ea 100644 --- a/jenkins/kubernetes/Makefile +++ b/jenkins/kubernetes/Makefile @@ -1,8 +1,8 @@ OWNER = boozallen REPO = sdp-images IMAGE = jenkins -VERSION = dcar-1.7 -JENKINS_VERSION=2.263.1 +VERSION = dcar-1.8 +JENKINS_VERSION=2.263.4 REGISTRY = docker.pkg.github.com/$(OWNER)/$(REPO) TAG = $(REGISTRY)/$(IMAGE):$(VERSION) @@ -29,8 +29,8 @@ push: ## builds and publishes container image build-dep: ## build container dependencies $(eval dir := $(shell pwd)) docker run -it -v $(dir)/prebuild:/var/jenkins_home/tmp jenkins/jenkins:${JENKINS_VERSION}-lts /var/jenkins_home/tmp/pull-plugins.sh - docker run -it -v $(dir)/prebuild:/root/prebuild:z registry.access.redhat.com/ubi8/ubi:8.2 /root/prebuild/pull-from-centos.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 -it -v $(dir)/prebuild:/root/prebuild:z registry.access.redhat.com/ubi8/ubi:8.3 /root/prebuild/pull-from-centos.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/jenkins/kubernetes/prebuild/build-dep.sh b/jenkins/kubernetes/prebuild/build-dep.sh index 1d3203c..917c6fd 100755 --- 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.7 +SDP_BUILD_DEPENDENCY_VERSION=dcar-1.8 cd /root/prebuild tar czvf jenkins-dependencies-$SDP_BUILD_DEPENDENCY_VERSION.tar.gz dependencies diff --git a/jenkins/kubernetes/prebuild/jenkins-dependencies-dcar-1.7.sha256 b/jenkins/kubernetes/prebuild/jenkins-dependencies-dcar-1.7.sha256 deleted file mode 100644 index 57bf3f3..0000000 --- a/jenkins/kubernetes/prebuild/jenkins-dependencies-dcar-1.7.sha256 +++ /dev/null @@ -1 +0,0 @@ -b479ecb13287ea193b4c10eb261f1f78d7c64b1e6f7e79ba8f4088fc1a943b13 diff --git a/jenkins/kubernetes/prebuild/jenkins-dependencies-dcar-1.7.sig b/jenkins/kubernetes/prebuild/jenkins-dependencies-dcar-1.7.sig deleted file mode 100644 index af32b4e..0000000 Binary files a/jenkins/kubernetes/prebuild/jenkins-dependencies-dcar-1.7.sig and /dev/null differ diff --git a/jenkins/kubernetes/prebuild/jenkins-dependencies-dcar-1.8.sha256 b/jenkins/kubernetes/prebuild/jenkins-dependencies-dcar-1.8.sha256 new file mode 100644 index 0000000..1485f88 --- /dev/null +++ b/jenkins/kubernetes/prebuild/jenkins-dependencies-dcar-1.8.sha256 @@ -0,0 +1 @@ +20d97fb4bc9614321c4e5feb408919f7b768f50031eed7d649a5860971f20d46 diff --git a/jenkins/kubernetes/prebuild/jenkins-dependencies-dcar-1.8.sig b/jenkins/kubernetes/prebuild/jenkins-dependencies-dcar-1.8.sig new file mode 100644 index 0000000..c7e622f Binary files /dev/null and b/jenkins/kubernetes/prebuild/jenkins-dependencies-dcar-1.8.sig differ diff --git a/jenkins/kubernetes/prebuild/pull-from-centos.sh b/jenkins/kubernetes/prebuild/pull-from-centos.sh index 97c352a..2e0db7d 100755 --- 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.263.1 +JENKINS_VERSION=2.263.4 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 index 148c946..64a68ed 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.7 +ARG SDP_BUILD_DEPENDENCY_VERSION=dcar-1.8 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 6c75996..acadc37 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.7 +SDP_BUILD_DEPENDENCY_VERSION=dcar-1.8 OC_VERSION=v3.11.0 -HELM_VERSION=v3.4.1 -KUBECTL_VERSION=v1.19.0 +HELM_VERSION=v3.5.2 +KUBECTL_VERSION=v1.20.0 rm -rf /root/prebuild/dependencies mkdir -p /root/prebuild/dependencies diff --git a/openshift_helm/prebuild/helm-dependencies-dcar-1.7.sha256 b/openshift_helm/prebuild/helm-dependencies-dcar-1.7.sha256 deleted file mode 100644 index a613533..0000000 --- a/openshift_helm/prebuild/helm-dependencies-dcar-1.7.sha256 +++ /dev/null @@ -1 +0,0 @@ -a68209d455917dec1c76bee1f88e92b8b4942a4f64f204fc34715e8ff56dda8a diff --git a/openshift_helm/prebuild/helm-dependencies-dcar-1.7.sig b/openshift_helm/prebuild/helm-dependencies-dcar-1.7.sig deleted file mode 100644 index 46fb3b8..0000000 Binary files a/openshift_helm/prebuild/helm-dependencies-dcar-1.7.sig and /dev/null differ diff --git a/openshift_helm/prebuild/helm-dependencies-dcar-1.8.sha256 b/openshift_helm/prebuild/helm-dependencies-dcar-1.8.sha256 new file mode 100644 index 0000000..5abbcbc --- /dev/null +++ b/openshift_helm/prebuild/helm-dependencies-dcar-1.8.sha256 @@ -0,0 +1 @@ +0740d1eded0d544bc3612117671cf8024aba066ee6fcf9d007491318541c9bed diff --git a/openshift_helm/prebuild/helm-dependencies-dcar-1.8.sig b/openshift_helm/prebuild/helm-dependencies-dcar-1.8.sig new file mode 100644 index 0000000..5aa0357 Binary files /dev/null and b/openshift_helm/prebuild/helm-dependencies-dcar-1.8.sig differ diff --git a/owasp-dep-check/Dockerfile b/owasp-dep-check/Dockerfile index 250766f..743a9a5 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.0.3" \ - release="6.0.3" \ + version="6.1.0" \ + release="6.1.0" \ 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.7 -ENV OWASP_DEP_CHK_VERSION 6.0.3 +ENV SDP_DCAR_OWASP_DEP_CHK_VERSION dcar-1.8 +ENV OWASP_DEP_CHK_VERSION 6.1.0 ENV HOME /root ENV JAVA_HOME /usr/lib/jvm/java diff --git a/owasp-dep-check/Makefile b/owasp-dep-check/Makefile index 6395bc4..06b9714 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.0.3 +VERSION = 6.1.0 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 dfe3648..65b7a60 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.7 +SDP_DCAR_OWASP_DEP_CHK_VERSION=dcar-1.8 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.7.sha256 b/owasp-dep-check/prebuild/owasp-dep-check-dependencies-dcar-1.7.sha256 deleted file mode 100644 index 428dcd3..0000000 --- a/owasp-dep-check/prebuild/owasp-dep-check-dependencies-dcar-1.7.sha256 +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 100644 index b7ff628..0000000 Binary files a/owasp-dep-check/prebuild/owasp-dep-check-dependencies-dcar-1.7.sig and /dev/null differ 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 new file mode 100644 index 0000000..c32d28f --- /dev/null +++ b/owasp-dep-check/prebuild/owasp-dep-check-dependencies-dcar-1.8.sha256 @@ -0,0 +1 @@ +faf9679a50be32d2534cd931473730e064c3e4d7ce1cdc4635e1a9a7de806f04 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 new file mode 100644 index 0000000..6f2847a Binary files /dev/null and b/owasp-dep-check/prebuild/owasp-dep-check-dependencies-dcar-1.8.sig differ diff --git a/owasp-dep-check/prebuild/pull-from-centos.sh b/owasp-dep-check/prebuild/pull-from-centos.sh index 590460f..0525407 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.0.3 -SDP_DCAR_OWASP_DEP_CHK_VERSION=dcar-1.7 +OWASP_DEP_CHK_VERSION=6.1.0 +SDP_DCAR_OWASP_DEP_CHK_VERSION=dcar-1.8 rm -rf /root/prebuild/dependencies diff --git a/sonar-scanner/Dockerfile b/sonar-scanner/Dockerfile index 1075110..1ea5cdd 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.7 -ARG SONAR_SCANNER_VERSION=4.5.0.2216 +ARG SDP_BUILD_DEPENDENCY_VERSION=dcar-1.8 +ARG SONAR_SCANNER_VERSION=4.6.0.2311 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 c0afe7c..1cbbe5b 100644 --- a/sonar-scanner/Makefile +++ b/sonar-scanner/Makefile @@ -1,7 +1,7 @@ OWNER = boozallen REPO = sdp-images IMAGE = sonar-scanner -VERSION = 4.5.0.2216 +VERSION = 4.6.0.2311 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 017a27b..b14fbc1 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.7 +SDP_BUILD_DEPENDENCY_VERSION=dcar-1.8 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 4337d39..f61feff 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.5.0.2216 +SONAR_SCANNER_VERSION=4.6.0.2311 rm -rf /root/prebuild/dependencies mkdir -p /root/prebuild/dependencies/sonar-scanner diff --git a/sonar-scanner/prebuild/sonar-scanner-dependencies-dcar-1.7.sha256 b/sonar-scanner/prebuild/sonar-scanner-dependencies-dcar-1.7.sha256 deleted file mode 100644 index 6bf508b..0000000 --- a/sonar-scanner/prebuild/sonar-scanner-dependencies-dcar-1.7.sha256 +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 100644 index 1d28078..0000000 Binary files a/sonar-scanner/prebuild/sonar-scanner-dependencies-dcar-1.7.sig and /dev/null differ diff --git a/sonar-scanner/prebuild/sonar-scanner-dependencies-dcar-1.8.sha256 b/sonar-scanner/prebuild/sonar-scanner-dependencies-dcar-1.8.sha256 new file mode 100644 index 0000000..9fc0caf --- /dev/null +++ b/sonar-scanner/prebuild/sonar-scanner-dependencies-dcar-1.8.sha256 @@ -0,0 +1 @@ +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 new file mode 100644 index 0000000..88d5098 Binary files /dev/null and b/sonar-scanner/prebuild/sonar-scanner-dependencies-dcar-1.8.sig differ