diff --git a/jenkins/kubernetes/Dockerfile b/jenkins/kubernetes/Dockerfile index 0d19587..783b28e 100644 --- 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="terrana_steven@bah.com" \ vendor="Booz Allen Hamilton" \ - version="2.235.5" \ - release="2.235.5" \ + version="2.249.1" \ + release="2.249.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.5 +ARG SDP_BUILD_DEPENDENCY_VERSION=dcar-1.6 ARG TINI_VERSION=v0.19.0 # jenkins version being bundled in this docker image ARG JENKINS_VERSION -ENV JENKINS_VERSION ${JENKINS_VERSION:-2.235.5} +ENV JENKINS_VERSION ${JENKINS_VERSION:-2.249.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 index 03647b8..b2f5407 100644 --- a/jenkins/kubernetes/Makefile +++ b/jenkins/kubernetes/Makefile @@ -1,8 +1,8 @@ OWNER = boozallen REPO = sdp-images IMAGE = jenkins -VERSION = dcar-1.5 -JENKINS_VERSION=2.235.5 +VERSION = dcar-1.6 +JENKINS_VERSION=2.249.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 index 3bbe63c..0d40dfd 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.5 +SDP_BUILD_DEPENDENCY_VERSION=dcar-1.6 cd /root/prebuild tar czvf jenkins-dependencies-$SDP_BUILD_DEPENDENCY_VERSION.tar.gz dependencies diff --git a/jenkins/kubernetes/prebuild/jenkins-dependencies-dcar-1.5.sha256 b/jenkins/kubernetes/prebuild/jenkins-dependencies-dcar-1.5.sha256 deleted file mode 100644 index 35f12a8..0000000 --- a/jenkins/kubernetes/prebuild/jenkins-dependencies-dcar-1.5.sha256 +++ /dev/null @@ -1 +0,0 @@ -fb11b0f28af9e48a51c4e866902dc4c8e540b608293f502656d015e7dff15e99 diff --git a/jenkins/kubernetes/prebuild/jenkins-dependencies-dcar-1.5.sig b/jenkins/kubernetes/prebuild/jenkins-dependencies-dcar-1.5.sig deleted file mode 100644 index e3a2e4b..0000000 Binary files a/jenkins/kubernetes/prebuild/jenkins-dependencies-dcar-1.5.sig and /dev/null differ diff --git a/jenkins/kubernetes/prebuild/jenkins-dependencies-dcar-1.6.sha256 b/jenkins/kubernetes/prebuild/jenkins-dependencies-dcar-1.6.sha256 new file mode 100644 index 0000000..95e3bfc --- /dev/null +++ b/jenkins/kubernetes/prebuild/jenkins-dependencies-dcar-1.6.sha256 @@ -0,0 +1 @@ +1ed1105d962b4455ae21af74dd70ba5126eed4d38c64b0aec691cba028acfdfb diff --git a/jenkins/kubernetes/prebuild/jenkins-dependencies-dcar-1.6.sig b/jenkins/kubernetes/prebuild/jenkins-dependencies-dcar-1.6.sig new file mode 100644 index 0000000..59422f3 Binary files /dev/null and b/jenkins/kubernetes/prebuild/jenkins-dependencies-dcar-1.6.sig differ diff --git a/jenkins/kubernetes/prebuild/pull-from-centos.sh b/jenkins/kubernetes/prebuild/pull-from-centos.sh index 3335e05..68944b7 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.235.5 +JENKINS_VERSION=2.249.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}