starred/appstore
1
0
Fork 0
mirror of https://github.com/okxlin/appstore.git synced 2026-09-22 16:00:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix SafeLine runtime dependencies

Browse Source 
Sync SafeLine latest and newnet-latest runtime environment variables with upstream compose so tengine, luigi, and chaos can reach their dependencies. Also move the newnet default subnet away from link-local space for default installs.

Fixes #3299
This commit is contained in:
okxlin
2026-06-26 16:37:56 +08:00
parent bb6e75de01
commit a2bbf9ebe6
3 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/safeline/latest/docker-compose.yml
+6 -1
View File
@@ -59,7 +59,9 @@ services:
- ${SAFELINE_DIR}/resources/sock:/app/sock
environment:
- TCD_MGT_API=https://${SUBNET_PREFIX}.234:1443/api/open/publish/server
- TCD_SNSERVER=${SUBNET_PREFIX}.235:8000
- SNSERVER_ADDR=${SUBNET_PREFIX}.235:8000
- CHAOS_ADDR=${SUBNET_PREFIX}.240
ulimits:
nofile: 131072
network_mode: host
@@ -78,6 +80,7 @@ services:
- ${SAFELINE_DIR}/resources/luigi:/app/data
environment:
- MGT_IP=${SUBNET_PREFIX}.234
- LUIGI_PG=postgres://safeline-ce:${POSTGRES_PASSWORD}@safeline-pg/safeline-ce?sslmode=disable
logging:
options:
max-size: "100m"
@@ -134,6 +137,8 @@ services:
options:
max-size: "100m"
max-file: "5"
environment:
- DB_ADDR=postgres://safeline-ce:${POSTGRES_PASSWORD}@safeline-pg/safeline-ce?sslmode=disable
volumes:
- ${SAFELINE_DIR}/resources/sock:/app/sock
- ${SAFELINE_DIR}/resources/chaos:/app/chaos
@@ -142,4 +147,4 @@ services:
networks:
1panel-network:
external: true
external: true
apps/safeline/newnet-latest/data.yml
+1 -1
View File
@@ -50,7 +50,7 @@ additionalProperties:
pt-br: 'Pasta de armazenamento de dados'
required: true
type: text
- default: 169.254.0
- default: 192.168.255
edit: true
envKey: SUBNET_PREFIX
labelEn: New docker network subnet prefix
apps/safeline/newnet-latest/docker-compose.yml
+6 -1
View File
@@ -61,7 +61,9 @@ services:
- ${SAFELINE_DIR}/resources/sock:/app/sock
environment:
- TCD_MGT_API=https://${SUBNET_PREFIX}.4:1443/api/open/publish/server
- TCD_SNSERVER=${SUBNET_PREFIX}.5:8000
- SNSERVER_ADDR=${SUBNET_PREFIX}.5:8000
- CHAOS_ADDR=${SUBNET_PREFIX}.10
ulimits:
nofile: 131072
network_mode: host
@@ -81,6 +83,7 @@ services:
- ${SAFELINE_DIR}/resources/luigi:/app/data
environment:
- MGT_IP=${SUBNET_PREFIX}.4
- LUIGI_PG=postgres://safeline-ce:${POSTGRES_PASSWORD}@safeline-pg/safeline-ce?sslmode=disable
logging:
options:
max-size: "100m"
@@ -140,6 +143,8 @@ services:
options:
max-size: "100m"
max-file: "5"
environment:
- DB_ADDR=postgres://safeline-ce:${POSTGRES_PASSWORD}@safeline-pg/safeline-ce?sslmode=disable
volumes:
- ${SAFELINE_DIR}/resources/sock:/app/sock
- ${SAFELINE_DIR}/resources/chaos:/app/chaos
@@ -158,4 +163,4 @@ networks:
- gateway: ${SUBNET_PREFIX:?SUBNET_PREFIX required}.1
subnet: ${SUBNET_PREFIX}.0/24
driver_opts:
com.docker.network.bridge.name: safeline-ce
com.docker.network.bridge.name: safeline-ce