From ec37473fb48433b263aac1d16e54f35936391059 Mon Sep 17 00:00:00 2001
From: wanghe-fit2cloud <wanghe@fit2cloud.com>
Date: Thu, 13 Jul 2023 15:34:02 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E7=BB=9F=E4=B8=80=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=8C=81=E4=B9=85=E5=8C=96=E7=9B=AE=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/adguardhome/0.107.33/docker-compose.yml    |  1 -
 apps/adminer/4.8.1/docker-compose.yml           |  2 +-
 apps/alist/3.21.0/data.yml                      | 14 --------------
 apps/alist/3.21.0/docker-compose.yml            |  5 ++---
 apps/bitwarden/1.29.0-alpine/data.yml           |  7 -------
 apps/bitwarden/1.29.0-alpine/docker-compose.yml |  3 +--
 apps/cloudreve/3.8.0/docker-compose.yml         |  1 -
 apps/code-server/4.14.1/data.yml                |  7 -------
 apps/code-server/4.14.1/docker-compose.yml      |  3 +--
 apps/dataease/1.18.8/docker-compose.yml         |  1 -
 apps/ddns-go/5.3.6/data.yml                     |  7 -------
 apps/ddns-go/5.3.6/docker-compose.yml           |  5 ++---
 apps/docker-registry/2.8.1/docker-compose.yml   |  1 -
 apps/flarum/1.8.0/data.yml                      |  7 -------
 apps/flarum/1.8.0/docker-compose.yml            |  6 +++---
 apps/gitea/1.19.3/docker-compose.yml            |  3 +--
 apps/halo/2.7.0/docker-compose.yml              |  3 +--
 apps/jellyfin/10.8.10/docker-compose.yml        |  3 +--
 apps/jenkins/2.414/docker-compose.yml           |  1 -
 apps/kubepi/1.6.4/docker-compose.yml            |  3 +--
 apps/lsky-pro/latest/data.yml                   |  7 -------
 apps/lsky-pro/latest/docker-compose.yml         |  5 ++---
 apps/mariadb/10.11.4/docker-compose.yml         |  1 -
 apps/mblog/1.0.9/docker-compose.yml             |  3 +--
 .../docker-compose.yml                          |  1 -
 apps/mongodb/6.0.7/docker-compose.yml           |  1 -
 apps/mysql/8.0.33/docker-compose.yml            |  1 -
 apps/nexus/3.57.0/docker-compose.yml            |  1 -
 .../nginx-proxy-manager/github-pr-3027/data.yml | 14 --------------
 .../github-pr-3027/docker-compose.yml           |  5 ++---
 apps/nps/0.26.16/docker-compose.yml             |  3 +--
 apps/php5/5.4.45/build/docker-compose.yml       |  2 +-
 apps/php5/5.4.45/docker-compose.yml             |  2 +-
 apps/php5/5.5.38/build/docker-compose.yml       |  2 +-
 apps/php5/5.5.38/docker-compose.yml             |  2 +-
 apps/php5/5.6.40/build/docker-compose.yml       |  2 +-
 apps/php5/5.6.40/docker-compose.yml             |  2 +-
 apps/php7/7.0.33/build/docker-compose.yml       |  2 +-
 apps/php7/7.0.33/docker-compose.yml             |  2 +-
 apps/php7/7.1.33/build/docker-compose.yml       |  2 +-
 apps/php7/7.1.33/docker-compose.yml             |  2 +-
 apps/php7/7.2.34/build/docker-compose.yml       |  2 +-
 apps/php7/7.2.34/docker-compose.yml             |  2 +-
 apps/php7/7.3.33/build/docker-compose.yml       |  2 +-
 apps/php7/7.3.33/docker-compose.yml             |  2 +-
 apps/php7/7.4.33/build/docker-compose.yml       |  2 +-
 apps/php7/7.4.33/docker-compose.yml             |  2 +-
 apps/php8/8.0.28/build/docker-compose.yml       |  2 +-
 apps/php8/8.0.28/docker-compose.yml             |  2 +-
 apps/php8/8.1.18/build/docker-compose.yml       |  2 +-
 apps/php8/8.1.18/docker-compose.yml             |  2 +-
 apps/php8/8.2.5/build/docker-compose.yml        |  2 +-
 apps/php8/8.2.5/docker-compose.yml              |  2 +-
 apps/postgresql/15.3-alpine/docker-compose.yml  |  1 -
 apps/qiandao/20230618/data.yml                  |  7 -------
 apps/qiandao/20230618/docker-compose.yml        |  5 ++---
 apps/qinglong/2.15.17/data.yml                  | 16 +---------------
 apps/qinglong/2.15.17/docker-compose.yml        | 17 ++++++++---------
 apps/redis-commander/0.8.1/docker-compose.yml   |  8 ++++----
 apps/redis/6.2.12/docker-compose.yml            |  1 -
 apps/redis/7.0.12/docker-compose.yml            |  1 -
 apps/synapse/1.87.0/docker-compose.yml          |  2 +-
 apps/tailchat/1.8.3/docker-compose.yml          |  3 +--
 .../nightly-php7.4-apache/docker-compose.yml    |  1 -
 apps/uptime-kuma/1.22.0/docker-compose.yml      |  1 -
 apps/watchtower/1.5.3/docker-compose.yml        |  3 +--
 apps/wikijs/2.5.299/docker-compose.yml          |  3 +--
 apps/wordpress/6.2.2/docker-compose.yml         |  1 -
 apps/zentao/18.5/docker-compose.yml             |  1 -
 69 files changed, 61 insertions(+), 179 deletions(-)

diff --git a/apps/adguardhome/0.107.33/docker-compose.yml b/apps/adguardhome/0.107.33/docker-compose.yml
index c8d8ca48..2e38e07a 100644
--- a/apps/adguardhome/0.107.33/docker-compose.yml
+++ b/apps/adguardhome/0.107.33/docker-compose.yml
@@ -26,7 +26,6 @@ services:
     image: adguard/adguardhome:v0.107.33
     labels:  
       createdBy: "Apps" 
-
 networks:  
   1panel-network:  
     external: true
diff --git a/apps/adminer/4.8.1/docker-compose.yml b/apps/adminer/4.8.1/docker-compose.yml
index 6cb38b6e..72a7abf7 100644
--- a/apps/adminer/4.8.1/docker-compose.yml
+++ b/apps/adminer/4.8.1/docker-compose.yml
@@ -1,4 +1,4 @@
-version: "3"  
+version: '3'  
 services:  
   adminer:  
     image: adminer:4.8.1-standalone 
diff --git a/apps/alist/3.21.0/data.yml b/apps/alist/3.21.0/data.yml
index 6e7001db..cdc912e2 100755
--- a/apps/alist/3.21.0/data.yml
+++ b/apps/alist/3.21.0/data.yml
@@ -8,17 +8,3 @@ additionalProperties:
           required: true
           rule: paramPort
           type: number
-        - default: ./data/data
-          edit: true
-          envKey: DATA_PATH
-          labelEn: Data folder path
-          labelZh: 数据文件夹路径
-          required: true
-          type: text
-        - default: ./data/mnt
-          edit: true
-          envKey: MOUNT_PATH
-          labelEn: Mount folder path
-          labelZh: 挂载文件夹路径
-          required: true
-          type: text
diff --git a/apps/alist/3.21.0/docker-compose.yml b/apps/alist/3.21.0/docker-compose.yml
index fd9c82f7..1603d776 100644
--- a/apps/alist/3.21.0/docker-compose.yml
+++ b/apps/alist/3.21.0/docker-compose.yml
@@ -8,8 +8,8 @@ services:
     ports:
       - "${PANEL_APP_PORT_HTTP}:5244"
     volumes:
-      - "${DATA_PATH}:/opt/alist/data"
-      - "${MOUNT_PATH}:/mnt/data"
+      - ./data/data:/opt/alist/data
+      - ./data/mnt:/mnt/data
     environment:
       - PUID=0
       - PGID=0
@@ -17,7 +17,6 @@ services:
     image: xhofe/alist:v3.21.0
     labels:  
       createdBy: "Apps"
-
 networks:  
   1panel-network:  
     external: true
diff --git a/apps/bitwarden/1.29.0-alpine/data.yml b/apps/bitwarden/1.29.0-alpine/data.yml
index 4812fc50..4bb16e8c 100644
--- a/apps/bitwarden/1.29.0-alpine/data.yml
+++ b/apps/bitwarden/1.29.0-alpine/data.yml
@@ -8,10 +8,3 @@ additionalProperties:
           required: true
           rule: paramPort
           type: number
-        - default: ./data
-          edit: true
-          envKey: DATA_PATH
-          labelEn: Data folder path
-          labelZh: 数据文件夹路径
-          required: true
-          type: text
diff --git a/apps/bitwarden/1.29.0-alpine/docker-compose.yml b/apps/bitwarden/1.29.0-alpine/docker-compose.yml
index bc4cdf75..8d08119b 100644
--- a/apps/bitwarden/1.29.0-alpine/docker-compose.yml
+++ b/apps/bitwarden/1.29.0-alpine/docker-compose.yml
@@ -8,11 +8,10 @@ services:
     ports:
       - "${PANEL_APP_PORT_HTTP}:80"
     volumes:
-      - "${DATA_PATH}:/data"
+      - ./data:/data
     image: vaultwarden/server:1.29.0-alpine
     labels:  
       createdBy: "Apps"
-
 networks:  
   1panel-network:  
     external: true
diff --git a/apps/cloudreve/3.8.0/docker-compose.yml b/apps/cloudreve/3.8.0/docker-compose.yml
index fcb02453..d8abb108 100644
--- a/apps/cloudreve/3.8.0/docker-compose.yml
+++ b/apps/cloudreve/3.8.0/docker-compose.yml
@@ -16,7 +16,6 @@ services:
     image: cloudreve/cloudreve:3.8.0
     labels:  
       createdBy: "Apps"
-
 networks:  
   1panel-network:  
     external: true
diff --git a/apps/code-server/4.14.1/data.yml b/apps/code-server/4.14.1/data.yml
index a5d56807..fe6aaf25 100644
--- a/apps/code-server/4.14.1/data.yml
+++ b/apps/code-server/4.14.1/data.yml
@@ -8,13 +8,6 @@ additionalProperties:
           required: true
           rule: paramPort
           type: number
-        - default: ./data
-          edit: true
-          envKey: DATA_PATH
-          labelEn: Data folder path
-          labelZh: 数据文件夹路径
-          required: true
-          type: text
         - default: code
           envKey: WEB_PASSWORD
           labelEn: Web access password
diff --git a/apps/code-server/4.14.1/docker-compose.yml b/apps/code-server/4.14.1/docker-compose.yml
index cd1fcf30..9f7b0090 100644
--- a/apps/code-server/4.14.1/docker-compose.yml
+++ b/apps/code-server/4.14.1/docker-compose.yml
@@ -8,7 +8,7 @@ services:
     ports:
       - "${PANEL_APP_PORT_HTTP}:8443"
     volumes:
-      - "${DATA_PATH}:/config"
+      - ./data:/config
     environment:
       - PUID=1000
       - PGID=1000
@@ -19,7 +19,6 @@ services:
     image: linuxserver/code-server:4.14.1
     labels:  
       createdBy: "Apps"
-
 networks:  
   1panel-network:  
     external: true
diff --git a/apps/dataease/1.18.8/docker-compose.yml b/apps/dataease/1.18.8/docker-compose.yml
index 837d06cc..b5f0395c 100644
--- a/apps/dataease/1.18.8/docker-compose.yml
+++ b/apps/dataease/1.18.8/docker-compose.yml
@@ -25,7 +25,6 @@ services:
       - 1panel-network
     labels:
       createdBy: "Apps"
-
 networks:
   1panel-network:
     external: true
\ No newline at end of file
diff --git a/apps/ddns-go/5.3.6/data.yml b/apps/ddns-go/5.3.6/data.yml
index 38a29666..3c8c913b 100644
--- a/apps/ddns-go/5.3.6/data.yml
+++ b/apps/ddns-go/5.3.6/data.yml
@@ -8,10 +8,3 @@ additionalProperties:
       required: true
       rule: paramPort
       type: number
-    - default: ./data
-      edit: true
-      envKey: DATA_PATH
-      labelEn: Data folder path
-      labelZh: 数据文件夹路径
-      required: true
-      type: text
diff --git a/apps/ddns-go/5.3.6/docker-compose.yml b/apps/ddns-go/5.3.6/docker-compose.yml
index 829084e1..12e713b0 100644
--- a/apps/ddns-go/5.3.6/docker-compose.yml
+++ b/apps/ddns-go/5.3.6/docker-compose.yml
@@ -1,4 +1,4 @@
-version: "3"
+version: '3'
 services:
   ddns-go:
     container_name: ${CONTAINER_NAME}
@@ -8,11 +8,10 @@ services:
     ports:
       - "${PANEL_APP_PORT_HTTP}:9876"
     volumes:
-      - "${DATA_PATH}:/root"
+      - ./data:/root
     image: jeessy/ddns-go:v5.3.6
     labels:
       createdBy: "Apps"
-
 networks:
   1panel-network:
     external: true
diff --git a/apps/docker-registry/2.8.1/docker-compose.yml b/apps/docker-registry/2.8.1/docker-compose.yml
index 41baf0e3..1af0b530 100644
--- a/apps/docker-registry/2.8.1/docker-compose.yml
+++ b/apps/docker-registry/2.8.1/docker-compose.yml
@@ -12,7 +12,6 @@ services:
       - ./data:/var/lib/registry
     labels:
       createdBy: "Apps"
-
 networks:
   1panel-network:
     external: true
\ No newline at end of file
diff --git a/apps/flarum/1.8.0/data.yml b/apps/flarum/1.8.0/data.yml
index 1fa9d1fa..7ef089be 100755
--- a/apps/flarum/1.8.0/data.yml
+++ b/apps/flarum/1.8.0/data.yml
@@ -62,13 +62,6 @@ additionalProperties:
           required: true
           rule: paramPort
           type: number
-        - default: ./data
-          edit: true
-          envKey: DATA_PATH
-          labelEn: Data storage folder
-          labelZh: 数据存放文件夹
-          required: true
-          type: text
         - default: http://localhost:40020
           edit: true
           envKey: FLARUM_EXTERNAL_URL
diff --git a/apps/flarum/1.8.0/docker-compose.yml b/apps/flarum/1.8.0/docker-compose.yml
index 5209e621..50189fca 100644
--- a/apps/flarum/1.8.0/docker-compose.yml
+++ b/apps/flarum/1.8.0/docker-compose.yml
@@ -1,4 +1,4 @@
-version: "3"
+version: '3'
 services:
   flarum:
     container_name: ${CONTAINER_NAME}
@@ -8,7 +8,7 @@ services:
     ports:
       - "${PANEL_APP_PORT_HTTP}:8000"
     volumes:
-      - "${DATA_PATH}:/data"
+      - ./data:/data
     environment:
       - TZ=Asia/Shanghai
       - PUID=1000
@@ -30,7 +30,7 @@ services:
       - FLARUM_BASE_URL=${FLARUM_EXTERNAL_URL}
     image: crazymax/flarum:1.8.0
     labels:
-      createdBy: Apps
+      createdBy: "Apps"
 networks:
   1panel-network:
     external: true
diff --git a/apps/gitea/1.19.3/docker-compose.yml b/apps/gitea/1.19.3/docker-compose.yml
index 7aaf3a42..bd1cceaf 100644
--- a/apps/gitea/1.19.3/docker-compose.yml
+++ b/apps/gitea/1.19.3/docker-compose.yml
@@ -1,4 +1,4 @@
-version: "3"
+version: '3'
 services:
   gitea:
     image: gitea/gitea:1.19.4
@@ -23,7 +23,6 @@ services:
       - "${PANEL_APP_PORT_SSH}:22"
     labels:
       createdBy: "Apps"
-
 networks:
   1panel-network:
     external: true
\ No newline at end of file
diff --git a/apps/halo/2.7.0/docker-compose.yml b/apps/halo/2.7.0/docker-compose.yml
index 77a3bef8..b626a7d9 100644
--- a/apps/halo/2.7.0/docker-compose.yml
+++ b/apps/halo/2.7.0/docker-compose.yml
@@ -1,4 +1,4 @@
-version: "3"
+version: '3'
 services:
   halo:
     image: halohub/halo:2.7.0
@@ -26,7 +26,6 @@ services:
       - --halo.security.initializer.superadminpassword=${HALO_ADMIN_PASSWORD}
     labels:
       createdBy: "Apps"
-
 networks:
   1panel-network:
     external: true
diff --git a/apps/jellyfin/10.8.10/docker-compose.yml b/apps/jellyfin/10.8.10/docker-compose.yml
index 1b21e83a..9037f658 100644
--- a/apps/jellyfin/10.8.10/docker-compose.yml
+++ b/apps/jellyfin/10.8.10/docker-compose.yml
@@ -1,4 +1,4 @@
-version: "3"
+version: '3'
 services:
   jellyfin:
     container_name: ${CONTAINER_NAME}
@@ -14,7 +14,6 @@ services:
     image: "jellyfin/jellyfin:10.8.10"
     labels:  
       createdBy: "Apps"
-   
 networks:  
   1panel-network:  
     external: true
\ No newline at end of file
diff --git a/apps/jenkins/2.414/docker-compose.yml b/apps/jenkins/2.414/docker-compose.yml
index 3b2bdf68..1fe5f6b1 100644
--- a/apps/jenkins/2.414/docker-compose.yml
+++ b/apps/jenkins/2.414/docker-compose.yml
@@ -16,7 +16,6 @@ services:
       - 1panel-network
     labels:
       createdBy: "Apps"
-
 networks:
   1panel-network:
     external: true
diff --git a/apps/kubepi/1.6.4/docker-compose.yml b/apps/kubepi/1.6.4/docker-compose.yml
index 71152693..1543f5b3 100644
--- a/apps/kubepi/1.6.4/docker-compose.yml
+++ b/apps/kubepi/1.6.4/docker-compose.yml
@@ -1,4 +1,4 @@
-version: "3"
+version: '3'
 services:
   kubepi:
     image: kubeoperator/kubepi-server:v1.6.4
@@ -13,7 +13,6 @@ services:
     privileged: true
     labels:
       createdBy: "Apps"
-
 networks:
   1panel-network:
     external: true
\ No newline at end of file
diff --git a/apps/lsky-pro/latest/data.yml b/apps/lsky-pro/latest/data.yml
index bbc3f4e1..4f86dac5 100644
--- a/apps/lsky-pro/latest/data.yml
+++ b/apps/lsky-pro/latest/data.yml
@@ -8,10 +8,3 @@ additionalProperties:
           required: true
           rule: paramPort
           type: number
-        - default: ./data
-          edit: true
-          envKey: DATA_PATH
-          labelEn: Data folder path
-          labelZh: 数据文件夹路径
-          required: true
-          type: text
diff --git a/apps/lsky-pro/latest/docker-compose.yml b/apps/lsky-pro/latest/docker-compose.yml
index d916808a..2201a4fd 100644
--- a/apps/lsky-pro/latest/docker-compose.yml
+++ b/apps/lsky-pro/latest/docker-compose.yml
@@ -1,4 +1,4 @@
-version: "3"
+version: '3'
 services:
   lskypro:
     container_name: ${CONTAINER_NAME}
@@ -6,7 +6,7 @@ services:
     networks:
       - 1panel-network
     volumes:
-      - "${DATA_PATH}:/var/www/html/"
+      - ./data:/var/www/html/
     ports:
       - "${PANEL_APP_PORT_HTTP}:8089"
     environment:
@@ -14,7 +14,6 @@ services:
     image: halcyonazure/lsky-pro-docker:latest
     labels:  
       createdBy: "Apps"
-
 networks:  
   1panel-network:  
     external: true
diff --git a/apps/mariadb/10.11.4/docker-compose.yml b/apps/mariadb/10.11.4/docker-compose.yml
index 9a1c36d9..ba5c064f 100644
--- a/apps/mariadb/10.11.4/docker-compose.yml
+++ b/apps/mariadb/10.11.4/docker-compose.yml
@@ -14,7 +14,6 @@ services:
       MYSQL_ROOT_PASSWORD: ${PANEL_DB_ROOT_PASSWORD}
     labels:
       createdBy: "Apps"
-
 networks:
   1panel-network:
     external: true
\ No newline at end of file
diff --git a/apps/mblog/1.0.9/docker-compose.yml b/apps/mblog/1.0.9/docker-compose.yml
index e84c675e..92b93ad3 100644
--- a/apps/mblog/1.0.9/docker-compose.yml
+++ b/apps/mblog/1.0.9/docker-compose.yml
@@ -1,4 +1,4 @@
-version: "3"
+version: '3'
 services:
   halo:
     image: kingwrcy/mblog:1.0.9
@@ -14,7 +14,6 @@ services:
       - ${PANEL_APP_PORT_HTTP}:38321
     labels:
       createdBy: "Apps"
-
 networks:
   1panel-network:
     external: true
diff --git a/apps/minio/RELEASE.2023-05-04T21-44-30Z/docker-compose.yml b/apps/minio/RELEASE.2023-05-04T21-44-30Z/docker-compose.yml
index dac25b2d..ff0e22ad 100644
--- a/apps/minio/RELEASE.2023-05-04T21-44-30Z/docker-compose.yml
+++ b/apps/minio/RELEASE.2023-05-04T21-44-30Z/docker-compose.yml
@@ -22,7 +22,6 @@ services:
         - ./data:/data
       labels:
         createdBy: "Apps"
-
 networks:
   1panel-network:
     external: true
\ No newline at end of file
diff --git a/apps/mongodb/6.0.7/docker-compose.yml b/apps/mongodb/6.0.7/docker-compose.yml
index 82bd8eb0..f22d1221 100644
--- a/apps/mongodb/6.0.7/docker-compose.yml
+++ b/apps/mongodb/6.0.7/docker-compose.yml
@@ -15,7 +15,6 @@ services:
       - ./data:/data/db
     labels:
       createdBy: "Apps"
-
 networks:
   1panel-network:
     external: true
\ No newline at end of file
diff --git a/apps/mysql/8.0.33/docker-compose.yml b/apps/mysql/8.0.33/docker-compose.yml
index b0f9d23b..90c53749 100644
--- a/apps/mysql/8.0.33/docker-compose.yml
+++ b/apps/mysql/8.0.33/docker-compose.yml
@@ -21,7 +21,6 @@ services:
       createdBy: "Apps"
     command:
       - --default-authentication-plugin=mysql_native_password
-
 networks:
   1panel-network:
     external: true
diff --git a/apps/nexus/3.57.0/docker-compose.yml b/apps/nexus/3.57.0/docker-compose.yml
index 520625ec..2068a2e6 100644
--- a/apps/nexus/3.57.0/docker-compose.yml
+++ b/apps/nexus/3.57.0/docker-compose.yml
@@ -14,7 +14,6 @@ services:
       - 1panel-network
     labels:
       createdBy: "Apps"
-
 networks:
   1panel-network:
     external: true
\ No newline at end of file
diff --git a/apps/nginx-proxy-manager/github-pr-3027/data.yml b/apps/nginx-proxy-manager/github-pr-3027/data.yml
index 959fdcc9..46bdf569 100644
--- a/apps/nginx-proxy-manager/github-pr-3027/data.yml
+++ b/apps/nginx-proxy-manager/github-pr-3027/data.yml
@@ -24,17 +24,3 @@ additionalProperties:
           required: true
           rule: paramPort
           type: number
-        - default: ./data/data
-          edit: true
-          envKey: DATA_PATH
-          labelEn: Data folder path
-          labelZh: 数据文件夹路径
-          required: true
-          type: text
-        - default: ./data/ssl
-          edit: true
-          envKey: SSL_PATH
-          labelEn: SSL folder path
-          labelZh: 证书文件夹路径
-          required: true
-          type: text
diff --git a/apps/nginx-proxy-manager/github-pr-3027/docker-compose.yml b/apps/nginx-proxy-manager/github-pr-3027/docker-compose.yml
index 2d19388e..7659621f 100644
--- a/apps/nginx-proxy-manager/github-pr-3027/docker-compose.yml
+++ b/apps/nginx-proxy-manager/github-pr-3027/docker-compose.yml
@@ -10,12 +10,11 @@ services:
       - "${PANEL_APP_PORT_HTTP}:81"
       - "${PANEL_APP_PORT_HTTP2}:443"
     volumes:
-      - "${DATA_PATH}:/data"
-      - "${SSL_PATH}:/etc/letsencrypt"
+      - ./data/data:/data
+      - ./data/ssl:/etc/letsencrypt
     image: jc21/nginx-proxy-manager:github-pr-3027
     labels:  
       createdBy: "Apps"
-
 networks:  
   1panel-network:  
     external: true
diff --git a/apps/nps/0.26.16/docker-compose.yml b/apps/nps/0.26.16/docker-compose.yml
index 715479ae..2fb29ab8 100644
--- a/apps/nps/0.26.16/docker-compose.yml
+++ b/apps/nps/0.26.16/docker-compose.yml
@@ -1,4 +1,4 @@
-version: "3"
+version: '3'
 services:
   nps:
     image: yisier1/nps:v0.26.16
@@ -28,7 +28,6 @@ services:
       - 1panel-network
     labels:
       createdBy: "Apps"
-
 networks:
   1panel-network:
     external: true
\ No newline at end of file
diff --git a/apps/php5/5.4.45/build/docker-compose.yml b/apps/php5/5.4.45/build/docker-compose.yml
index 3ae0a636..76332ace 100644
--- a/apps/php5/5.4.45/build/docker-compose.yml
+++ b/apps/php5/5.4.45/build/docker-compose.yml
@@ -1,4 +1,4 @@
-version: "3"
+version: '3'
 services:
   1panel-php:
     build:
diff --git a/apps/php5/5.4.45/docker-compose.yml b/apps/php5/5.4.45/docker-compose.yml
index 989dc3ae..9971f7f2 100644
--- a/apps/php5/5.4.45/docker-compose.yml
+++ b/apps/php5/5.4.45/docker-compose.yml
@@ -1,4 +1,4 @@
-version: "3"
+version: '3'
 services:
   php:
     image: ${IMAGE_NAME}
diff --git a/apps/php5/5.5.38/build/docker-compose.yml b/apps/php5/5.5.38/build/docker-compose.yml
index 3ae0a636..76332ace 100644
--- a/apps/php5/5.5.38/build/docker-compose.yml
+++ b/apps/php5/5.5.38/build/docker-compose.yml
@@ -1,4 +1,4 @@
-version: "3"
+version: '3'
 services:
   1panel-php:
     build:
diff --git a/apps/php5/5.5.38/docker-compose.yml b/apps/php5/5.5.38/docker-compose.yml
index 989dc3ae..9971f7f2 100644
--- a/apps/php5/5.5.38/docker-compose.yml
+++ b/apps/php5/5.5.38/docker-compose.yml
@@ -1,4 +1,4 @@
-version: "3"
+version: '3'
 services:
   php:
     image: ${IMAGE_NAME}
diff --git a/apps/php5/5.6.40/build/docker-compose.yml b/apps/php5/5.6.40/build/docker-compose.yml
index 3ae0a636..76332ace 100644
--- a/apps/php5/5.6.40/build/docker-compose.yml
+++ b/apps/php5/5.6.40/build/docker-compose.yml
@@ -1,4 +1,4 @@
-version: "3"
+version: '3'
 services:
   1panel-php:
     build:
diff --git a/apps/php5/5.6.40/docker-compose.yml b/apps/php5/5.6.40/docker-compose.yml
index 989dc3ae..9971f7f2 100644
--- a/apps/php5/5.6.40/docker-compose.yml
+++ b/apps/php5/5.6.40/docker-compose.yml
@@ -1,4 +1,4 @@
-version: "3"
+version: '3'
 services:
   php:
     image: ${IMAGE_NAME}
diff --git a/apps/php7/7.0.33/build/docker-compose.yml b/apps/php7/7.0.33/build/docker-compose.yml
index 3ae0a636..76332ace 100644
--- a/apps/php7/7.0.33/build/docker-compose.yml
+++ b/apps/php7/7.0.33/build/docker-compose.yml
@@ -1,4 +1,4 @@
-version: "3"
+version: '3'
 services:
   1panel-php:
     build:
diff --git a/apps/php7/7.0.33/docker-compose.yml b/apps/php7/7.0.33/docker-compose.yml
index 989dc3ae..9971f7f2 100644
--- a/apps/php7/7.0.33/docker-compose.yml
+++ b/apps/php7/7.0.33/docker-compose.yml
@@ -1,4 +1,4 @@
-version: "3"
+version: '3'
 services:
   php:
     image: ${IMAGE_NAME}
diff --git a/apps/php7/7.1.33/build/docker-compose.yml b/apps/php7/7.1.33/build/docker-compose.yml
index 3ae0a636..76332ace 100644
--- a/apps/php7/7.1.33/build/docker-compose.yml
+++ b/apps/php7/7.1.33/build/docker-compose.yml
@@ -1,4 +1,4 @@
-version: "3"
+version: '3'
 services:
   1panel-php:
     build:
diff --git a/apps/php7/7.1.33/docker-compose.yml b/apps/php7/7.1.33/docker-compose.yml
index 989dc3ae..9971f7f2 100644
--- a/apps/php7/7.1.33/docker-compose.yml
+++ b/apps/php7/7.1.33/docker-compose.yml
@@ -1,4 +1,4 @@
-version: "3"
+version: '3'
 services:
   php:
     image: ${IMAGE_NAME}
diff --git a/apps/php7/7.2.34/build/docker-compose.yml b/apps/php7/7.2.34/build/docker-compose.yml
index 3ae0a636..76332ace 100644
--- a/apps/php7/7.2.34/build/docker-compose.yml
+++ b/apps/php7/7.2.34/build/docker-compose.yml
@@ -1,4 +1,4 @@
-version: "3"
+version: '3'
 services:
   1panel-php:
     build:
diff --git a/apps/php7/7.2.34/docker-compose.yml b/apps/php7/7.2.34/docker-compose.yml
index 989dc3ae..9971f7f2 100644
--- a/apps/php7/7.2.34/docker-compose.yml
+++ b/apps/php7/7.2.34/docker-compose.yml
@@ -1,4 +1,4 @@
-version: "3"
+version: '3'
 services:
   php:
     image: ${IMAGE_NAME}
diff --git a/apps/php7/7.3.33/build/docker-compose.yml b/apps/php7/7.3.33/build/docker-compose.yml
index 3ae0a636..76332ace 100644
--- a/apps/php7/7.3.33/build/docker-compose.yml
+++ b/apps/php7/7.3.33/build/docker-compose.yml
@@ -1,4 +1,4 @@
-version: "3"
+version: '3'
 services:
   1panel-php:
     build:
diff --git a/apps/php7/7.3.33/docker-compose.yml b/apps/php7/7.3.33/docker-compose.yml
index 989dc3ae..9971f7f2 100644
--- a/apps/php7/7.3.33/docker-compose.yml
+++ b/apps/php7/7.3.33/docker-compose.yml
@@ -1,4 +1,4 @@
-version: "3"
+version: '3'
 services:
   php:
     image: ${IMAGE_NAME}
diff --git a/apps/php7/7.4.33/build/docker-compose.yml b/apps/php7/7.4.33/build/docker-compose.yml
index 3ae0a636..76332ace 100644
--- a/apps/php7/7.4.33/build/docker-compose.yml
+++ b/apps/php7/7.4.33/build/docker-compose.yml
@@ -1,4 +1,4 @@
-version: "3"
+version: '3'
 services:
   1panel-php:
     build:
diff --git a/apps/php7/7.4.33/docker-compose.yml b/apps/php7/7.4.33/docker-compose.yml
index 989dc3ae..9971f7f2 100644
--- a/apps/php7/7.4.33/docker-compose.yml
+++ b/apps/php7/7.4.33/docker-compose.yml
@@ -1,4 +1,4 @@
-version: "3"
+version: '3'
 services:
   php:
     image: ${IMAGE_NAME}
diff --git a/apps/php8/8.0.28/build/docker-compose.yml b/apps/php8/8.0.28/build/docker-compose.yml
index 3ae0a636..76332ace 100644
--- a/apps/php8/8.0.28/build/docker-compose.yml
+++ b/apps/php8/8.0.28/build/docker-compose.yml
@@ -1,4 +1,4 @@
-version: "3"
+version: '3'
 services:
   1panel-php:
     build:
diff --git a/apps/php8/8.0.28/docker-compose.yml b/apps/php8/8.0.28/docker-compose.yml
index 989dc3ae..9971f7f2 100644
--- a/apps/php8/8.0.28/docker-compose.yml
+++ b/apps/php8/8.0.28/docker-compose.yml
@@ -1,4 +1,4 @@
-version: "3"
+version: '3'
 services:
   php:
     image: ${IMAGE_NAME}
diff --git a/apps/php8/8.1.18/build/docker-compose.yml b/apps/php8/8.1.18/build/docker-compose.yml
index 3ae0a636..76332ace 100644
--- a/apps/php8/8.1.18/build/docker-compose.yml
+++ b/apps/php8/8.1.18/build/docker-compose.yml
@@ -1,4 +1,4 @@
-version: "3"
+version: '3'
 services:
   1panel-php:
     build:
diff --git a/apps/php8/8.1.18/docker-compose.yml b/apps/php8/8.1.18/docker-compose.yml
index 989dc3ae..9971f7f2 100644
--- a/apps/php8/8.1.18/docker-compose.yml
+++ b/apps/php8/8.1.18/docker-compose.yml
@@ -1,4 +1,4 @@
-version: "3"
+version: '3'
 services:
   php:
     image: ${IMAGE_NAME}
diff --git a/apps/php8/8.2.5/build/docker-compose.yml b/apps/php8/8.2.5/build/docker-compose.yml
index 3ae0a636..76332ace 100644
--- a/apps/php8/8.2.5/build/docker-compose.yml
+++ b/apps/php8/8.2.5/build/docker-compose.yml
@@ -1,4 +1,4 @@
-version: "3"
+version: '3'
 services:
   1panel-php:
     build:
diff --git a/apps/php8/8.2.5/docker-compose.yml b/apps/php8/8.2.5/docker-compose.yml
index 989dc3ae..9971f7f2 100644
--- a/apps/php8/8.2.5/docker-compose.yml
+++ b/apps/php8/8.2.5/docker-compose.yml
@@ -1,4 +1,4 @@
-version: "3"
+version: '3'
 services:
   php:
     image: ${IMAGE_NAME}
diff --git a/apps/postgresql/15.3-alpine/docker-compose.yml b/apps/postgresql/15.3-alpine/docker-compose.yml
index 1270af99..7d8bb7d9 100644
--- a/apps/postgresql/15.3-alpine/docker-compose.yml
+++ b/apps/postgresql/15.3-alpine/docker-compose.yml
@@ -15,7 +15,6 @@ services:
       - 1panel-network
     labels:
       createdBy: "Apps"
-
 networks:
   1panel-network:
     external: true
diff --git a/apps/qiandao/20230618/data.yml b/apps/qiandao/20230618/data.yml
index e70dfe1c..fa66fbb5 100644
--- a/apps/qiandao/20230618/data.yml
+++ b/apps/qiandao/20230618/data.yml
@@ -8,13 +8,6 @@ additionalProperties:
           required: true
           rule: paramPort
           type: number
-        - default: ./data
-          edit: true
-          envKey: DATA_PATH
-          labelEn: Data folder path
-          labelZh: 数据文件夹路径
-          required: true
-          type: text
         - default: AESPWD
           envKey: AES_PWD
           labelEn: AES encryption key
diff --git a/apps/qiandao/20230618/docker-compose.yml b/apps/qiandao/20230618/docker-compose.yml
index 956d5f5f..747fd865 100644
--- a/apps/qiandao/20230618/docker-compose.yml
+++ b/apps/qiandao/20230618/docker-compose.yml
@@ -1,4 +1,4 @@
-version: "3"
+version: '3'
 services:
   qiandao:
     container_name: ${CONTAINER_NAME}
@@ -8,7 +8,7 @@ services:
     ports:
       - "${PANEL_APP_PORT_HTTP}:80"
     volumes:
-      - "${DATA_PATH}:/usr/src/app/config"
+      - ./data:/usr/src/app/config
     environment:
       # 监听地址
       # - BIND=0.0.0.0
@@ -147,7 +147,6 @@ services:
     # image: a76yyyy/qiandao:lite-latest
     labels:  
       createdBy: "Apps" 
-
 networks:  
   1panel-network:  
     external: true
diff --git a/apps/qinglong/2.15.17/data.yml b/apps/qinglong/2.15.17/data.yml
index 964fc0bd..fd57f6ba 100644
--- a/apps/qinglong/2.15.17/data.yml
+++ b/apps/qinglong/2.15.17/data.yml
@@ -7,18 +7,4 @@ additionalProperties:
           labelZh: 网页端口
           required: true
           rule: paramPort
-          type: number
-        - default: ./data/data
-          edit: true
-          envKey: DATA_PATH
-          labelEn: Data folder path
-          labelZh: 数据文件夹路径
-          required: true
-          type: text
-        - default: ./data/mnt
-          edit: true
-          envKey: MOUNT_PATH
-          labelEn: Mount folder path
-          labelZh: 挂载文件夹路径
-          required: true
-          type: text
\ No newline at end of file
+          type: number
\ No newline at end of file
diff --git a/apps/qinglong/2.15.17/docker-compose.yml b/apps/qinglong/2.15.17/docker-compose.yml
index 084c354f..f35d9b66 100644
--- a/apps/qinglong/2.15.17/docker-compose.yml
+++ b/apps/qinglong/2.15.17/docker-compose.yml
@@ -1,18 +1,17 @@
-version: '2'
+version: '3'
 services:
   qinglong:
-    # alpine 基础镜像版本
     image: whyour/qinglong:2.15.17
-    container_name: ${CONTAINER_NAME}  #固定写法，勿改
-    networks:  
+    container_name: ${CONTAINER_NAME}
+    networks:
       - 1panel-network
-    # debian-slim 基础镜像版本
-    # image: whyour/qinglong:debian  
     volumes:
-      - "${DATA_PATH}:/opt/qinglong/data"
+      - ./data:/ql/data
     ports:
       - "${PANEL_APP_PORT_HTTP}:5700"
     restart: always
-networks:  
-  1panel-network:  
+    labels:
+      createdBy: "Apps"
+networks:
+  1panel-network:
     external: true
\ No newline at end of file
diff --git a/apps/redis-commander/0.8.1/docker-compose.yml b/apps/redis-commander/0.8.1/docker-compose.yml
index 29b50945..b2b07d19 100644
--- a/apps/redis-commander/0.8.1/docker-compose.yml
+++ b/apps/redis-commander/0.8.1/docker-compose.yml
@@ -1,6 +1,4 @@
-networks:
-  1panel-network:
-    external: true
+version: '3'
 services:
   redis-commander-XnlR:
     container_name: ${CONTAINER_NAME}
@@ -17,4 +15,6 @@ services:
     ports:
       - ${PANEL_APP_PORT_HTTP}:8081
     restart: always
-version: "3"
\ No newline at end of file
+networks:
+  1panel-network:
+    external: true
\ No newline at end of file
diff --git a/apps/redis/6.2.12/docker-compose.yml b/apps/redis/6.2.12/docker-compose.yml
index 171a5fea..106ec706 100644
--- a/apps/redis/6.2.12/docker-compose.yml
+++ b/apps/redis/6.2.12/docker-compose.yml
@@ -15,7 +15,6 @@ services:
       - ./logs:/logs
     labels:
       createdBy: "Apps"
-
 networks:
   1panel-network:
     external: true
\ No newline at end of file
diff --git a/apps/redis/7.0.12/docker-compose.yml b/apps/redis/7.0.12/docker-compose.yml
index 2b64183a..4b153ad7 100644
--- a/apps/redis/7.0.12/docker-compose.yml
+++ b/apps/redis/7.0.12/docker-compose.yml
@@ -15,7 +15,6 @@ services:
       - ./logs:/logs
     labels:
       createdBy: "Apps"
-
 networks:
   1panel-network:
     external: true
\ No newline at end of file
diff --git a/apps/synapse/1.87.0/docker-compose.yml b/apps/synapse/1.87.0/docker-compose.yml
index d877b6f5..7b7c104e 100644
--- a/apps/synapse/1.87.0/docker-compose.yml
+++ b/apps/synapse/1.87.0/docker-compose.yml
@@ -1,4 +1,4 @@
-version: "3"
+version: '3'
 services:
   synapse:
     container_name: ${CONTAINER_NAME}
diff --git a/apps/tailchat/1.8.3/docker-compose.yml b/apps/tailchat/1.8.3/docker-compose.yml
index 0691c3db..07a8ef11 100644
--- a/apps/tailchat/1.8.3/docker-compose.yml
+++ b/apps/tailchat/1.8.3/docker-compose.yml
@@ -1,4 +1,4 @@
-version: "3"
+version: '3'
 services:
   tailchat:
     container_name: ${CONTAINER_NAME}
@@ -25,7 +25,6 @@ services:
       - ${PANEL_APP_PORT_HTTP}:11000
     labels:
       createdBy: "Apps"
-
 networks:
   1panel-network:
     external: true
diff --git a/apps/typecho/nightly-php7.4-apache/docker-compose.yml b/apps/typecho/nightly-php7.4-apache/docker-compose.yml
index f9398295..7099dc02 100644
--- a/apps/typecho/nightly-php7.4-apache/docker-compose.yml
+++ b/apps/typecho/nightly-php7.4-apache/docker-compose.yml
@@ -24,7 +24,6 @@ services:
       - ./data:/app
     labels:
       createdBy: "Apps"
-
 networks:
   1panel-network:
     external: true
\ No newline at end of file
diff --git a/apps/uptime-kuma/1.22.0/docker-compose.yml b/apps/uptime-kuma/1.22.0/docker-compose.yml
index 459c195e..9f77ddbe 100644
--- a/apps/uptime-kuma/1.22.0/docker-compose.yml
+++ b/apps/uptime-kuma/1.22.0/docker-compose.yml
@@ -13,7 +13,6 @@ services:
       - ${PANEL_APP_PORT_HTTP}:3001
     labels:
       createdBy: "Apps"
-
 networks:
   1panel-network:
     external: true
\ No newline at end of file
diff --git a/apps/watchtower/1.5.3/docker-compose.yml b/apps/watchtower/1.5.3/docker-compose.yml
index cfce3f9f..5f032deb 100644
--- a/apps/watchtower/1.5.3/docker-compose.yml
+++ b/apps/watchtower/1.5.3/docker-compose.yml
@@ -1,4 +1,4 @@
-version: "3"
+version: '3'
 services:
   watchtower:
     container_name: ${CONTAINER_NAME}
@@ -14,7 +14,6 @@ services:
     image: containrrr/watchtower
     labels:
       createdBy: "Apps"
-
 networks:
   1panel-network:
     external: true
diff --git a/apps/wikijs/2.5.299/docker-compose.yml b/apps/wikijs/2.5.299/docker-compose.yml
index 9060fd70..a845de06 100644
--- a/apps/wikijs/2.5.299/docker-compose.yml
+++ b/apps/wikijs/2.5.299/docker-compose.yml
@@ -1,4 +1,4 @@
-version: "3"
+version: '3'
 services:
   wiki:
     image: requarks/wiki:2.5.299
@@ -17,7 +17,6 @@ services:
       DB_NAME: ${PANEL_DB_NAME}
     labels:
       createdBy: "Apps"
-
 networks:
   1panel-network:
     external: true
\ No newline at end of file
diff --git a/apps/wordpress/6.2.2/docker-compose.yml b/apps/wordpress/6.2.2/docker-compose.yml
index 3e5c3a13..4be876a9 100644
--- a/apps/wordpress/6.2.2/docker-compose.yml
+++ b/apps/wordpress/6.2.2/docker-compose.yml
@@ -19,7 +19,6 @@ services:
       WORDPRESS_DEBUG: 0
     labels:
       createdBy: "Apps"
-
 networks:
   1panel-network:
     external: true
\ No newline at end of file
diff --git a/apps/zentao/18.5/docker-compose.yml b/apps/zentao/18.5/docker-compose.yml
index 7616b6d5..e8f67ca5 100644
--- a/apps/zentao/18.5/docker-compose.yml
+++ b/apps/zentao/18.5/docker-compose.yml
@@ -15,7 +15,6 @@ services:
       - 1panel-network
     labels:
       createdBy: "Apps"
-
 networks:
   1panel-network:
     external: true
\ No newline at end of file