From 8ed3db2227bb45a14f74a7331f1ce43e9cd823fe Mon Sep 17 00:00:00 2001
From: Bruce Chen <805899926@qq.com>
Date: Sun, 17 Nov 2024 21:21:30 +0800
Subject: [PATCH] # adjust jenkins Dockerfile

---
 server/docker/ops/jenkins-ssh-agent/Dockerfile | 2 +-
 server/docker/ops/jenkins-ssh-agent/deploy.yml | 2 +-
 server/docker/ops/jenkins-ssh-agent/env.yaml   | 2 +-
 server/docker/ops/jenkins/Dockerfile           | 2 +-
 server/docker/ops/jenkins/deploy.yml           | 2 +-
 server/docker/ops/jenkins/env.yaml             | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/server/docker/ops/jenkins-ssh-agent/Dockerfile b/server/docker/ops/jenkins-ssh-agent/Dockerfile
index bc5990e3e..0352f4f2b 100644
--- a/server/docker/ops/jenkins-ssh-agent/Dockerfile
+++ b/server/docker/ops/jenkins-ssh-agent/Dockerfile
@@ -1,4 +1,4 @@
-FROM jenkins/ssh-agent:6.1.0-jdk17
+FROM jenkins/ssh-agent:{{ param_role_image_version }}
 
 USER root
 RUN apt-get update && apt-get install -y git curl lsb-release
diff --git a/server/docker/ops/jenkins-ssh-agent/deploy.yml b/server/docker/ops/jenkins-ssh-agent/deploy.yml
index bc941b27d..4239f41e3 100644
--- a/server/docker/ops/jenkins-ssh-agent/deploy.yml
+++ b/server/docker/ops/jenkins-ssh-agent/deploy.yml
@@ -3,7 +3,7 @@ version: "3.9"
 services:
 
   jenkins-ssh-agent:
-    image: "{{ param_registry_url }}/{{ param_registry_dir }}/jenkins-ssh-agent:jdk17"
+    image: "{{ param_registry_url }}/{{ param_registry_dir }}/jenkins-ssh-agent:{{ param_role_image_version }}"
     pull_policy: always
     container_name: jenkins-ssh-agent
     privileged: true
diff --git a/server/docker/ops/jenkins-ssh-agent/env.yaml b/server/docker/ops/jenkins-ssh-agent/env.yaml
index f78c5b839..77e4004da 100644
--- a/server/docker/ops/jenkins-ssh-agent/env.yaml
+++ b/server/docker/ops/jenkins-ssh-agent/env.yaml
@@ -1 +1 @@
-param_role_image_version: jdk17
\ No newline at end of file
+param_role_image_version: 6.1.0-jdk17
\ No newline at end of file
diff --git a/server/docker/ops/jenkins/Dockerfile b/server/docker/ops/jenkins/Dockerfile
index 34a20b36a..732ae66e2 100644
--- a/server/docker/ops/jenkins/Dockerfile
+++ b/server/docker/ops/jenkins/Dockerfile
@@ -1,4 +1,4 @@
-FROM jenkins/jenkins:2.485-jdk17
+FROM jenkins/jenkins:{{ param_role_image_version }}
 
 USER root
 RUN apt-get update -y && apt-get install -y lsb-release
diff --git a/server/docker/ops/jenkins/deploy.yml b/server/docker/ops/jenkins/deploy.yml
index 8644bf69e..4e5a5b738 100644
--- a/server/docker/ops/jenkins/deploy.yml
+++ b/server/docker/ops/jenkins/deploy.yml
@@ -8,7 +8,7 @@ x-traefik-label: &traefik-label
 services:
 
   jenkins:
-    image: "{{ param_registry_url }}/{{ param_registry_dir }}/jenkins:jdk17"
+    image: "{{ param_registry_url }}/{{ param_registry_dir }}/jenkins:{{ param_role_image_version }}"
     pull_policy: always
     container_name: jenkins
     privileged: true
diff --git a/server/docker/ops/jenkins/env.yaml b/server/docker/ops/jenkins/env.yaml
index f78c5b839..d480616e4 100644
--- a/server/docker/ops/jenkins/env.yaml
+++ b/server/docker/ops/jenkins/env.yaml
@@ -1 +1 @@
-param_role_image_version: jdk17
\ No newline at end of file
+param_role_image_version: 2.485-jdk21
\ No newline at end of file