From 92195eace47dc3d8c1d6c2e8da50c81525924169 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=90=8C=E6=A3=AE?= <qyg2297248353@163.com>
Date: Wed, 17 Jul 2024 19:00:15 +0800
Subject: [PATCH] =?UTF-8?q?Gitea=20=E4=BB=A3=E7=90=86=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 萌森 <qyg2297248353@163.com>
---
 gitea/1.22.1/data.yml           | 18 +++++-------------
 gitea/1.22.1/docker-compose.yml |  3 +++
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/gitea/1.22.1/data.yml b/gitea/1.22.1/data.yml
index 7a71d3fc7..0829f630d 100644
--- a/gitea/1.22.1/data.yml
+++ b/gitea/1.22.1/data.yml
@@ -35,7 +35,7 @@ additionalProperties:
       required: true
       rule: paramPort
       type: number
-    - default: 222
+    - default: 22
       envKey: PANEL_APP_PORT_SSH
       labelZh: SSH 端口
       labelEn: SSH Port
@@ -92,40 +92,34 @@ additionalProperties:
       labelEn: Database Name
       required: true
       type: text
-    - default: "Gitea: Git with a cup of tea"
+    - default: "Gitea"
       edit: true
       envKey: APP_NAME
       labelZh: 应用名称
       labelEn: Application Name
       required: true
       type: text
-    - default: "127.0.0.1"
+    - default: "localhost"
       edit: true
       envKey: DOMAIN
       labelZh: HTTP 克隆域名
       labelEn: HTTP Clone Domain
       required: true
       type: text
-    - default: "127.0.0.1"
+    - default: "localhost"
       edit: true
       envKey: SSH_DOMAIN
       labelZh: SSH 克隆域名
       labelEn: SSH Clone Domain
       required: true
       type: text
-    - default: "222"
-      edit: true
-      envKey: SSH_PORT
-      labelZh: SSH 克隆端口
-      labelEn: SSH Clone Port
-      required: true
-      type: text
     - default: ""
       edit: true
       envKey: ROOT_URL
       labelZh: 公共 URL (覆盖级)
       labelEn: Public URL (Override)
       required: false
+      rule: paramExtUrl
       type: text
     - default: "false"
       edit: true
@@ -171,8 +165,6 @@ additionalProperties:
       required: true
       type: select
       values:
-        - label: 忽略
-          value: ""
         - label: 开启
           value: "true"
         - label: 关闭
diff --git a/gitea/1.22.1/docker-compose.yml b/gitea/1.22.1/docker-compose.yml
index e3f94216f..f57fb1e73 100644
--- a/gitea/1.22.1/docker-compose.yml
+++ b/gitea/1.22.1/docker-compose.yml
@@ -28,7 +28,10 @@ services:
       - USER_UID=1000
       - USER_GID=1000
       - DB_HOST=${DB_HOSTNAME}:${DB_PORT}
+      - SSH_PORT=${PANEL_APP_PORT_SSH}
       - GITEA__time__DEFAULT_UI_LOCATION=Asia/Shanghai
       - GITEA__migrations__ALLOW_LOCALNETWORKS=true
       - GITEA__api__ENABLE_SWAGGER=false
       - GITEA__other__SHOW_FOOTER_POWERED_BY=false
+      - GITEA__git.config__http.proxy=${PROXY_URL}
+      - GITEA__git.config__https.proxy=${PROXY_URL}