From 39fab2fbd481fed8f8ad0b01f214f8cb7418697b Mon Sep 17 00:00:00 2001
From: okxlin <okxlin@gmail.com>
Date: Tue, 5 Sep 2023 22:02:32 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E6=9B=B4=E6=96=B01panel?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/1panel/1.5.5/docker-compose.yml          |  1 +
 apps/1panel/README.md                         | 25 +++++--------------
 apps/1panel/amd64-latest/.env.sample          |  4 ---
 apps/1panel/amd64-latest/data.yml             | 24 ------------------
 apps/1panel/amd64-latest/docker-compose.yml   | 14 -----------
 apps/1panel/arm64-latest/.env.sample          |  4 ---
 apps/1panel/arm64-latest/data.yml             | 24 ------------------
 apps/1panel/arm64-latest/docker-compose.yml   | 14 -----------
 apps/1panel/armv7-latest/.env.sample          |  4 ---
 apps/1panel/armv7-latest/data.yml             | 24 ------------------
 apps/1panel/armv7-latest/docker-compose.yml   | 14 -----------
 apps/1panel/latest/docker-compose.yml         |  1 +
 apps/1panel/ppc64le-latest/.env.sample        |  4 ---
 apps/1panel/ppc64le-latest/data.yml           | 24 ------------------
 apps/1panel/ppc64le-latest/docker-compose.yml | 14 -----------
 apps/1panel/s390x-latest/.env.sample          |  4 ---
 apps/1panel/s390x-latest/data.yml             | 24 ------------------
 apps/1panel/s390x-latest/docker-compose.yml   | 14 -----------
 18 files changed, 8 insertions(+), 229 deletions(-)
 delete mode 100644 apps/1panel/amd64-latest/.env.sample
 delete mode 100644 apps/1panel/amd64-latest/data.yml
 delete mode 100644 apps/1panel/amd64-latest/docker-compose.yml
 delete mode 100644 apps/1panel/arm64-latest/.env.sample
 delete mode 100644 apps/1panel/arm64-latest/data.yml
 delete mode 100644 apps/1panel/arm64-latest/docker-compose.yml
 delete mode 100644 apps/1panel/armv7-latest/.env.sample
 delete mode 100644 apps/1panel/armv7-latest/data.yml
 delete mode 100644 apps/1panel/armv7-latest/docker-compose.yml
 delete mode 100644 apps/1panel/ppc64le-latest/.env.sample
 delete mode 100644 apps/1panel/ppc64le-latest/data.yml
 delete mode 100644 apps/1panel/ppc64le-latest/docker-compose.yml
 delete mode 100644 apps/1panel/s390x-latest/.env.sample
 delete mode 100644 apps/1panel/s390x-latest/data.yml
 delete mode 100644 apps/1panel/s390x-latest/docker-compose.yml

diff --git a/apps/1panel/1.5.5/docker-compose.yml b/apps/1panel/1.5.5/docker-compose.yml
index adbd6c89..7948d62e 100644
--- a/apps/1panel/1.5.5/docker-compose.yml
+++ b/apps/1panel/1.5.5/docker-compose.yml
@@ -6,6 +6,7 @@ services:
     network_mode: "host"
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
+      - /var/lib/docker/volumes:/var/lib/docker/volumes
       - ${DATA_PATH}:/opt
     environment:
       - TZ=${TIME_ZONE}
diff --git a/apps/1panel/README.md b/apps/1panel/README.md
index 2abbe52d..e84d7750 100644
--- a/apps/1panel/README.md
+++ b/apps/1panel/README.md
@@ -14,6 +14,7 @@
 ***
 - 不可调整参数
   - `/var/run/docker.sock`的相关映射
+  - `/var/lib/docker/volumes:/var/lib/docker/volumes` 存储卷映射
  ***
 - 可调整参数
   - `/www/data/1panel-data:/opt`                        文件存储映射
@@ -22,28 +23,14 @@
 ***
 **架构平台对应镜像**
 - amd64
+- arm64
+- armv7
+- ppc64le
+- s390x
+> 2023年9月3日已经更新单标签多镜像
 ```
 docker pull moelin/1panel:latest
 ```
-- arm64
-```
-docker pull moelin/1panel:latest-arm64
-```
-- armv7
-```
-docker pull moelin/1panel:latest-armv7
-```
-- ppc64le
-```
-docker pull moelin/1panel:latest-ppc64le
-```
-- s390x
-```
-docker pull moelin/1panel:latest-s390x
-```
-
-
-
 
 # 原始相关
 ***
diff --git a/apps/1panel/amd64-latest/.env.sample b/apps/1panel/amd64-latest/.env.sample
deleted file mode 100644
index bb3e83b0..00000000
--- a/apps/1panel/amd64-latest/.env.sample
+++ /dev/null
@@ -1,4 +0,0 @@
-CONTAINER_NAME="1panel"
-PANEL_APP_PORT_HTTP="10086"
-DATA_PATH="./data"
-TIME_ZONE="Asia/Shanghai"
diff --git a/apps/1panel/amd64-latest/data.yml b/apps/1panel/amd64-latest/data.yml
deleted file mode 100644
index fda7e03d..00000000
--- a/apps/1panel/amd64-latest/data.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-additionalProperties:
-    formFields:
-        - default: 10086
-          disabled: true
-          envKey: PANEL_APP_PORT_HTTP
-          labelEn: Port
-          labelZh: 端口
-          required: true
-          rule: paramPort
-          type: number
-        - default: ./data
-          edit: true
-          envKey: DATA_PATH
-          labelEn: Data storage folder
-          labelZh: 数据存放文件夹
-          required: true
-          type: text
-        - default: Asia/Shanghai
-          edit: true
-          envKey: TIME_ZONE
-          labelEn: Time zone
-          labelZh: 时区
-          required: true
-          type: text
diff --git a/apps/1panel/amd64-latest/docker-compose.yml b/apps/1panel/amd64-latest/docker-compose.yml
deleted file mode 100644
index fe1f341d..00000000
--- a/apps/1panel/amd64-latest/docker-compose.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-version: '3'
-services:
-  1panel:
-    container_name: ${CONTAINER_NAME}
-    restart: always
-    network_mode: "host"
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-      - ${DATA_PATH}:/opt
-    environment:
-      - TZ=${TIME_ZONE}
-    image: moelin/1panel:latest
-    labels:  
-      createdBy: "Apps"
diff --git a/apps/1panel/arm64-latest/.env.sample b/apps/1panel/arm64-latest/.env.sample
deleted file mode 100644
index bb3e83b0..00000000
--- a/apps/1panel/arm64-latest/.env.sample
+++ /dev/null
@@ -1,4 +0,0 @@
-CONTAINER_NAME="1panel"
-PANEL_APP_PORT_HTTP="10086"
-DATA_PATH="./data"
-TIME_ZONE="Asia/Shanghai"
diff --git a/apps/1panel/arm64-latest/data.yml b/apps/1panel/arm64-latest/data.yml
deleted file mode 100644
index fda7e03d..00000000
--- a/apps/1panel/arm64-latest/data.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-additionalProperties:
-    formFields:
-        - default: 10086
-          disabled: true
-          envKey: PANEL_APP_PORT_HTTP
-          labelEn: Port
-          labelZh: 端口
-          required: true
-          rule: paramPort
-          type: number
-        - default: ./data
-          edit: true
-          envKey: DATA_PATH
-          labelEn: Data storage folder
-          labelZh: 数据存放文件夹
-          required: true
-          type: text
-        - default: Asia/Shanghai
-          edit: true
-          envKey: TIME_ZONE
-          labelEn: Time zone
-          labelZh: 时区
-          required: true
-          type: text
diff --git a/apps/1panel/arm64-latest/docker-compose.yml b/apps/1panel/arm64-latest/docker-compose.yml
deleted file mode 100644
index fe1f341d..00000000
--- a/apps/1panel/arm64-latest/docker-compose.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-version: '3'
-services:
-  1panel:
-    container_name: ${CONTAINER_NAME}
-    restart: always
-    network_mode: "host"
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-      - ${DATA_PATH}:/opt
-    environment:
-      - TZ=${TIME_ZONE}
-    image: moelin/1panel:latest
-    labels:  
-      createdBy: "Apps"
diff --git a/apps/1panel/armv7-latest/.env.sample b/apps/1panel/armv7-latest/.env.sample
deleted file mode 100644
index bb3e83b0..00000000
--- a/apps/1panel/armv7-latest/.env.sample
+++ /dev/null
@@ -1,4 +0,0 @@
-CONTAINER_NAME="1panel"
-PANEL_APP_PORT_HTTP="10086"
-DATA_PATH="./data"
-TIME_ZONE="Asia/Shanghai"
diff --git a/apps/1panel/armv7-latest/data.yml b/apps/1panel/armv7-latest/data.yml
deleted file mode 100644
index fda7e03d..00000000
--- a/apps/1panel/armv7-latest/data.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-additionalProperties:
-    formFields:
-        - default: 10086
-          disabled: true
-          envKey: PANEL_APP_PORT_HTTP
-          labelEn: Port
-          labelZh: 端口
-          required: true
-          rule: paramPort
-          type: number
-        - default: ./data
-          edit: true
-          envKey: DATA_PATH
-          labelEn: Data storage folder
-          labelZh: 数据存放文件夹
-          required: true
-          type: text
-        - default: Asia/Shanghai
-          edit: true
-          envKey: TIME_ZONE
-          labelEn: Time zone
-          labelZh: 时区
-          required: true
-          type: text
diff --git a/apps/1panel/armv7-latest/docker-compose.yml b/apps/1panel/armv7-latest/docker-compose.yml
deleted file mode 100644
index fe1f341d..00000000
--- a/apps/1panel/armv7-latest/docker-compose.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-version: '3'
-services:
-  1panel:
-    container_name: ${CONTAINER_NAME}
-    restart: always
-    network_mode: "host"
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-      - ${DATA_PATH}:/opt
-    environment:
-      - TZ=${TIME_ZONE}
-    image: moelin/1panel:latest
-    labels:  
-      createdBy: "Apps"
diff --git a/apps/1panel/latest/docker-compose.yml b/apps/1panel/latest/docker-compose.yml
index fe1f341d..9efe4027 100644
--- a/apps/1panel/latest/docker-compose.yml
+++ b/apps/1panel/latest/docker-compose.yml
@@ -6,6 +6,7 @@ services:
     network_mode: "host"
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
+      - /var/lib/docker/volumes:/var/lib/docker/volumes
       - ${DATA_PATH}:/opt
     environment:
       - TZ=${TIME_ZONE}
diff --git a/apps/1panel/ppc64le-latest/.env.sample b/apps/1panel/ppc64le-latest/.env.sample
deleted file mode 100644
index bb3e83b0..00000000
--- a/apps/1panel/ppc64le-latest/.env.sample
+++ /dev/null
@@ -1,4 +0,0 @@
-CONTAINER_NAME="1panel"
-PANEL_APP_PORT_HTTP="10086"
-DATA_PATH="./data"
-TIME_ZONE="Asia/Shanghai"
diff --git a/apps/1panel/ppc64le-latest/data.yml b/apps/1panel/ppc64le-latest/data.yml
deleted file mode 100644
index fda7e03d..00000000
--- a/apps/1panel/ppc64le-latest/data.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-additionalProperties:
-    formFields:
-        - default: 10086
-          disabled: true
-          envKey: PANEL_APP_PORT_HTTP
-          labelEn: Port
-          labelZh: 端口
-          required: true
-          rule: paramPort
-          type: number
-        - default: ./data
-          edit: true
-          envKey: DATA_PATH
-          labelEn: Data storage folder
-          labelZh: 数据存放文件夹
-          required: true
-          type: text
-        - default: Asia/Shanghai
-          edit: true
-          envKey: TIME_ZONE
-          labelEn: Time zone
-          labelZh: 时区
-          required: true
-          type: text
diff --git a/apps/1panel/ppc64le-latest/docker-compose.yml b/apps/1panel/ppc64le-latest/docker-compose.yml
deleted file mode 100644
index fe1f341d..00000000
--- a/apps/1panel/ppc64le-latest/docker-compose.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-version: '3'
-services:
-  1panel:
-    container_name: ${CONTAINER_NAME}
-    restart: always
-    network_mode: "host"
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-      - ${DATA_PATH}:/opt
-    environment:
-      - TZ=${TIME_ZONE}
-    image: moelin/1panel:latest
-    labels:  
-      createdBy: "Apps"
diff --git a/apps/1panel/s390x-latest/.env.sample b/apps/1panel/s390x-latest/.env.sample
deleted file mode 100644
index bb3e83b0..00000000
--- a/apps/1panel/s390x-latest/.env.sample
+++ /dev/null
@@ -1,4 +0,0 @@
-CONTAINER_NAME="1panel"
-PANEL_APP_PORT_HTTP="10086"
-DATA_PATH="./data"
-TIME_ZONE="Asia/Shanghai"
diff --git a/apps/1panel/s390x-latest/data.yml b/apps/1panel/s390x-latest/data.yml
deleted file mode 100644
index fda7e03d..00000000
--- a/apps/1panel/s390x-latest/data.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-additionalProperties:
-    formFields:
-        - default: 10086
-          disabled: true
-          envKey: PANEL_APP_PORT_HTTP
-          labelEn: Port
-          labelZh: 端口
-          required: true
-          rule: paramPort
-          type: number
-        - default: ./data
-          edit: true
-          envKey: DATA_PATH
-          labelEn: Data storage folder
-          labelZh: 数据存放文件夹
-          required: true
-          type: text
-        - default: Asia/Shanghai
-          edit: true
-          envKey: TIME_ZONE
-          labelEn: Time zone
-          labelZh: 时区
-          required: true
-          type: text
diff --git a/apps/1panel/s390x-latest/docker-compose.yml b/apps/1panel/s390x-latest/docker-compose.yml
deleted file mode 100644
index fe1f341d..00000000
--- a/apps/1panel/s390x-latest/docker-compose.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-version: '3'
-services:
-  1panel:
-    container_name: ${CONTAINER_NAME}
-    restart: always
-    network_mode: "host"
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-      - ${DATA_PATH}:/opt
-    environment:
-      - TZ=${TIME_ZONE}
-    image: moelin/1panel:latest
-    labels:  
-      createdBy: "Apps"