Skip to content

Commit

Permalink
updating jenkins,jenkins agent,helm,jenkinsfile-runner,owasp depcheck
Browse files Browse the repository at this point in the history
  • Loading branch information
miketa23 committed Jul 29, 2021
1 parent 36843d3 commit f7e54ea
Show file tree
Hide file tree
Showing 39 changed files with 55 additions and 54 deletions.
12 changes: 6 additions & 6 deletions jenkins-agent/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG BASE_REGISTRY=registry.access.redhat.com
ARG BASE_IMAGE=ubi8/ubi
ARG BASE_TAG=8.3
ARG BASE_TAG=8.4
FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}

# this container must run as privileged
Expand All @@ -24,16 +24,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_AGENT_VERSION dcar-2.0
ENV JENKINS_SWARM_VERSION 3.25
ENV JNLP_SLAVE_VERSION 4.8
ENV JENKINS_AGENT_VERSION dcar-2.1
ENV JENKINS_SWARM_VERSION 3.27
ENV JNLP_SLAVE_VERSION 4.10
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 prebuild/jenkins-agent-dependencies-$JENKINS_AGENT_VERSION.tar.gz /root/tmp/jenkins-agent-dependencies-$JENKINS_AGENT_VERSION.tar.gz
#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 prebuild/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/.
Expand Down
2 changes: 1 addition & 1 deletion jenkins-agent/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
OWNER = boozallen
REPO = sdp-images
IMAGE = jenkins-agent
VERSION = dcar-1.8
VERSION = dcar-2.1

REGISTRY = docker.pkg.github.com/$(OWNER)/$(REPO)
TAG = $(REGISTRY)/$(IMAGE):$(VERSION)
Expand Down
2 changes: 1 addition & 1 deletion jenkins-agent/prebuild/build-dep.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -xe

JENKINS_AGENT_VERSION=dcar-2.0
JENKINS_AGENT_VERSION=dcar-2.1

cd /root/prebuild
rm -f dependencies/docker-ce/coreutils-8.30-8.el8.x86_64.rpm
Expand Down

This file was deleted.

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ee98da7a546cbbb6424ff63ddfd83187733be73058ce902ae9367ebba6f788a1
Binary file not shown.
6 changes: 3 additions & 3 deletions jenkins-agent/prebuild/pull-from-centos.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

set -xe

JENKINS_AGENT_VERSION=dcar-2.0
JENKINS_SWARM_VERSION=3.25
JNLP_SLAVE_VERSION=4.8
JENKINS_AGENT_VERSION=dcar-2.1
JENKINS_SWARM_VERSION=3.27
JNLP_SLAVE_VERSION=4.10

rm -rf /root/prebuild/dependencies
mkdir -p /root/prebuild/dependencies/swarm-client /root/prebuild/dependencies/agent /root/prebuild/dependencies/docker-ce /root/prebuild/dependencies/pip3 /root/prebuild/dependencies/docker-compose /root/prebuild/dependencies/supervisor /root/prebuild/dependencies/hostname
Expand Down
6 changes: 3 additions & 3 deletions jenkins-agent/prebuild/pull-from-ubi.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

set -xe

JENKINS_AGENT_VERSION=dcar-2.0
JENKINS_SWARM_VERSION=3.25
JNLP_SLAVE_VERSION=4.8
JENKINS_AGENT_VERSION=dcar-2.1
JENKINS_SWARM_VERSION=3.27
JNLP_SLAVE_VERSION=4.10

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
Expand Down
10 changes: 5 additions & 5 deletions jenkins/kubernetes/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
ARG BASE_REGISTRY=registry.access.redhat.com
ARG BASE_IMAGE=ubi8/ubi
ARG BASE_TAG=8.3
ARG BASE_TAG=8.4
FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}

### Required Atomic/OpenShift Labels - https://github.com/projectatomic/ContainerApplicationGenericLabels
LABEL name="Solutions Delivery Platform: Jenkins Master" \
maintainer="[email protected]" \
vendor="Booz Allen Hamilton" \
version="2.277.3" \
release="2.277.3" \
version="2.289.2" \
release="2.289.2" \
summary="A Jenkins Master container" \
description="The Jenkins Master container image for the Solutions Delivery Platform"

Expand All @@ -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.9
ARG SDP_BUILD_DEPENDENCY_VERSION=dcar-2.1
ARG TINI_VERSION=v0.19.0

# jenkins version being bundled in this docker image
ARG JENKINS_VERSION
ENV JENKINS_VERSION ${JENKINS_VERSION:-2.277.3}
ENV JENKINS_VERSION ${JENKINS_VERSION:-2.289.2}

# Jenkins is run with user `jenkins`, uid = 1000
# If you bind mount a volume from the host or a data container,
Expand Down
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.9
JENKINS_VERSION=2.277.3
VERSION = dcar-2.1
JENKINS_VERSION=2.289.2

REGISTRY = docker.pkg.github.com/$(OWNER)/$(REPO)
TAG = $(REGISTRY)/$(IMAGE):$(VERSION)
Expand Down
2 changes: 1 addition & 1 deletion jenkins/kubernetes/prebuild/build-dep.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -xe

SDP_BUILD_DEPENDENCY_VERSION=dcar-1.9
SDP_BUILD_DEPENDENCY_VERSION=dcar-2.1

cd /root/prebuild
tar czvf jenkins-dependencies-$SDP_BUILD_DEPENDENCY_VERSION.tar.gz dependencies
Expand Down

This file was deleted.

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
7fe0d4bcab25e1081c7af03923e942cb167c29054fc3c6b9587023c71deeb80c
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
Expand Up @@ -4,7 +4,7 @@ set -xe


TINI_VERSION=v0.19.0
JENKINS_VERSION=2.277.3
JENKINS_VERSION=2.289.2

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}
Expand Down
11 changes: 6 additions & 5 deletions jenkinsfile-runner/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
LABEL name="Solutions Delivery Platform: Jenkins Master" \
maintainer="[email protected]" \
vendor="Booz Allen Hamilton" \
version="1.0-beta-27" \
release="1.0-beta-27" \
version="1.0-beta-29" \
release="1.0-beta-29" \
summary="Jenkins pipeline execution engine packaged as a container" \
description="The Jenkins Master container image for the Solutions Delivery Platform"

Expand All @@ -20,11 +20,11 @@ RUN INSTALL_PKGS="java-1.8.0-openjdk git" && \
--security && \
yum -y install --setopt=tsflags=nodocs ${INSTALL_PKGS}

ENV SDP_BUILD_DEPENDENCY_VERSION dcar-1.8
ENV SDP_BUILD_DEPENDENCY_VERSION dcar-2.1
ARG TARBALL=jenkinsfile-runner-dependencies-${SDP_BUILD_DEPENDENCY_VERSION}.tar.gz
ENV JENKINS_UC https://updates.jenkins.io
ENV CASC_JENKINS_CONFIG /usr/share/jenkins/ref/casc
ENV JENKINS_PM_VERSION 2.5.0
ENV JENKINS_PM_VERSION 2.10.0
ENV JENKINS_PM_URL https://github.com/jenkinsci/plugin-installation-manager-tool/releases/download/${JENKINS_PM_VERSION}/jenkins-plugin-manager-${JENKINS_PM_VERSION}.jar
ENV JENKINSFILE_PATH ""
ARG JENKINS_HOME=/var/jenkins_home
Expand All @@ -34,7 +34,8 @@ ARG group=jenkins
ARG uid=1000
ARG gid=1000

RUN curl -sSLo /tmp/${TARBALL} https://github.com/boozallen/sdp-images/releases/download/${SDP_BUILD_DEPENDENCY_VERSION}/${TARBALL}
#RUN curl -sSLo /tmp/${TARBALL} https://github.com/boozallen/sdp-images/releases/download/${SDP_BUILD_DEPENDENCY_VERSION}/${TARBALL}
COPY prebuild/${TARBALL} /tmp/${TARBALL}
RUN cd /tmp && tar -xzf ${TARBALL} \
&& mkdir -p $JENKINS_HOME $TMP_DIR /usr/share/jenkins /build \
&& mv dependencies/ref /usr/share/jenkins/ref \
Expand Down
4 changes: 2 additions & 2 deletions jenkinsfile-runner/Makefile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
OWNER = boozallen
REPO = sdp-images
IMAGE = jenkinsfile-runner
VERSION = dcar-1.8
JENKINS_VERSION=2.298
VERSION = dcar-2.1
JENKINS_VERSION=2.304

REGISTRY = docker.pkg.github.com/$(OWNER)/$(REPO)
TAG = $(REGISTRY)/$(IMAGE):$(VERSION)
Expand Down
2 changes: 1 addition & 1 deletion jenkinsfile-runner/prebuild/build-dep.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ echo "+------------+"
echo "| Bulid Dep |"
echo "+------------+"

SDP_BUILD_DEPENDENCY_VERSION=dcar-1.8
SDP_BUILD_DEPENDENCY_VERSION=dcar-2.1

cd /root/prebuild
tar czvf jenkinsfile-runner-dependencies-$SDP_BUILD_DEPENDENCY_VERSION.tar.gz dependencies
Expand Down

This file was deleted.

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
9f3f500a51c3491431860aeece847fc90fd4478db82eeebf08af71e2fc53bebd
Binary file not shown.
2 changes: 1 addition & 1 deletion jenkinsfile-runner/prebuild/plugins.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
templating-engine:2.2.2
templating-engine:2.3
4 changes: 2 additions & 2 deletions openshift_helm/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# This software package is licensed under the Booz Allen Public License. The license can be found in the License file or at http://boozallen.github.io/licenses/bapl
ARG BASE_REGISTRY=registry.access.redhat.com
ARG BASE_IMAGE=ubi8/ubi
ARG BASE_TAG=8.3
ARG BASE_TAG=8.4
FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
MAINTAINER [email protected]

Expand All @@ -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-2.0
ARG SDP_BUILD_DEPENDENCY_VERSION=dcar-2.1
ARG user=sdp
ARG group=sdp
ARG uid=1000
Expand Down
6 changes: 3 additions & 3 deletions openshift_helm/prebuild/build-dep.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

set -xe

SDP_BUILD_DEPENDENCY_VERSION=dcar-2.0
SDP_BUILD_DEPENDENCY_VERSION=dcar-2.1
OC_VERSION=v3.11.0
HELM_VERSION=v3.5.4
KUBECTL_VERSION=v1.21.1
HELM_VERSION=v3.6.3
KUBECTL_VERSION=v1.21.3

rm -rf /root/prebuild/dependencies
mkdir -p /root/prebuild/dependencies
Expand Down
1 change: 0 additions & 1 deletion openshift_helm/prebuild/helm-dependencies-dcar-2.0.sha256

This file was deleted.

Binary file removed openshift_helm/prebuild/helm-dependencies-dcar-2.0.sig
Binary file not shown.
1 change: 1 addition & 0 deletions openshift_helm/prebuild/helm-dependencies-dcar-2.1.sha256
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
41ee50933bbe081b4716972fa13aba3754ec45e4b87e4f7097df795d8f9ca41f
Binary file not shown.
10 changes: 5 additions & 5 deletions owasp-dep-check/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
ARG BASE_REGISTRY=registry.access.redhat.com
ARG BASE_IMAGE=ubi8/ubi
ARG BASE_TAG=8.3
ARG BASE_TAG=8.4
FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}

### Required Atomic/OpenShift Labels - https://github.com/projectatomic/ContainerApplicationGenericLabels
LABEL name="Solutions Delivery Platform: Jenkins Agent" \
maintainer="[email protected]" \
vendor="Booz Allen Hamilton" \
version="6.1.6" \
release="6.1.6" \
version="6.2.2" \
release="6.2.2" \
summary="OWASP Dependency Check container" \
description="The OWASP Dependency Check container image for the Solutions Delivery Platform"

Expand All @@ -20,8 +20,8 @@ RUN INSTALL_PKGS="java-1.8.0-openjdk-devel ruby glibc glibc-common" && \
yum -y update-minimal --setopt=tsflags=nodocs --security && \
yum -y install --setopt=tsflags=nodocs ${INSTALL_PKGS}

ENV SDP_DCAR_OWASP_DEP_CHK_VERSION dcar-2.0
ENV OWASP_DEP_CHK_VERSION 6.1.6
ENV SDP_DCAR_OWASP_DEP_CHK_VERSION dcar-2.1
ENV OWASP_DEP_CHK_VERSION 6.2.2
ENV HOME /root
ENV JAVA_HOME /usr/lib/jvm/java

Expand Down
6 changes: 3 additions & 3 deletions owasp-dep-check/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
OWNER = boozallen
REPO = sdp-images
IMAGE = owasp-dep-check
VERSION = 6.1.6
VERSION = 6.2.2

REGISTRY = docker.pkg.github.com/$(OWNER)/$(REPO)
TAG = $(REGISTRY)/$(IMAGE):$(VERSION)
Expand Down Expand Up @@ -30,8 +30,8 @@ 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.3 /root/prebuild/dependency-handling.sh
docker run -it -v $(dir)/prebuild:/root/prebuild:z registry.access.redhat.com/ubi8/ubi:8.3 /root/prebuild/build-dep.sh
docker run -u root -it -v $(dir)/prebuild:/root/prebuild:z registry.access.redhat.com/ubi8/ubi:8.4 /root/prebuild/dependency-handling.sh
docker run -it -v $(dir)/prebuild:/root/prebuild:z registry.access.redhat.com/ubi8/ubi:8.4 /root/prebuild/build-dep.sh

info:
@echo "$(TAG) -> $$(dirname $$(git ls-files --full-name Makefile))"
Expand Down
2 changes: 1 addition & 1 deletion owasp-dep-check/prebuild/build-dep.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -xe

SDP_DCAR_OWASP_DEP_CHK_VERSION=dcar-2.0
SDP_DCAR_OWASP_DEP_CHK_VERSION=dcar-2.1

cd /root/prebuild
tar czvf owasp-dep-check-dependencies-$SDP_DCAR_OWASP_DEP_CHK_VERSION.tar.gz dependencies
Expand Down

This file was deleted.

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
9fb64f6442b55b9a4717187fb01afe0ac741a90b06e5a2bd88426f380f6064dc
Binary file not shown.
6 changes: 3 additions & 3 deletions owasp-dep-check/prebuild/pull-from-centos.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

set -xe

OWASP_DEP_CHK_VERSION=6.1.6
SDP_DCAR_OWASP_DEP_CHK_VERSION=dcar-2.0
OWASP_DEP_CHK_VERSION=6.2.2
SDP_DCAR_OWASP_DEP_CHK_VERSION=dcar-2.1

rm -rf /root/prebuild/dependencies

Expand All @@ -23,7 +23,7 @@ yumdownloader glib2 -y --resolve --destdir /root/prebuild/dependencies/mono-comp
# fetch dependency-check upstream binary
#curl -sSLo /root/prebuild/dependencies/owasp/dependency-check-${OWASP_DEP_CHK_VERSION}-release.zip https://dl.bintray.com/jeremy-long/owasp/dependency-check-${OWASP_DEP_CHK_VERSION}-release.zip

curl -sSLo /root/prebuild/dependencies/owasp/dependency-check-${OWASP_DEP_CHK_VERSION}-release.zip https://github.com/jeremylong/DependencyCheck/releases/download/v6.1.6/dependency-check-${OWASP_DEP_CHK_VERSION}-release.zip
curl -sSLo /root/prebuild/dependencies/owasp/dependency-check-${OWASP_DEP_CHK_VERSION}-release.zip https://github.com/jeremylong/DependencyCheck/releases/download/v6.2.2/dependency-check-${OWASP_DEP_CHK_VERSION}-release.zip



Expand Down

0 comments on commit f7e54ea

Please sign in to comment.