Skip to content

Commit 2fe033a

Browse files
miketa23miketa23
committed
Updated jenkins-agent, sonar-scanner, helm, and dependency check
1 parent b2871c1 commit 2fe033a

30 files changed

+36
-32
lines changed

‎jenkins-agent/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ RUN INSTALL_PKGS="tar hostname device-mapper-persistent-data lvm2 java-1.8.0-ope
2424
yum --disableplugin=subscription-manager -y install --setopt=tsflags=nodocs ${INSTALL_PKGS}
2525

2626
### Install your application here -- add all other necessary items to build your image
27-
ENV JENKINS_AGENT_VERSION dcar-1.8
28-
ENV JENKINS_SWARM_VERSION 3.24
29-
ENV JNLP_SLAVE_VERSION 4.6
27+
ENV JENKINS_AGENT_VERSION dcar-2.0
28+
ENV JENKINS_SWARM_VERSION 3.25
29+
ENV JNLP_SLAVE_VERSION 4.8
3030
ENV HOME /root
3131
ENV JAVA_HOME /usr/lib/jvm/java
3232

‎jenkins-agent/prebuild/build-dep.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
set -xe
44

5-
JENKINS_AGENT_VERSION=dcar-1.8
5+
JENKINS_AGENT_VERSION=dcar-2.0
66

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

‎jenkins-agent/prebuild/jenkins-agent-dependencies-dcar-1.8.sha256

-1
This file was deleted.

‎jenkins-agent/prebuild/jenkins-agent-dependencies-dcar-1.8.sig

-566 Bytes
Binary file not shown.

‎jenkins-agent/prebuild/jenkins-agent-dependencies-dcar-2.0.sha256

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
dc2d4c21f6939758a0ca9814ffcca73f02f69188e303033ec5398eb4cdfd4405

‎jenkins-agent/prebuild/jenkins-agent-dependencies-dcar-2.0.sig

566 Bytes
Binary file not shown.

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
set -xe
44

5-
JENKINS_AGENT_VERSION=dcar-1.8
6-
JENKINS_SWARM_VERSION=3.24
7-
JNLP_SLAVE_VERSION=4.6
5+
JENKINS_AGENT_VERSION=dcar-2.0
6+
JENKINS_SWARM_VERSION=3.25
7+
JNLP_SLAVE_VERSION=4.8
88

99
rm -rf /root/prebuild/dependencies
1010
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

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
set -xe
44

5-
JENKINS_AGENT_VERSION=dcar-1.8
6-
JENKINS_SWARM_VERSION=3.24
7-
JNLP_SLAVE_VERSION=4.6
5+
JENKINS_AGENT_VERSION=dcar-2.0
6+
JENKINS_SWARM_VERSION=3.25
7+
JNLP_SLAVE_VERSION=4.8
88

99
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
1010
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

‎openshift_helm/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ LABEL name="Solutions Delivery Platform: Helm" \
1515
summary="A container used by the openshift and kubernetes libraries within the Solutions Delivery Platform" \
1616
description="A container used by the openshift and kubernetes libraries within the Solutions Delivery Platform"
1717

18-
ARG SDP_BUILD_DEPENDENCY_VERSION=dcar-1.8
18+
ARG SDP_BUILD_DEPENDENCY_VERSION=dcar-2.0
1919
ARG user=sdp
2020
ARG group=sdp
2121
ARG uid=1000

‎openshift_helm/prebuild/build-dep.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
set -xe
44

5-
SDP_BUILD_DEPENDENCY_VERSION=dcar-1.8
5+
SDP_BUILD_DEPENDENCY_VERSION=dcar-2.0
66
OC_VERSION=v3.11.0
7-
HELM_VERSION=v3.5.2
8-
KUBECTL_VERSION=v1.20.0
7+
HELM_VERSION=v3.5.4
8+
KUBECTL_VERSION=v1.21.1
99

1010
rm -rf /root/prebuild/dependencies
1111
mkdir -p /root/prebuild/dependencies

‎openshift_helm/prebuild/helm-dependencies-dcar-1.8.sha256

-1
This file was deleted.

‎openshift_helm/prebuild/helm-dependencies-dcar-1.8.sig

-566 Bytes
Binary file not shown.

‎openshift_helm/prebuild/helm-dependencies-dcar-2.0.sha256

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ace37d3b3026023163f166b7e3508f73b4d6f1d62869590416efa11b9062a2da

‎openshift_helm/prebuild/helm-dependencies-dcar-2.0.sig

566 Bytes
Binary file not shown.

‎owasp-dep-check/Dockerfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
77
LABEL name="Solutions Delivery Platform: Jenkins Agent" \
88
maintainer="terrana_steven@bah.com" \
99
vendor="Booz Allen Hamilton" \
10-
version="6.1.2" \
11-
release="6.1.2" \
10+
version="6.1.6" \
11+
release="6.1.6" \
1212
summary="OWASP Dependency Check container" \
1313
description="The OWASP Dependency Check container image for the Solutions Delivery Platform"
1414

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

23-
ENV SDP_DCAR_OWASP_DEP_CHK_VERSION dcar-1.8
24-
ENV OWASP_DEP_CHK_VERSION 6.1.1
23+
ENV SDP_DCAR_OWASP_DEP_CHK_VERSION dcar-2.0
24+
ENV OWASP_DEP_CHK_VERSION 6.1.6
2525
ENV HOME /root
2626
ENV JAVA_HOME /usr/lib/jvm/java
2727

‎owasp-dep-check/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
OWNER = boozallen
22
REPO = sdp-images
33
IMAGE = owasp-dep-check
4-
VERSION = 6.1.1
4+
VERSION = 6.1.6
55

66
REGISTRY = docker.pkg.github.com/$(OWNER)/$(REPO)
77
TAG = $(REGISTRY)/$(IMAGE):$(VERSION)

‎owasp-dep-check/prebuild/build-dep.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
set -xe
44

5-
SDP_DCAR_OWASP_DEP_CHK_VERSION=dcar-1.8
5+
SDP_DCAR_OWASP_DEP_CHK_VERSION=dcar-2.0
66

77
cd /root/prebuild
88
tar czvf owasp-dep-check-dependencies-$SDP_DCAR_OWASP_DEP_CHK_VERSION.tar.gz dependencies

‎owasp-dep-check/prebuild/owasp-dep-check-dependencies-dcar-1.8.sha256

-1
This file was deleted.

‎owasp-dep-check/prebuild/owasp-dep-check-dependencies-dcar-1.8.sig

-566 Bytes
Binary file not shown.

‎owasp-dep-check/prebuild/owasp-dep-check-dependencies-dcar-2.0.sha256

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
d7b63bd74d7e916f0dd43d297dc393138452d2a0cef458ae4a4109093979e86d

‎owasp-dep-check/prebuild/owasp-dep-check-dependencies-dcar-2.0.sig

566 Bytes
Binary file not shown.

‎owasp-dep-check/prebuild/pull-from-centos.sh

+7-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
set -xe
44

5-
OWASP_DEP_CHK_VERSION=6.1.1
6-
SDP_DCAR_OWASP_DEP_CHK_VERSION=dcar-1.8
5+
OWASP_DEP_CHK_VERSION=6.1.6
6+
SDP_DCAR_OWASP_DEP_CHK_VERSION=dcar-2.0
77

88
rm -rf /root/prebuild/dependencies
99

@@ -20,7 +20,11 @@ yumdownloader glibc -y --resolve --destdir /root/prebuild/dependencies/mono-comp
2020
yumdownloader glibc-common -y --resolve --destdir /root/prebuild/dependencies/mono-complete --disableplugin=subscription-manager
2121

2222
# fetch dependency-check upstream binary
23-
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
23+
#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
24+
25+
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
26+
27+
2428

2529
yum install -y ruby
2630
# fetch ruby dependencies

‎sonar-scanner/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ RUN INSTALL_PKGS="java-1.8.0-openjdk curl grep sed which" && \
2929
yum --disableplugin=subscription-manager -y install --setopt=tsflags=nodocs ${INSTALL_PKGS}
3030

3131
### define necessary variables like PATH to application
32-
ARG SDP_BUILD_DEPENDENCY_VERSION=dcar-1.8
33-
ARG SONAR_SCANNER_VERSION=4.6.0.2311
32+
ARG SDP_BUILD_DEPENDENCY_VERSION=dcar-2.0
33+
ARG SONAR_SCANNER_VERSION=4.6.2.2472
3434
ENV SONAR_SCANNER_FILE=sonar-scanner-${SONAR_SCANNER_VERSION}-linux
3535
ENV TARBALL=sonar-scanner-dependencies-${SDP_BUILD_DEPENDENCY_VERSION}
3636
ENV user=sonarscanner

‎sonar-scanner/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
OWNER = boozallen
22
REPO = sdp-images
33
IMAGE = sonar-scanner
4-
VERSION = 4.6.0.2311
4+
VERSION = 4.6.2.2472
55

66
REGISTRY = docker.pkg.github.com/$(OWNER)/$(REPO)
77
TAG = $(REGISTRY)/$(IMAGE):$(VERSION)

‎sonar-scanner/prebuild/build-dep.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
set -xe
44

5-
SDP_BUILD_DEPENDENCY_VERSION=dcar-1.8
5+
SDP_BUILD_DEPENDENCY_VERSION=dcar-2.0
66

77
cd /root/prebuild
88
tar czvf sonar-scanner-dependencies-$SDP_BUILD_DEPENDENCY_VERSION.tar.gz dependencies

‎sonar-scanner/prebuild/pull-from-ubi.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
set -xe
44

5-
SONAR_SCANNER_VERSION=4.6.0.2311
5+
SONAR_SCANNER_VERSION=4.6.2.2472
66

77
rm -rf /root/prebuild/dependencies
88
mkdir -p /root/prebuild/dependencies/sonar-scanner

‎sonar-scanner/prebuild/sonar-scanner-dependencies-dcar-1.8.sha256

-1
This file was deleted.

‎sonar-scanner/prebuild/sonar-scanner-dependencies-dcar-1.8.sig

-566 Bytes
Binary file not shown.

‎sonar-scanner/prebuild/sonar-scanner-dependencies-dcar-2.0.sha256

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3ef060f54f3dbcc6cffa43aef96f706eb5076b0b4dad2e1885f7137ce098356c

‎sonar-scanner/prebuild/sonar-scanner-dependencies-dcar-2.0.sig

566 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)