jnlp to 4.5 swarm to 3.22

Author: CSpicer-BAH

jenkins-agent/Dockerfile

@@ -6,7 +6,7 @@ FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 # this container must run as privileged
 USER root
 
-ENV JENKINS_AGENT_VERSION dcar-1.2
+ENV JENKINS_AGENT_VERSION dcar-1.3
 
 ### Required Atomic/OpenShift Labels - https://github.com/projectatomic/ContainerApplicationGenericLabels
 LABEL name="Solutions Delivery Platform: Jenkins Agent" \
@@ -27,15 +27,16 @@ 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_SWARM_VERSION 3.21
-ENV JNLP_SLAVE_VERSION 4.3
+ENV JENKINS_SWARM_VERSION 3.22
+ENV JNLP_SLAVE_VERSION 4.5
 ENV HOME /root
 ENV JAVA_HOME /usr/lib/jvm/java
 
 # install docker
 RUN mkdir /root/tmp
 RUN curl -sSLo /root/tmp/jenkins-agent-dependencies-$JENKINS_AGENT_VERSION.tar.gz https://github.com/boozallen/sdp-images/releases/download/${JENKINS_AGENT_VERSION}/jenkins-agent-dependencies-${JENKINS_AGENT_VERSION}.tar.gz
 #COPY jenkins-agent-dependencies-$JENKINS_AGENT_VERSION.tar.gz /root/tmp/jenkins-agent-dependencies-$JENKINS_AGENT_VERSION.tar.gz
+
 COPY prebuild/BAH-public.key /root/tmp/.
 COPY prebuild/jenkins-agent-dependencies-$JENKINS_AGENT_VERSION.sig /root/tmp/.
 COPY prebuild/jenkins-agent-dependencies-$JENKINS_AGENT_VERSION.sha256 /root/tmp/.

jenkins-agent/Makefile

@@ -1,7 +1,7 @@
 OWNER    = boozallen
 REPO     = sdp-images
 IMAGE    = jenkins-agent
-VERSION  = dcar-1.1
+VERSION  = dcar-1.3
 
 REGISTRY = docker.pkg.github.com/$(OWNER)/$(REPO)
 TAG      = $(REGISTRY)/$(IMAGE):$(VERSION)

jenkins-agent/prebuild/build-dep.sh

@@ -2,7 +2,7 @@
 
 set -xe
 
-JENKINS_AGENT_VERSION=dcar-1.2
+JENKINS_AGENT_VERSION=dcar-1.3
 
 cd /root/prebuild
 tar czvf jenkins-agent-dependencies-$JENKINS_AGENT_VERSION.tar.gz dependencies

jenkins-agent/prebuild/jenkins-agent-dependencies-dcar-1.2.sha256

@@ -0,0 +1 @@
+b76d638f93189408340dbc72307d03316cc2f8cbf1cce0df01af429a105d0534

jenkins-agent/prebuild/jenkins-agent-dependencies-dcar-1.2.sig

@@ -2,9 +2,9 @@
 
 set -xe
 
-JENKINS_AGENT_VERSION=dcar-1.2
-JENKINS_SWARM_VERSION=3.21
-JNLP_SLAVE_VERSION=4.3
+JENKINS_AGENT_VERSION=dcar-1.3
+JENKINS_SWARM_VERSION=3.22
+JNLP_SLAVE_VERSION=4.5
 
 rm -rf /root/prebuild/dependencies
 mkdir -p /root/prebuild/dependencies/swarm-client /root/prebuild/dependencies/agent /root/prebuild/dependencies/docker-ce /root/prebuild/dependencies/docker-compose /root/prebuild/dependencies/supervisor /root/prebuild/dependencies/hostname

jenkins-agent/prebuild/jenkins-agent-dependencies-dcar-1.3.sha256

@@ -2,9 +2,9 @@
 
 set -xe
 
-JENKINS_AGENT_VERSION=dcar-1.2
-JENKINS_SWARM_VERSION=3.21
-JNLP_SLAVE_VERSION=4.3
+JENKINS_AGENT_VERSION=dcar-1.3
+JENKINS_SWARM_VERSION=3.22
+JNLP_SLAVE_VERSION=4.5
 
 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