# adjust jenkins Dockerfile

czy21 · Nov 17, 2024 · 8ed3db2 · 8ed3db2
1 parent 0f8fa21
commit 8ed3db2
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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
@@ -1 +1 @@
-param_role_image_version: jdk17
+param_role_image_version: 6.1.0-jdk17
diff --git 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
@@ -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
@@ -1 +1 @@
-param_role_image_version: jdk17
+param_role_image_version: 2.485-jdk21
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		param_role_image_version: jdk17
		param_role_image_version: 6.1.0-jdk17
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		param_role_image_version: jdk17
		param_role_image_version: 2.485-jdk21