From e7dd9ed99d575848c84b898aa7903bf74678f880 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Tue, 9 May 2023 09:42:46 +0200
Subject: [PATCH] jenkins base images: set helm unittest version
---
jenkins/jenkins-build-agent-jdk-11/readme.md | 2 +-
jenkins/jenkins-build-agent/Dockerfile | 3 ++-
jenkins/jenkins-build-agent/readme.md | 8 ++------
jenkins/jenkins-quarkus-build-agent/Dockerfile | 3 ++-
jenkins/jenkins-quarkus-build-agent/readme.md | 6 +++++-
5 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/jenkins/jenkins-build-agent-jdk-11/readme.md b/jenkins/jenkins-build-agent-jdk-11/readme.md
index eaf4db5..f777048 100644
--- a/jenkins/jenkins-build-agent-jdk-11/readme.md
+++ b/jenkins/jenkins-build-agent-jdk-11/readme.md
@@ -2,7 +2,7 @@
# Image bauen
-`docker build -t docker.ozg-sh.de/jenkins-build-agent-jdk-11 .`
+ docker build -t docker.ozg-sh.de/jenkins-build-agent-jdk-11 .
# push
diff --git a/jenkins/jenkins-build-agent/Dockerfile b/jenkins/jenkins-build-agent/Dockerfile
index 79573cc..330d30a 100644
--- a/jenkins/jenkins-build-agent/Dockerfile
+++ b/jenkins/jenkins-build-agent/Dockerfile
@@ -5,6 +5,7 @@ ARG OPENJDK_VERSION=17
ARG NODEJS_VERSION=v14.15.1
ARG KUBECTL_VERSION=v1.25.0
ARG HELM_VERSION=3
+ARG HELM_UNITTEST_VERSION=0.2.11
ENV LANG C.UTF-8
@@ -54,7 +55,7 @@ RUN wget https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-${HEL
&& ./get-helm.sh \
&& rm get-helm.sh
-RUN helm plugin install https://github.com/quintush/helm-unittest
+RUN helm plugin install https://github.com/quintush/helm-unittest --version=${HELM_UNITTEST_VERSION}
RUN wget https://get.docker.com -O get-docker.sh \
&& chmod +x get-docker.sh \
diff --git a/jenkins/jenkins-build-agent/readme.md b/jenkins/jenkins-build-agent/readme.md
index 6870762..2bdf403 100644
--- a/jenkins/jenkins-build-agent/readme.md
+++ b/jenkins/jenkins-build-agent/readme.md
@@ -1,12 +1,8 @@
# Image bauen
-`docker build -t docker.ozg-sh.de/jenkins-build-agent .`
-
-docker.ozg-sh.de/jenkins-build-agent
-
+ docker build -t docker.ozg-sh.de/jenkins-build-agent:node-14-15-1 .
-Aktuell wird wohl das hier genutzt lauf Jenkinsfiles:
+# push
- 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
diff --git a/jenkins/jenkins-quarkus-build-agent/Dockerfile b/jenkins/jenkins-quarkus-build-agent/Dockerfile
index eea33f6..11c3375 100644
--- a/jenkins/jenkins-quarkus-build-agent/Dockerfile
+++ b/jenkins/jenkins-quarkus-build-agent/Dockerfile
@@ -2,6 +2,7 @@ FROM ubuntu:22.04
ARG OPENJDK_VERSION=17
ARG HELM_VERSION=3
+ARG HELM_UNITTEST_VERSION=0.2.11
ENV LANG C.UTF-8
@@ -20,7 +21,7 @@ RUN wget https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-${HEL
&& ./get-helm.sh \
&& rm get-helm.sh
-RUN helm plugin install https://github.com/quintush/helm-unittest
+RUN helm plugin install https://github.com/quintush/helm-unittest --version=${HELM_UNITTEST_VERSION}
RUN wget https://get.docker.com -O get-docker.sh \
&& chmod +x get-docker.sh \
diff --git a/jenkins/jenkins-quarkus-build-agent/readme.md b/jenkins/jenkins-quarkus-build-agent/readme.md
index 67ac079..b588588 100644
--- a/jenkins/jenkins-quarkus-build-agent/readme.md
+++ b/jenkins/jenkins-quarkus-build-agent/readme.md
@@ -1,3 +1,7 @@
# Image bauen
-`docker build -t docker.ozg-sh.de/jenkins-quarkus-build-agent .`
+ docker build -t docker.ozg-sh.de/jenkins-quarkus-build-agent .
+
+# push
+
+ docker push docker.ozg-sh.de/jenkins-quarkus-build-agent
\ No newline at end of file
--
GitLab