From a2bbf9ebe6ffddd270ef7232efce52c261066456 Mon Sep 17 00:00:00 2001
From: okxlin <61420215+okxlin@users.noreply.github.com>
Date: Fri, 26 Jun 2026 16:37:56 +0800
Subject: [PATCH] Fix SafeLine runtime dependencies

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
---
 apps/safeline/latest/docker-compose.yml        | 7 ++++++-
 apps/safeline/newnet-latest/data.yml           | 2 +-
 apps/safeline/newnet-latest/docker-compose.yml | 7 ++++++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/apps/safeline/latest/docker-compose.yml b/apps/safeline/latest/docker-compose.yml
index 4e531c852..1b36666fa 100644
--- a/apps/safeline/latest/docker-compose.yml
+++ b/apps/safeline/latest/docker-compose.yml
@@ -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
\ No newline at end of file
+    external: true
diff --git a/apps/safeline/newnet-latest/data.yml b/apps/safeline/newnet-latest/data.yml
index 8202fa1fc..0e9aed437 100644
--- a/apps/safeline/newnet-latest/data.yml
+++ b/apps/safeline/newnet-latest/data.yml
@@ -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
diff --git a/apps/safeline/newnet-latest/docker-compose.yml b/apps/safeline/newnet-latest/docker-compose.yml
index bf1dc0c62..e3d042272 100644
--- a/apps/safeline/newnet-latest/docker-compose.yml
+++ b/apps/safeline/newnet-latest/docker-compose.yml
@@ -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
\ No newline at end of file
+      com.docker.network.bridge.name: safeline-ce