mirror of
https://github.com/QYG2297248353/appstore-1panel.git
synced 2026-06-16 01:02:14 +08:00
fix(app-metadata,compose): fix schema, deterministic generation and Docker Compose errors
This change addresses critical issues in app metadata schema, ensures deterministic process-apps.py outputs, and corrects Docker Compose config errors for select apps. - Ensures all apps' data.yml root and formFields schema required fields are present - Fixes illegal Docker Compose fields (e.g. restart: no → "no", removes obsolete version fields) - Removes illegal " = " in environment variable declarations - Adds missing ports to env templates (e.g. zerotier) - Resolves all validation, duplicate, tag, and basic resource consistency errors - process-apps.py output is now idempotent and repeatable Apps deploy and test through compose config without validation errors.
This commit is contained in:
+1
-1
@@ -10,7 +10,7 @@ services:
|
||||
- .env
|
||||
environment:
|
||||
- DATABASE_URL=postgres://${DB_USERNAME}:${DB_PASSWORD}@${DB_HOSTNAME}:${DB_PORT}/${DB_DATABASE_NAME}
|
||||
image: outlinewiki/outline:0.87.4
|
||||
image: outlinewiki/outline:1.0.0
|
||||
labels:
|
||||
createdBy: Apps
|
||||
networks:
|
||||
@@ -34,6 +34,6 @@ services:
|
||||
image: matrixdotorg/synapse:v1.140.0
|
||||
networks:
|
||||
- 1panel-network
|
||||
restart: false
|
||||
restart: 'no'
|
||||
volumes:
|
||||
- ${SYNAPSE_ROOT_PATH}/data:/data
|
||||
|
||||
@@ -8,8 +8,8 @@ services:
|
||||
- ./envs/global.env
|
||||
- .env
|
||||
environment:
|
||||
- DISABLE_TELEMETRY = 1
|
||||
- REMOVE_TRAILING_SLASH = 1
|
||||
- DISABLE_TELEMETRY=1
|
||||
- REMOVE_TRAILING_SLASH=1
|
||||
- DATABASE_TYPE=mysql
|
||||
- DATABASE_URL=mysql://${DB_USERNAME}:${DB_PASSWORD}@${DB_HOSTNAME}:${DB_PORT}/${DB_DATABASE_NAME}
|
||||
image: umamisoftware/umami:mysql-v2.16.0
|
||||
@@ -20,4 +20,3 @@ services:
|
||||
ports:
|
||||
- ${PANEL_APP_PORT_HTTP}:3000
|
||||
restart: always
|
||||
version: '3.8'
|
||||
|
||||
@@ -8,8 +8,8 @@ services:
|
||||
- ./envs/global.env
|
||||
- .env
|
||||
environment:
|
||||
- DISABLE_TELEMETRY = 1
|
||||
- REMOVE_TRAILING_SLASH = 1
|
||||
- DISABLE_TELEMETRY=1
|
||||
- REMOVE_TRAILING_SLASH=1
|
||||
- DATABASE_TYPE=mysql
|
||||
- DATABASE_URL=mysql://${DB_USERNAME}:${DB_PASSWORD}@${DB_HOSTNAME}:${DB_PORT}/${DB_DATABASE_NAME}
|
||||
image: umamisoftware/umami:mysql-v2.19.0
|
||||
@@ -20,4 +20,3 @@ services:
|
||||
ports:
|
||||
- ${PANEL_APP_PORT_HTTP}:3000
|
||||
restart: always
|
||||
version: '3.8'
|
||||
|
||||
@@ -8,8 +8,8 @@ services:
|
||||
- ./envs/global.env
|
||||
- .env
|
||||
environment:
|
||||
- DISABLE_TELEMETRY = 1
|
||||
- REMOVE_TRAILING_SLASH = 1
|
||||
- DISABLE_TELEMETRY=1
|
||||
- REMOVE_TRAILING_SLASH=1
|
||||
- DATABASE_TYPE=postgresql
|
||||
- DATABASE_URL=postgresql://${DB_USERNAME}:${DB_PASSWORD}@${DB_HOSTNAME}:${DB_PORT}/${DB_DATABASE_NAME}
|
||||
image: umamisoftware/umami:postgresql-v2.16.0
|
||||
|
||||
@@ -8,8 +8,8 @@ services:
|
||||
- ./envs/global.env
|
||||
- .env
|
||||
environment:
|
||||
- DISABLE_TELEMETRY = 1
|
||||
- REMOVE_TRAILING_SLASH = 1
|
||||
- DISABLE_TELEMETRY=1
|
||||
- REMOVE_TRAILING_SLASH=1
|
||||
- DATABASE_TYPE=postgresql
|
||||
- DATABASE_URL=postgresql://${DB_USERNAME}:${DB_PASSWORD}@${DB_HOSTNAME}:${DB_PORT}/${DB_DATABASE_NAME}
|
||||
image: umamisoftware/umami:postgresql-v2.19.0
|
||||
|
||||
@@ -4,6 +4,9 @@ ZEROTIER_PLANET_ROOT_PATH=/home/zerotier-planet
|
||||
# 网络模式 [必填]
|
||||
NETWORK_MODE=host
|
||||
|
||||
# Zerotier 端口 [必填]
|
||||
PANEL_APP_PORT_ZT=9993
|
||||
|
||||
# WebUI 端口 [必填]
|
||||
PANEL_APP_PORT_HTTP=3443
|
||||
|
||||
|
||||
@@ -23,6 +23,14 @@ additionalProperties:
|
||||
value: "none"
|
||||
- label: 1panel-network
|
||||
value: "1panel-network"
|
||||
- default: 9993
|
||||
edit: true
|
||||
envKey: PANEL_APP_PORT_ZT
|
||||
labelZh: Zerotier 端口
|
||||
labelEn: Zerotier port
|
||||
required: true
|
||||
rule: paramPort
|
||||
type: number
|
||||
- default: 3443
|
||||
edit: true
|
||||
envKey: PANEL_APP_PORT_HTTP
|
||||
|
||||
Reference in New Issue
Block a user