diff --git a/apps/aaPanel/data.yml b/apps/aaPanel/data.yml index 5e525f1b..35ae93c3 100644 --- a/apps/aaPanel/data.yml +++ b/apps/aaPanel/data.yml @@ -10,7 +10,7 @@ additionalProperties: tags: - Tool shortDescZh: 宝塔面板国际版,开源的Linux面板 - shortDescEn: BT Panel International Edition, the open source Linux panel + shortDescEn: BT-Panel International Edition, the open source Linux panel type: tool crossVersionUpdate: false limit: 0 diff --git a/apps/aaPanel/latest/.env.sample b/apps/aaPanel/latest/.env.sample index eea63417..0f405e50 100644 --- a/apps/aaPanel/latest/.env.sample +++ b/apps/aaPanel/latest/.env.sample @@ -1,7 +1,7 @@ CONTAINER_NAME="aapanel" -Web_Panel_Port="7200" +PANEL_APP_PORT_HTTP="7200" HTTP_PORT="10080" HTTPS_PORT="10443" -phpMyAdmin_PORT="10888" +PHPMYADMIN_PORT="10888" SSH_PORT="20022" FTP_PORT="20021" diff --git a/apps/aaPanel/latest/data.yml b/apps/aaPanel/latest/data.yml index 57985a1c..80b70d92 100644 --- a/apps/aaPanel/latest/data.yml +++ b/apps/aaPanel/latest/data.yml @@ -2,7 +2,7 @@ additionalProperties: formFields: - default: 7200 edit: true - envKey: Web_Panel_Port + envKey: PANEL_APP_PORT_HTTP labelEn: Web Panel Port labelZh: 面板端口 required: true @@ -26,7 +26,7 @@ additionalProperties: type: number - default: 10888 edit: true - envKey: phpMyAdmin_PORT + envKey: PHPMYADMIN_PORT labelEn: phpMyAdmin Port labelZh: phpMyAdmin端口 required: true diff --git a/apps/aaPanel/latest/docker-compose.yml b/apps/aaPanel/latest/docker-compose.yml index e75239a8..46857f7d 100644 --- a/apps/aaPanel/latest/docker-compose.yml +++ b/apps/aaPanel/latest/docker-compose.yml @@ -1,4 +1,4 @@ -version: "3.3" +version: "3" services: aapanel: container_name: ${CONTAINER_NAME} @@ -6,10 +6,10 @@ services: networks: - 1panel-network ports: - - "${Web_Panel_Port}:7800" + - "${PANEL_APP_PORT_HTTP}:7800" - "${HTTP_PORT}:80" - "${HTTPS_PORT}:443" - - "${phpMyAdmin_PORT}:888" + - "${PHPMYADMIN_PORT}:888" - "${SSH_PORT}:22" - "${FTP_PORT}:21" volumes: diff --git a/apps/aaPanel/logo.png b/apps/aaPanel/logo.png index 023fe72d..4441f6fa 100644 Binary files a/apps/aaPanel/logo.png and b/apps/aaPanel/logo.png differ