From 535dd03f9a900258da3fce59d80f384a5cc0df87 Mon Sep 17 00:00:00 2001
From: Meng Sen <qyg2297248353@gmail.com>
Date: Fri, 18 Oct 2024 16:28:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Meng Sen <qyg2297248353@gmail.com>
---
 kimai/2.23.0/docker-compose.yml        | 3 +++
 nezha/data.yml                         | 2 +-
 nginx-ui/2.0.0/docker-compose.yml      | 4 +++-
 pingvin-share/1.2.1/docker-compose.yml | 3 +++
 slink/1.2.1/docker-compose.yml         | 3 +++
 watchyourlan/2.0.3/docker-compose.yml  | 3 +++
 6 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/kimai/2.23.0/docker-compose.yml b/kimai/2.23.0/docker-compose.yml
index df82f5cbf..0a46b5aac 100644
--- a/kimai/2.23.0/docker-compose.yml
+++ b/kimai/2.23.0/docker-compose.yml
@@ -13,6 +13,9 @@ services:
       - 1panel-network
     ports:
       - ${PANEL_APP_PORT_HTTP}:8001
+    env_file:
+      - /etc/1panel/envs/global.env
+      - ${ENV_FILE:-/etc/1panel/envs/default.env}
     volumes:
       - ${KIMAI2_ROOT_PATH}/data:/opt/kimai/var/data
       - ${KIMAI2_ROOT_PATH}/plugins:/opt/kimai/var/plugins
diff --git a/nezha/data.yml b/nezha/data.yml
index 0df75cec5..b7d5d871b 100644
--- a/nezha/data.yml
+++ b/nezha/data.yml
@@ -11,5 +11,5 @@
   crossVersionUpdate: true
   limit: 0
   website: https://nezha.wiki/
-  github: https://github.com/naiba/nezha
+  github: https://github.com/naiba/nezha/
   document: https://nezha.wiki/guide/dashboard.html
diff --git a/nginx-ui/2.0.0/docker-compose.yml b/nginx-ui/2.0.0/docker-compose.yml
index 168148c6f..17db75c96 100644
--- a/nginx-ui/2.0.0/docker-compose.yml
+++ b/nginx-ui/2.0.0/docker-compose.yml
@@ -15,6 +15,9 @@ services:
     ports:
       - ${PANEL_APP_PORT_HTTP}:80
       - ${PANEL_APP_PORT_HTTPS}:443
+    env_file:
+      - /etc/1panel/envs/global.env
+      - ${ENV_FILE:-/etc/1panel/envs/default.env}
     volumes:
       - ${NGINX_UI_ROOT_PATH}/nginx:/etc/nginx
       - ${NGINX_UI_ROOT_PATH}/nginx-ui:/etc/nginx-ui
@@ -30,4 +33,3 @@ services:
       - NGINX_UI_SERVER_START_CMD=database
       - NGINX_UI_SERVER_PAGE_SIZE=10
       - NGINX_UI_SERVER_CERT_RENEWAL_INTERVAL=7
-      - NGINX_UI_SERVER_SKIP_INSTALLATION=false
diff --git a/pingvin-share/1.2.1/docker-compose.yml b/pingvin-share/1.2.1/docker-compose.yml
index d57925730..8f0c379c1 100644
--- a/pingvin-share/1.2.1/docker-compose.yml
+++ b/pingvin-share/1.2.1/docker-compose.yml
@@ -13,6 +13,9 @@ services:
       - 1panel-network
     ports:
       - ${PANEL_APP_PORT_HTTP}:3000
+    env_file:
+      - /etc/1panel/envs/global.env
+      - ${ENV_FILE:-/etc/1panel/envs/default.env}
     volumes:
       - ${PINGVIN_SHARE_ROOT_PATH}/data:/opt/app/backend/data
       - ${PINGVIN_SHARE_ROOT_PATH}/images:/opt/app/frontend/public/img
diff --git a/slink/1.2.1/docker-compose.yml b/slink/1.2.1/docker-compose.yml
index caab7c0c4..3f8ba91ad 100644
--- a/slink/1.2.1/docker-compose.yml
+++ b/slink/1.2.1/docker-compose.yml
@@ -13,6 +13,9 @@ services:
       - 1panel-network
     ports:
       - ${PANEL_APP_PORT_HTTP}:3000
+    env_file:
+      - /etc/1panel/envs/global.env
+      - ${ENV_FILE:-/etc/1panel/envs/default.env}
     volumes:
       - ${SLINK_ROOT_PATH}/data:/app/var/data
       - ${SLINK_ROOT_PATH}/images:/app/slink/images
diff --git a/watchyourlan/2.0.3/docker-compose.yml b/watchyourlan/2.0.3/docker-compose.yml
index db6951f69..b63bc3fa6 100644
--- a/watchyourlan/2.0.3/docker-compose.yml
+++ b/watchyourlan/2.0.3/docker-compose.yml
@@ -12,6 +12,9 @@ services:
     network_mode: host
     ports:
       - ${PANEL_APP_PORT_HTTP}:8840
+    env_file:
+      - /etc/1panel/envs/global.env
+      - ${ENV_FILE:-/etc/1panel/envs/default.env}
     volumes:
       - ${WATCHYOURLAN_ROOT_PATH}/data:/data/WatchYourLAN
     environment: