Skip to content

Commit

Permalink
Updated jenkins to latest LTS release
Browse files Browse the repository at this point in the history
CSpicer-BAH committed Sep 23, 2020
1 parent 11cd47a commit 10230b6
Showing 8 changed files with 9 additions and 9 deletions.
8 changes: 4 additions & 4 deletions jenkins/kubernetes/Dockerfile
Original file line number Diff line number Diff line change
@@ -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,
4 changes: 2 additions & 2 deletions jenkins/kubernetes/Makefile
Original file line number Diff line number Diff line change
@@ -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)
2 changes: 1 addition & 1 deletion jenkins/kubernetes/prebuild/build-dep.sh
Original file line number Diff line number Diff line change
@@ -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

This file was deleted.

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1ed1105d962b4455ae21af74dd70ba5126eed4d38c64b0aec691cba028acfdfb
Binary file not shown.
2 changes: 1 addition & 1 deletion jenkins/kubernetes/prebuild/pull-from-centos.sh
Original file line number Diff line number Diff line change
@@ -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}

0 comments on commit 10230b6

Please sign in to comment.