From 5ce6d2b1f8eb45e6fa7c75ec19c591a07e4e0705 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Fri, 31 Mar 2023 22:04:51 +0200
Subject: [PATCH] =?UTF-8?q?jenkins=20build=20agend=20docker=20container=20?=
=?UTF-8?q?um=20dependency=20check=20erweitert=20f=C3=BCr=20daten=20cachin?=
=?UTF-8?q?g?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
jenkins/jenkins-build-agent/Dockerfile | 19 ++++++++-----------
jenkins/jenkins-build-agent/readme.md | 10 +++++++---
2 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/jenkins/jenkins-build-agent/Dockerfile b/jenkins/jenkins-build-agent/Dockerfile
index cc4ad76..79573cc 100644
--- a/jenkins/jenkins-build-agent/Dockerfile
+++ b/jenkins/jenkins-build-agent/Dockerfile
@@ -1,6 +1,6 @@
FROM ubuntu:22.04
-ARG MAVEN_VERSION=3.8.6
+ARG MAVEN_VERSION=3.8.8
ARG OPENJDK_VERSION=17
ARG NODEJS_VERSION=v14.15.1
ARG KUBECTL_VERSION=v1.25.0
@@ -8,8 +8,6 @@ ARG HELM_VERSION=3
ENV LANG C.UTF-8
-COPY requirements.txt requirements.txt
-
RUN apt update \
&& apt upgrade -y \
&& apt install -y \
@@ -32,7 +30,8 @@ RUN apt update \
libasound2 \
libxtst6 \
xauth \
- xvfb
+ xvfb \
+ unzip
RUN mkdir -p /usr/share/maven \
&& wget https://dlcdn.apache.org/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.tar.gz -O /tmp/maven.tar.gz \
@@ -57,13 +56,6 @@ RUN wget https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-${HEL
RUN helm plugin install https://github.com/quintush/helm-unittest
-RUN pip3 install -r requirements.txt ;\
- ansible-galaxy collection install community.general ;\
- ansible-galaxy collection install kubernetes.core ;\
- ansible-galaxy collection install cloud.common ;\
- ansible-galaxy collection install ansible.posix ;\
- ansible --version
-
RUN wget https://get.docker.com -O get-docker.sh \
&& chmod +x get-docker.sh \
&& ./get-docker.sh \
@@ -71,6 +63,11 @@ RUN wget https://get.docker.com -O get-docker.sh \
RUN mkdir /run/sshd
+RUN wget https://github.com/jeremylong/DependencyCheck/releases/download/v8.2.1/dependency-check-8.2.1-release.zip -O dependency-check.zip \
+ && unzip dependency-check.zip \
+ && mkdir /dependency-check-data \
+ && dependency-check/bin/dependency-check.sh -d /dependency-check-data --updateonly
+
EXPOSE 22
CMD ["/usr/sbin/sshd", "-D"]
\ No newline at end of file
diff --git a/jenkins/jenkins-build-agent/readme.md b/jenkins/jenkins-build-agent/readme.md
index 666ce05..f36e0dd 100644
--- a/jenkins/jenkins-build-agent/readme.md
+++ b/jenkins/jenkins-build-agent/readme.md
@@ -1,7 +1,11 @@
-# Wichtig
-Damit das Docker Image gebaut werden kann, muss sich die aktuelle `requirements.txt` aus dem provisioning Repo im `jenkins-build-agent` Verzeichnis befinden.
# Image bauen
`docker build -t docker.ozg-sh.de/jenkins-build-agent .`
-docker.ozg-sh.de/jenkins-build-agent
\ No newline at end of file
+docker.ozg-sh.de/jenkins-build-agent
+
+
+Aktuell wird wohl das hier genutzt lauf Jenkinsfiles:
+
+ docker build -t docker.ozg-sh.de/jenkins-build-agent:node-14-15-1 .
+ docker push docker.ozg-sh.de/jenkins-build-agent:node-14-15-1
\ No newline at end of file
--
GitLab