updated tarball for jenkins-agent

jenkins-agent/Dockerfile

@@ -1,13 +1,10 @@
 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}
 
 # this container must run as privileged
 USER root
-
-ENV JENKINS_AGENT_VERSION dcar-1.6
-
 ### Required Atomic/OpenShift Labels - https://github.com/projectatomic/ContainerApplicationGenericLabels
 LABEL name="Solutions Delivery Platform: Jenkins Agent" \
       maintainer="[email protected]" \
@@ -27,6 +24,7 @@ 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_AGENT_VERSION dcar-1.7
 ENV JENKINS_SWARM_VERSION 3.24
 ENV JNLP_SLAVE_VERSION 4.6
 ENV HOME /root
@@ -45,8 +43,6 @@ RUN cd /root/tmp/ && gpg --import BAH-public.key
 RUN cd /root/tmp/ && gpg --verify jenkins-agent-dependencies-$JENKINS_AGENT_VERSION.sig jenkins-agent-dependencies-$JENKINS_AGENT_VERSION.tar.gz
 RUN cd /root/tmp/  && echo "$(cat jenkins-agent-dependencies-$JENKINS_AGENT_VERSION.sha256) jenkins-agent-dependencies-$JENKINS_AGENT_VERSION.tar.gz" | sha256sum --check --status
 RUN cd /root/tmp && tar -xzf jenkins-agent-dependencies-$JENKINS_AGENT_VERSION.tar.gz && \
-    rm -f /root/tmp/dependencies/docker-ce/gnutls-3.6.8-11.el8_2.x86_64.rpm && \
-    rm -f /root/tmp/dependencies/docker-ce/crypto-policies-20200713-1.git51d1222.el8.noarch.rpm && \
     rpm -ivh --replacepkgs --replacefiles /root/tmp/dependencies/docker-ce/*.rpm
 
 RUN ls /root/tmp/dependencies/docker-compose/

jenkins-agent/Makefile

@@ -1,7 +1,7 @@
 OWNER    = boozallen
 REPO     = sdp-images
 IMAGE    = jenkins-agent
-VERSION  = dcar-1.6
+VERSION  = dcar-1.7
 
 REGISTRY = docker.pkg.github.com/$(OWNER)/$(REPO)
 TAG      = $(REGISTRY)/$(IMAGE):$(VERSION)
@@ -29,9 +29,9 @@ 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 -u root -it -v $(dir)/prebuild:/root/prebuild:z registry.access.redhat.com/ubi8/ubi:8.2 /root/prebuild/pull-from-ubi.sh
-	docker run -u root -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 -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))"

jenkins-agent/prebuild/build-dep.sh

@@ -2,9 +2,11 @@
 
 set -xe
 
-JENKINS_AGENT_VERSION=dcar-1.6
+JENKINS_AGENT_VERSION=dcar-1.7
 
 cd /root/prebuild
+rm -f dependencies/docker-ce/coreutils-8.30-8.el8.x86_64.rpm
+rm -f dependencies/docker-ce/coreutils-common-8.30-8.el8.x86_64.rpm
 tar czvf jenkins-agent-dependencies-$JENKINS_AGENT_VERSION.tar.gz dependencies
 gpg --import /root/prebuild/BAH-public.key
 gpg --import --allow-secret-key-import  /root/prebuild/BAH-private.key

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

@@ -0,0 +1 @@
+0fba7bd89bae0ce64c3fa81df49b730a4531d728e55e1c2dae0d7e4bad7743bd

jenkins-agent/prebuild/pull-from-centos.sh

@@ -2,7 +2,7 @@
 
 set -xe
 
-JENKINS_AGENT_VERSION=dcar-1.6
+JENKINS_AGENT_VERSION=dcar-1.7
 JENKINS_SWARM_VERSION=3.24
 JNLP_SLAVE_VERSION=4.6
 

jenkins-agent/prebuild/pull-from-ubi.sh

@@ -2,7 +2,7 @@
 
 set -xe
 
-JENKINS_AGENT_VERSION=dcar-1.6
+JENKINS_AGENT_VERSION=dcar-1.7
 JENKINS_SWARM_VERSION=3.24
 JNLP_SLAVE_VERSION=4.6