From 96ce815a8e1825e82eb662add4b3663d5c20daf6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E5=B0=8F=E7=99=BD?= <296015668@qq.com>
Date: Tue, 1 Aug 2023 17:08:58 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20Jenkins=20=E7=89=B9=E6=9D=83=E6=A8=A1?=
 =?UTF-8?q?=E5=BC=8F=E5=8F=AF=E9=80=89=E9=A1=B9=20(#245)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* perf: Jenkins 特权模式可选项

* perf: docker in docker 模式
---
 jenkins/2.416/data.yml           | 19 +++++++++++++++++++
 jenkins/2.416/docker-compose.yml |  4 ++--
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/jenkins/2.416/data.yml b/jenkins/2.416/data.yml
index cd184f7e2..991a6bfd6 100755
--- a/jenkins/2.416/data.yml
+++ b/jenkins/2.416/data.yml
@@ -1,5 +1,24 @@
 additionalProperties:
     formFields:
+        - default: "true"
+          disabled: true
+          envKey: PRIVILEGED
+          labelEn: Privileged
+          labelZh: 特权模式
+          required: true
+          type: select
+          values:
+            - label: 开启
+              value: "true"
+            - label: 关闭
+              value: "false"
+        - default: /usr/bin/docker
+          edit: true
+          envKey: DOCKER_BINARY
+          labelEn: Docker Binary
+          labelZh: Docker二进制文件
+          required: true
+          type: text
         - default: 8080
           envKey: PANEL_APP_PORT_HTTP
           labelEn: Port
diff --git a/jenkins/2.416/docker-compose.yml b/jenkins/2.416/docker-compose.yml
index 00bd1cf39..c3458f0eb 100644
--- a/jenkins/2.416/docker-compose.yml
+++ b/jenkins/2.416/docker-compose.yml
@@ -4,14 +4,14 @@ services:
     container_name: ${CONTAINER_NAME}
     image: jenkins/jenkins:2.416
     restart: always
-    privileged: true
+    privileged: ${PRIVILEGED}
     user: root
     ports:
       - ${PANEL_APP_PORT_HTTP}:8080
     volumes:
       - ./jenkins:/var/jenkins_home
       - /var/run/docker.sock:/var/run/docker.sock
-      - /usr/local/bin/docker:/usr/local/bin/docker
+      - ${DOCKER_BINARY}:${DOCKER_BINARY}
     networks:
       - 1panel-network
     labels: