feat:更新长亭雷池6.0.3

apps/safeline/6.0.3/.env.sample

@@ -1,6 +1,5 @@
 CONTAINER_NAME="safeline"
 PANEL_APP_PORT_HTTP="40080"
-PANEL_APP_PORT_CHAOS="23333"
 POSTGRES_PASSWORD="password_xxJdZD"
 SAFELINE_DIR="./data"
 SUBNET_PREFIX="172.18.0"

apps/safeline/6.0.3/data.yml

@@ -16,14 +16,6 @@ additionalProperties:
           required: true
           rule: paramPort
           type: number
-        - default: 23333
-          edit: true
-          envKey: PANEL_APP_PORT_CHAOS
-          labelEn: Chaos Port
-          labelZh: Chaos 端口
-          required: true
-          rule: paramPort
-          type: number
         - default: ./data
           edit: true
           envKey: SAFELINE_DIR

apps/safeline/6.0.3/docker-compose.yml

@@ -5,7 +5,7 @@ services:
     networks:
       1panel-network:
         ipv4_address: ${SUBNET_PREFIX}.234
-    image: chaitin/safeline-mgt:6.0.2
+    image: chaitin/safeline-mgt:6.0.3
     volumes:
     - /etc/localtime:/etc/localtime:ro
     - ${SAFELINE_DIR}/resources/mgt:/app/data
@@ -31,7 +31,7 @@ services:
     networks:
       1panel-network:
         ipv4_address: ${SUBNET_PREFIX}.235
-    image: chaitin/safeline-detector:6.0.2
+    image: chaitin/safeline-detector:6.0.3
     volumes:
     - ${SAFELINE_DIR}/resources/detector:/resources/detector
     - ${SAFELINE_DIR}/logs/detector:/logs/detector
@@ -47,7 +47,7 @@ services:
     networks:
       1panel-network:
         ipv4_address: ${SUBNET_PREFIX}.236
-    image: chaitin/safeline-mario:6.0.2
+    image: chaitin/safeline-mario:6.0.3
     volumes:
     - ${SAFELINE_DIR}/resources/mario:/resources/mario
     - ${SAFELINE_DIR}/logs/mario:/logs/mario
@@ -66,12 +66,13 @@ services:
   safeline-tengine:
     container_name: ${CONTAINER_NAME}-tengine
     restart: always
-    image: chaitin/safeline-tengine:6.0.2
+    image: chaitin/safeline-tengine:6.0.3
     volumes:
     - /etc/localtime:/etc/localtime:ro
     - /etc/resolv.conf:/etc/resolv.conf:ro
     - ${SAFELINE_DIR}/resources/nginx:/etc/nginx
     - ${SAFELINE_DIR}/resources/detector:/resources/detector
+    - ${SAFELINE_DIR}/resources/chaos:/resources/chaos
     - ${SAFELINE_DIR}/logs/nginx:/var/log/nginx
     - ${SAFELINE_DIR}/resources/cache:/usr/local/nginx/cache
     environment:
@@ -89,7 +90,7 @@ services:
     networks:
       1panel-network:
         ipv4_address: ${SUBNET_PREFIX}.237
-    image: chaitin/safeline-luigi:6.0.2
+    image: chaitin/safeline-luigi:6.0.3
     volumes:
       - /etc/localtime:/etc/localtime:ro
       - ${SAFELINE_DIR}/resources/luigi:/app/data
@@ -111,7 +112,7 @@ services:
     networks:
       1panel-network:
         ipv4_address: ${SUBNET_PREFIX}.238
-    image: chaitin/safeline-fvm:6.0.2
+    image: chaitin/safeline-fvm:6.0.3
     volumes:
       - /etc/localtime:/etc/localtime:ro
     logging:
@@ -127,7 +128,7 @@ services:
     networks:
       1panel-network:
         ipv4_address: ${SUBNET_PREFIX}.239
-    image: chaitin/safeline-bridge:6.0.2
+    image: chaitin/safeline-bridge:6.0.3
     volumes:
       - /etc/localtime:/etc/localtime:ro
       - /var/run:/app/run
@@ -172,13 +173,13 @@ services:
     networks:
       1panel-network:
         ipv4_address: ${SUBNET_PREFIX}.240
-    image: chaitin/safeline-chaos:6.0.2
+    image: chaitin/safeline-chaos:6.0.3
     logging:
       options:
         max-size: "100m"
         max-file: "5"
-    ports:
-      - ${PANEL_APP_PORT_CHAOS:-23333}:23333
+    volumes:
+      - ${SAFELINE_DIR}/resources/chaos:/app/chaos
     labels:
       createdBy: Apps
 

apps/safeline/latest/.env.sample

@@ -1,6 +1,5 @@
 CONTAINER_NAME="safeline"
 PANEL_APP_PORT_HTTP="40080"
-PANEL_APP_PORT_CHAOS="23333"
 POSTGRES_PASSWORD="password_xxJdZD"
 SAFELINE_DIR="./data"
 SUBNET_PREFIX="172.18.0"

apps/safeline/latest/data.yml

@@ -16,14 +16,6 @@ additionalProperties:
           required: true
           rule: paramPort
           type: number
-        - default: 23333
-          edit: true
-          envKey: PANEL_APP_PORT_CHAOS
-          labelEn: Chaos Port
-          labelZh: Chaos 端口
-          required: true
-          rule: paramPort
-          type: number
         - default: ./data
           edit: true
           envKey: SAFELINE_DIR

apps/safeline/latest/docker-compose.yml

@@ -72,6 +72,7 @@ services:
     - /etc/resolv.conf:/etc/resolv.conf:ro
     - ${SAFELINE_DIR}/resources/nginx:/etc/nginx
     - ${SAFELINE_DIR}/resources/detector:/resources/detector
+    - ${SAFELINE_DIR}/resources/chaos:/resources/chaos
     - ${SAFELINE_DIR}/logs/nginx:/var/log/nginx
     - ${SAFELINE_DIR}/resources/cache:/usr/local/nginx/cache
     environment:
@@ -177,8 +178,8 @@ services:
       options:
         max-size: "100m"
         max-file: "5"
-    ports:
-      - ${PANEL_APP_PORT_CHAOS:-23333}:23333
+    volumes:
+      - ${SAFELINE_DIR}/resources/chaos:/app/chaos
     labels:
       createdBy: Apps
 

apps/safeline/newnet-6.0.3/.env.sample

@@ -1,6 +1,5 @@
 CONTAINER_NAME="safeline"
 PANEL_APP_PORT_HTTP="40080"
-PANEL_APP_PORT_CHAOS="23333"
 POSTGRES_PASSWORD="password_xxJdZD"
 SAFELINE_DIR="./data"
 SUBNET_PREFIX="169.254.0"

apps/safeline/newnet-6.0.3/data.yml

@@ -16,14 +16,6 @@ additionalProperties:
           required: true
           rule: paramPort
           type: number
-        - default: 23333
-          edit: true
-          envKey: PANEL_APP_PORT_CHAOS
-          labelEn: Chaos Port
-          labelZh: Chaos 端口
-          required: true
-          rule: paramPort
-          type: number
         - default: ./data
           edit: true
           envKey: SAFELINE_DIR

apps/safeline/newnet-6.0.3/docker-compose.yml

@@ -6,7 +6,7 @@ services:
       1panel-network:
       safeline-ce:
         ipv4_address: ${SUBNET_PREFIX}.4
-    image: chaitin/safeline-mgt:6.0.2
+    image: chaitin/safeline-mgt:6.0.3
     volumes:
     - /etc/localtime:/etc/localtime:ro
     - ${SAFELINE_DIR}/resources/mgt:/app/data
@@ -33,7 +33,7 @@ services:
       1panel-network:
       safeline-ce:
         ipv4_address: ${SUBNET_PREFIX}.5
-    image: chaitin/safeline-detector:6.0.2
+    image: chaitin/safeline-detector:6.0.3
     volumes:
     - ${SAFELINE_DIR}/resources/detector:/resources/detector
     - ${SAFELINE_DIR}/logs/detector:/logs/detector
@@ -50,7 +50,7 @@ services:
       1panel-network:
       safeline-ce:
         ipv4_address: ${SUBNET_PREFIX}.6
-    image: chaitin/safeline-mario:6.0.2
+    image: chaitin/safeline-mario:6.0.3
     volumes:
     - ${SAFELINE_DIR}/resources/mario:/resources/mario
     - ${SAFELINE_DIR}/logs/mario:/logs/mario
@@ -69,12 +69,13 @@ services:
   safeline-tengine:
     container_name: ${CONTAINER_NAME}-tengine
     restart: always
-    image: chaitin/safeline-tengine:6.0.2
+    image: chaitin/safeline-tengine:6.0.3
     volumes:
     - /etc/localtime:/etc/localtime:ro
     - /etc/resolv.conf:/etc/resolv.conf:ro
     - ${SAFELINE_DIR}/resources/nginx:/etc/nginx
     - ${SAFELINE_DIR}/resources/detector:/resources/detector
+    - ${SAFELINE_DIR}/resources/chaos:/resources/chaos
     - ${SAFELINE_DIR}/logs/nginx:/var/log/nginx
     - ${SAFELINE_DIR}/resources/cache:/usr/local/nginx/cache
     environment:
@@ -93,7 +94,7 @@ services:
       1panel-network:
       safeline-ce:
         ipv4_address: ${SUBNET_PREFIX}.7
-    image: chaitin/safeline-luigi:6.0.2
+    image: chaitin/safeline-luigi:6.0.3
     volumes:
       - /etc/localtime:/etc/localtime:ro
       - ${SAFELINE_DIR}/resources/luigi:/app/data
@@ -116,7 +117,7 @@ services:
       1panel-network:
       safeline-ce:
         ipv4_address: ${SUBNET_PREFIX}.8
-    image: chaitin/safeline-fvm:6.0.2
+    image: chaitin/safeline-fvm:6.0.3
     volumes:
       - /etc/localtime:/etc/localtime:ro
     logging:
@@ -133,7 +134,7 @@ services:
       1panel-network:
       safeline-ce:
         ipv4_address: ${SUBNET_PREFIX}.9
-    image: chaitin/safeline-bridge:6.0.2
+    image: chaitin/safeline-bridge:6.0.3
     volumes:
       - /etc/localtime:/etc/localtime:ro
       - /var/run:/app/run
@@ -180,13 +181,13 @@ services:
       1panel-network:
       safeline-ce:
         ipv4_address: ${SUBNET_PREFIX}.10
-    image: chaitin/safeline-chaos:6.0.2
+    image: chaitin/safeline-chaos:6.0.3
     logging:
       options:
         max-size: "100m"
         max-file: "5"
-    ports:
-      - ${PANEL_APP_PORT_CHAOS:-23333}:23333
+    volumes:
+      - ${SAFELINE_DIR}/resources/chaos:/app/chaos
     labels:
       createdBy: Apps
 

apps/safeline/newnet-latest/.env.sample

@@ -1,6 +1,5 @@
 CONTAINER_NAME="safeline"
 PANEL_APP_PORT_HTTP="40080"
-PANEL_APP_PORT_CHAOS="23333"
 POSTGRES_PASSWORD="password_xxJdZD"
 SAFELINE_DIR="./data"
 SUBNET_PREFIX="169.254.0"

apps/safeline/newnet-latest/data.yml

@@ -16,14 +16,6 @@ additionalProperties:
           required: true
           rule: paramPort
           type: number
-        - default: 23333
-          edit: true
-          envKey: PANEL_APP_PORT_CHAOS
-          labelEn: Chaos Port
-          labelZh: Chaos 端口
-          required: true
-          rule: paramPort
-          type: number
         - default: ./data
           edit: true
           envKey: SAFELINE_DIR

apps/safeline/newnet-latest/docker-compose.yml

@@ -75,6 +75,7 @@ services:
     - /etc/resolv.conf:/etc/resolv.conf:ro
     - ${SAFELINE_DIR}/resources/nginx:/etc/nginx
     - ${SAFELINE_DIR}/resources/detector:/resources/detector
+    - ${SAFELINE_DIR}/resources/chaos:/resources/chaos
     - ${SAFELINE_DIR}/logs/nginx:/var/log/nginx
     - ${SAFELINE_DIR}/resources/cache:/usr/local/nginx/cache
     environment:
@@ -185,8 +186,8 @@ services:
       options:
         max-size: "100m"
         max-file: "5"
-    ports:
-      - ${PANEL_APP_PORT_CHAOS:-23333}:23333
+    volumes:
+      - ${SAFELINE_DIR}/resources/chaos:/app/chaos
     labels:
       createdBy: Apps