-
Notifications
You must be signed in to change notification settings - Fork 28
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
updating jenkins,jenkins agent,helm,jenkinsfile-runner,owasp depcheck
- Loading branch information
Showing
39 changed files
with
55 additions
and
54 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 change: 0 additions & 1 deletion
1
jenkins-agent/prebuild/jenkins-agent-dependencies-dcar-2.0.sha256
This file was deleted.
Oops, something went wrong.
Binary file not shown.
1 change: 1 addition & 0 deletions
1
jenkins-agent/prebuild/jenkins-agent-dependencies-dcar-2.1.sha256
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
ee98da7a546cbbb6424ff63ddfd83187733be73058ce902ae9367ebba6f788a1 |
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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" | ||
|
||
|
@@ -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, | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 change: 0 additions & 1 deletion
1
jenkins/kubernetes/prebuild/jenkins-dependencies-dcar-1.9.sha256
This file was deleted.
Oops, something went wrong.
Binary file not shown.
1 change: 1 addition & 0 deletions
1
jenkins/kubernetes/prebuild/jenkins-dependencies-dcar-2.1.sha256
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
7fe0d4bcab25e1081c7af03923e942cb167c29054fc3c6b9587023c71deeb80c |
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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" | ||
|
||
|
@@ -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 | ||
|
@@ -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 \ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 change: 0 additions & 1 deletion
1
jenkinsfile-runner/prebuild/jenkinsfile-runner-dependencies-dcar-1.8.sha256
This file was deleted.
Oops, something went wrong.
Binary file removed
BIN
-566 Bytes
jenkinsfile-runner/prebuild/jenkinsfile-runner-dependencies-dcar-1.8.sig
Binary file not shown.
1 change: 1 addition & 0 deletions
1
jenkinsfile-runner/prebuild/jenkinsfile-runner-dependencies-dcar-2.1.sha256
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
9f3f500a51c3491431860aeece847fc90fd4478db82eeebf08af71e2fc53bebd |
Binary file added
BIN
+565 Bytes
jenkinsfile-runner/prebuild/jenkinsfile-runner-dependencies-dcar-2.1.sig
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
templating-engine:2.2.2 | ||
templating-engine:2.3 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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] | ||
|
||
|
@@ -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 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
41ee50933bbe081b4716972fa13aba3754ec45e4b87e4f7097df795d8f9ca41f |
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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" | ||
|
||
|
@@ -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 | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 change: 0 additions & 1 deletion
1
owasp-dep-check/prebuild/owasp-dep-check-dependencies-dcar-2.0.sha256
This file was deleted.
Oops, something went wrong.
Binary file removed
BIN
-566 Bytes
owasp-dep-check/prebuild/owasp-dep-check-dependencies-dcar-2.0.sig
Binary file not shown.
1 change: 1 addition & 0 deletions
1
owasp-dep-check/prebuild/owasp-dep-check-dependencies-dcar-2.1.sha256
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
9fb64f6442b55b9a4717187fb01afe0ac741a90b06e5a2bd88426f380f6064dc |
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters