feat:更新长亭雷池3.14.0

apps/safeline/3.14.0/.env.sample

@@ -1,9 +1,5 @@
 CONTAINER_NAME="safeline"
 PANEL_APP_PORT_HTTP="40080"
-PANEL_APP_PORT_HTTP2="40081"
 POSTGRES_PASSWORD="password_xxJdZD"
-REDIS_HOST="safeline-redis"
-PANEL_REDIS_ROOT_PASSWORD="redis_password"
-REDIS_PORT="6379"
 SAFELINE_DIR="./data"
 SUBNET_PREFIX="172.18.0"

apps/safeline/3.14.0/data.yml

@@ -1,29 +1,5 @@
 additionalProperties:
     formFields:
-        - default: "safeline-redis"
-          disabled: true
-          envKey: REDIS_HOST
-          key: redis
-          labelEn: Redis Service
-          labelZh: Redis服务
-          required: true
-          type: text
-        - default: "6379"
-          disabled: true
-          envKey: REDIS_PORT
-          labelEn: Redis Service Port
-          labelZh: Redis服务端口
-          required: true
-          rule: paramPort
-          type: number
-        - default: ""
-          edit: true
-          envKey: PANEL_REDIS_ROOT_PASSWORD
-          labelEn: Redis Service Password
-          labelZh: Redis服务密码
-          required: true
-          rule: paramCommon
-          type: password
         - default: ""
           edit: true
           envKey: POSTGRES_PASSWORD
@@ -40,14 +16,6 @@ additionalProperties:
           required: true
           rule: paramPort
           type: number
-        - default: 40081
-          edit: true
-          envKey: PANEL_APP_PORT_HTTP2
-          labelEn: Detector Port
-          labelZh: Detector端口
-          required: true
-          rule: paramPort
-          type: number
         - default: ./data
           edit: true
           envKey: SAFELINE_DIR

apps/safeline/3.14.0/docker-compose.yml

@@ -6,7 +6,7 @@ services:
     networks:
       1panel-network:
         ipv4_address: ${SUBNET_PREFIX}.234
-    image: chaitin/safeline-mgt-api:3.13.2
+    image: chaitin/safeline-mgt-api:3.14.0
     volumes:
     - ${SAFELINE_DIR}/resources/management:/resources/management
     - ${SAFELINE_DIR}/resources/nginx:/resources/nginx
@@ -20,7 +20,6 @@ services:
     - DATABASE_URL=postgres://safeline-ce:${POSTGRES_PASSWORD}@safeline-postgres/safeline-ce
     - MARIO_URL=http://safeline-mario:3335
     - FVM_MANAGER_URL=safeline-fvm-manager:9004
-    - REDIS_URL=redis://:${PANEL_REDIS_ROOT_PASSWORD}@${REDIS_HOST}:${REDIS_PORT}/0
     - MANAGEMENT_LOGS_DIR=/logs/management
     dns: 
       - 119.29.29.29
@@ -40,13 +39,11 @@ services:
     networks:
       1panel-network:
         ipv4_address: ${SUBNET_PREFIX}.235
-    image: chaitin/safeline-detector:3.13.2
+    image: chaitin/safeline-detector:3.14.0
     volumes:
     - ${SAFELINE_DIR}/resources/detector:/resources/detector
     - ${SAFELINE_DIR}/logs/detector:/logs/detector
     - /etc/localtime:/etc/localtime:ro
-    ports:
-    - ${PANEL_APP_PORT_HTTP2}:8000
     environment:
     - LOG_DIR=/logs/detector
     cap_drop:
@@ -60,7 +57,7 @@ services:
     networks:
       1panel-network:
         ipv4_address: ${SUBNET_PREFIX}.236
-    image: chaitin/safeline-mario:3.13.2
+    image: chaitin/safeline-mario:3.14.0
     volumes:
     - ${SAFELINE_DIR}/resources/mario:/resources/mario
     - ${SAFELINE_DIR}/logs/mario:/logs/mario
@@ -69,7 +66,6 @@ services:
     - LOG_DIR=/logs/mario
     - GOGC=100
     - DATABASE_URL=postgres://safeline-ce:${POSTGRES_PASSWORD}@safeline-postgres/safeline-ce
-    - REDIS_URL=redis://:${PANEL_REDIS_ROOT_PASSWORD}@${REDIS_HOST}:${REDIS_PORT}/0
     cap_drop:
     - net_raw
     labels:
@@ -78,7 +74,7 @@ services:
   safeline-tengine:
     container_name: ${CONTAINER_NAME}-tengine
     restart: always
-    image: chaitin/safeline-tengine:3.13.2
+    image: chaitin/safeline-tengine:3.14.0
     volumes:
     - ${SAFELINE_DIR}/resources/nginx:/etc/nginx
     - ${SAFELINE_DIR}/resources/management:/resources/management
@@ -88,8 +84,7 @@ services:
     - ${SAFELINE_DIR}/resources/cache:/usr/local/nginx/cache
     - /etc/resolv.conf:/etc/resolv.conf
     environment:
-    - REDIS_URL=redis://:${PANEL_REDIS_ROOT_PASSWORD}@${SUBNET_PREFIX}.233:${REDIS_PORT}/0
-    - MGT_ADDR=${SUBNET_PREFIX}.234:9002
+    - MGT_API=https://${SUBNET_PREFIX}.234:1443/api/publish/server
     ulimits:
       nofile: 131072
     network_mode: host
@@ -102,7 +97,7 @@ services:
     networks:
       1panel-network:
         ipv4_address: ${SUBNET_PREFIX}.238
-    image: chaitin/safeline-fvm-manager:3.13.2
+    image: chaitin/safeline-fvm-manager:3.14.0
     volumes:
       - /etc/localtime:/etc/localtime:ro
       - ${SAFELINE_DIR}/logs:/logs
@@ -133,24 +128,6 @@ services:
     labels:
       createdBy: Apps
 
-  safeline-redis:
-    container_name: ${CONTAINER_NAME}-redis
-    restart: always
-    networks:
-      1panel-network:
-        ipv4_address: ${SUBNET_PREFIX}.233
-    image: redis:7.2.3
-    volumes:
-      - ${SAFELINE_DIR}/resources/redis/data:/data
-      - /etc/localtime:/etc/localtime:ro
-    command: redis-server --appendonly yes --requirepass  ${PANEL_REDIS_ROOT_PASSWORD}
-    cap_drop:
-      - net_raw
-    sysctls:
-      net.core.somaxconn: "511"
-    labels:
-      createdBy: Apps
-
 networks:
   1panel-network:
     external: true

apps/safeline/latest/.env.sample

@@ -1,9 +1,5 @@
 CONTAINER_NAME="safeline"
 PANEL_APP_PORT_HTTP="40080"
-PANEL_APP_PORT_HTTP2="40081"
 POSTGRES_PASSWORD="password_xxJdZD"
-REDIS_HOST="safeline-redis"
-PANEL_REDIS_ROOT_PASSWORD="redis_password"
-REDIS_PORT="6379"
 SAFELINE_DIR="./data"
 SUBNET_PREFIX="172.18.0"

apps/safeline/latest/data.yml

@@ -1,29 +1,5 @@
 additionalProperties:
     formFields:
-        - default: "safeline-redis"
-          disabled: true
-          envKey: REDIS_HOST
-          key: redis
-          labelEn: Redis Service
-          labelZh: Redis服务
-          required: true
-          type: text
-        - default: "6379"
-          disabled: true
-          envKey: REDIS_PORT
-          labelEn: Redis Service Port
-          labelZh: Redis服务端口
-          required: true
-          rule: paramPort
-          type: number
-        - default: ""
-          edit: true
-          envKey: PANEL_REDIS_ROOT_PASSWORD
-          labelEn: Redis Service Password
-          labelZh: Redis服务密码
-          required: true
-          rule: paramCommon
-          type: password
         - default: ""
           edit: true
           envKey: POSTGRES_PASSWORD
@@ -40,14 +16,6 @@ additionalProperties:
           required: true
           rule: paramPort
           type: number
-        - default: 40081
-          edit: true
-          envKey: PANEL_APP_PORT_HTTP2
-          labelEn: Detector Port
-          labelZh: Detector端口
-          required: true
-          rule: paramPort
-          type: number
         - default: ./data
           edit: true
           envKey: SAFELINE_DIR

apps/safeline/latest/docker-compose.yml

@@ -20,7 +20,6 @@ services:
     - DATABASE_URL=postgres://safeline-ce:${POSTGRES_PASSWORD}@safeline-postgres/safeline-ce
     - MARIO_URL=http://safeline-mario:3335
     - FVM_MANAGER_URL=safeline-fvm-manager:9004
-    - REDIS_URL=redis://:${PANEL_REDIS_ROOT_PASSWORD}@${REDIS_HOST}:${REDIS_PORT}/0
     - MANAGEMENT_LOGS_DIR=/logs/management
     dns: 
       - 119.29.29.29
@@ -45,8 +44,6 @@ services:
     - ${SAFELINE_DIR}/resources/detector:/resources/detector
     - ${SAFELINE_DIR}/logs/detector:/logs/detector
     - /etc/localtime:/etc/localtime:ro
-    ports:
-    - ${PANEL_APP_PORT_HTTP2}:8000
     environment:
     - LOG_DIR=/logs/detector
     cap_drop:
@@ -69,7 +66,6 @@ services:
     - LOG_DIR=/logs/mario
     - GOGC=100
     - DATABASE_URL=postgres://safeline-ce:${POSTGRES_PASSWORD}@safeline-postgres/safeline-ce
-    - REDIS_URL=redis://:${PANEL_REDIS_ROOT_PASSWORD}@${REDIS_HOST}:${REDIS_PORT}/0
     cap_drop:
     - net_raw
     labels:
@@ -88,8 +84,7 @@ services:
     - ${SAFELINE_DIR}/resources/cache:/usr/local/nginx/cache
     - /etc/resolv.conf:/etc/resolv.conf
     environment:
-    - REDIS_URL=redis://:${PANEL_REDIS_ROOT_PASSWORD}@${SUBNET_PREFIX}.233:${REDIS_PORT}/0
-    - MGT_ADDR=${SUBNET_PREFIX}.234:9002
+    - MGT_API=https://${SUBNET_PREFIX}.234:1443/api/publish/server
     ulimits:
       nofile: 131072
     network_mode: host
@@ -133,24 +128,6 @@ services:
     labels:
       createdBy: Apps
 
-  safeline-redis:
-    container_name: ${CONTAINER_NAME}-redis
-    restart: always
-    networks:
-      1panel-network:
-        ipv4_address: ${SUBNET_PREFIX}.233
-    image: redis:7.2.3
-    volumes:
-      - ${SAFELINE_DIR}/resources/redis/data:/data
-      - /etc/localtime:/etc/localtime:ro
-    command: redis-server --appendonly yes --requirepass  ${PANEL_REDIS_ROOT_PASSWORD}
-    cap_drop:
-      - net_raw
-    sysctls:
-      net.core.somaxconn: "511"
-    labels:
-      createdBy: Apps
-
 networks:
   1panel-network:
     external: true

apps/safeline/newnet-3.13.2/data.yml

@@ -1,64 +0,0 @@
-additionalProperties:
-    formFields:
-        - default: "safeline-redis"
-          disabled: true
-          envKey: REDIS_HOST
-          key: redis
-          labelEn: Redis Service
-          labelZh: Redis服务
-          required: true
-          type: text
-        - default: "6379"
-          disabled: true
-          envKey: REDIS_PORT
-          labelEn: Redis Service Port
-          labelZh: Redis服务端口
-          required: true
-          rule: paramPort
-          type: number
-        - default: ""
-          edit: true
-          envKey: PANEL_REDIS_ROOT_PASSWORD
-          labelEn: Redis Service Password
-          labelZh: Redis服务密码
-          required: true
-          rule: paramCommon
-          type: password
-        - default: ""
-          edit: true
-          envKey: POSTGRES_PASSWORD
-          labelEn: Postgres database User Password
-          labelZh: Postgres数据库密码
-          required: true
-          rule: paramCommon
-          type: password
-        - default: 40080
-          edit: true
-          envKey: PANEL_APP_PORT_HTTP
-          labelEn: Port
-          labelZh: 端口
-          required: true
-          rule: paramPort
-          type: number
-        - default: 40081
-          edit: true
-          envKey: PANEL_APP_PORT_HTTP2
-          labelEn: Detector Port
-          labelZh: Detector端口
-          required: true
-          rule: paramPort
-          type: number
-        - default: ./data
-          edit: true
-          envKey: SAFELINE_DIR
-          labelEn: Data storage folder
-          labelZh: 数据存放文件夹
-          required: true
-          type: text
-        - default: 169.254.0
-          edit: true
-          envKey: SUBNET_PREFIX
-          labelEn: New docker network subnet prefix
-          labelZh: 新 docker 网络子网前缀
-          required: true
-          type: text

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

@@ -1,9 +1,5 @@
 CONTAINER_NAME="safeline"
 PANEL_APP_PORT_HTTP="40080"
-PANEL_APP_PORT_HTTP2="40081"
 POSTGRES_PASSWORD="password_xxJdZD"
-REDIS_HOST="safeline-redis"
-PANEL_REDIS_ROOT_PASSWORD="redis_password"
-REDIS_PORT="6379"
 SAFELINE_DIR="./data"
 SUBNET_PREFIX="169.254.0"

apps/safeline/newnet-3.14.0/data.yml

@@ -0,0 +1,32 @@
+additionalProperties:
+    formFields:
+        - default: ""
+          edit: true
+          envKey: POSTGRES_PASSWORD
+          labelEn: Postgres database User Password
+          labelZh: Postgres数据库密码
+          required: true
+          rule: paramCommon
+          type: password
+        - default: 40080
+          edit: true
+          envKey: PANEL_APP_PORT_HTTP
+          labelEn: Port
+          labelZh: 端口
+          required: true
+          rule: paramPort
+          type: number
+        - default: ./data
+          edit: true
+          envKey: SAFELINE_DIR
+          labelEn: Data storage folder
+          labelZh: 数据存放文件夹
+          required: true
+          type: text
+        - default: 169.254.0
+          edit: true
+          envKey: SUBNET_PREFIX
+          labelEn: New docker network subnet prefix
+          labelZh: 新 docker 网络子网前缀
+          required: true
+          type: text

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

@@ -7,7 +7,7 @@ services:
       1panel-network:
       safeline-ce:
         ipv4_address: ${SUBNET_PREFIX}.4
-    image: chaitin/safeline-mgt-api:3.13.2
+    image: chaitin/safeline-mgt-api:3.14.0
     volumes:
     - ${SAFELINE_DIR}/resources/management:/resources/management
     - ${SAFELINE_DIR}/resources/nginx:/resources/nginx
@@ -21,7 +21,6 @@ services:
     - DATABASE_URL=postgres://safeline-ce:${POSTGRES_PASSWORD}@safeline-postgres/safeline-ce
     - MARIO_URL=http://safeline-mario:3335
     - FVM_MANAGER_URL=safeline-fvm-manager:9004
-    - REDIS_URL=redis://:${PANEL_REDIS_ROOT_PASSWORD}@${REDIS_HOST}:${REDIS_PORT}/0
     - MANAGEMENT_LOGS_DIR=/logs/management
     dns: 
       - 119.29.29.29
@@ -42,7 +41,7 @@ services:
       1panel-network:
       safeline-ce:
         ipv4_address: ${SUBNET_PREFIX}.5
-    image: chaitin/safeline-detector:3.13.2
+    image: chaitin/safeline-detector:3.14.0
     volumes:
     - ${SAFELINE_DIR}/resources/detector:/resources/detector
     - ${SAFELINE_DIR}/logs/detector:/logs/detector
@@ -61,7 +60,7 @@ services:
       1panel-network:
       safeline-ce:
         ipv4_address: ${SUBNET_PREFIX}.6
-    image: chaitin/safeline-mario:3.13.2
+    image: chaitin/safeline-mario:3.14.0
     volumes:
     - ${SAFELINE_DIR}/resources/mario:/resources/mario
     - ${SAFELINE_DIR}/logs/mario:/logs/mario
@@ -70,7 +69,6 @@ services:
     - LOG_DIR=/logs/mario
     - GOGC=100
     - DATABASE_URL=postgres://safeline-ce:${POSTGRES_PASSWORD}@safeline-postgres/safeline-ce
-    - REDIS_URL=redis://:${PANEL_REDIS_ROOT_PASSWORD}@${REDIS_HOST}:${REDIS_PORT}/0
     cap_drop:
     - net_raw
     labels:
@@ -79,7 +77,7 @@ services:
   safeline-tengine:
     container_name: ${CONTAINER_NAME}-tengine
     restart: always
-    image: chaitin/safeline-tengine:3.13.2
+    image: chaitin/safeline-tengine:3.14.0
     volumes:
     - ${SAFELINE_DIR}/resources/nginx:/etc/nginx
     - ${SAFELINE_DIR}/resources/management:/resources/management
@@ -89,8 +87,7 @@ services:
     - ${SAFELINE_DIR}/resources/cache:/usr/local/nginx/cache
     - /etc/resolv.conf:/etc/resolv.conf
     environment:
-    - REDIS_URL=redis://:${PANEL_REDIS_ROOT_PASSWORD}@${SUBNET_PREFIX}.3:${REDIS_PORT}/0
-    - MGT_ADDR=${SUBNET_PREFIX}.4:9002
+    - MGT_API=https://${SUBNET_PREFIX}.4:1443/api/publish/server
     ulimits:
       nofile: 131072
     network_mode: host
@@ -104,7 +101,7 @@ services:
       1panel-network:
       safeline-ce:
         ipv4_address: ${SUBNET_PREFIX}.8
-    image: chaitin/safeline-fvm-manager:3.13.2
+    image: chaitin/safeline-fvm-manager:3.14.0
     volumes:
       - /etc/localtime:/etc/localtime:ro
       - ${SAFELINE_DIR}/logs:/logs
@@ -136,25 +133,6 @@ services:
     labels:
       createdBy: Apps
 
-  safeline-redis:
-    container_name: ${CONTAINER_NAME}-redis
-    restart: always
-    networks:
-      1panel-network:
-      safeline-ce:
-        ipv4_address: ${SUBNET_PREFIX}.3
-    image: redis:7.2.3
-    volumes:
-      - ${SAFELINE_DIR}/resources/redis/data:/data
-      - /etc/localtime:/etc/localtime:ro
-    command: redis-server --appendonly yes --requirepass  ${PANEL_REDIS_ROOT_PASSWORD}
-    cap_drop:
-      - net_raw
-    sysctls:
-      net.core.somaxconn: "511"
-    labels:
-      createdBy: Apps
-
 networks:
   1panel-network:
     external: true

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

@@ -1,9 +1,5 @@
 CONTAINER_NAME="safeline"
 PANEL_APP_PORT_HTTP="40080"
-PANEL_APP_PORT_HTTP2="40081"
 POSTGRES_PASSWORD="password_xxJdZD"
-REDIS_HOST="safeline-redis"
-PANEL_REDIS_ROOT_PASSWORD="redis_password"
-REDIS_PORT="6379"
 SAFELINE_DIR="./data"
 SUBNET_PREFIX="169.254.0"

apps/safeline/newnet-latest/data.yml

@@ -1,29 +1,5 @@
 additionalProperties:
     formFields:
-        - default: "safeline-redis"
-          disabled: true
-          envKey: REDIS_HOST
-          key: redis
-          labelEn: Redis Service
-          labelZh: Redis服务
-          required: true
-          type: text
-        - default: "6379"
-          disabled: true
-          envKey: REDIS_PORT
-          labelEn: Redis Service Port
-          labelZh: Redis服务端口
-          required: true
-          rule: paramPort
-          type: number
-        - default: ""
-          edit: true
-          envKey: PANEL_REDIS_ROOT_PASSWORD
-          labelEn: Redis Service Password
-          labelZh: Redis服务密码
-          required: true
-          rule: paramCommon
-          type: password
         - default: ""
           edit: true
           envKey: POSTGRES_PASSWORD
@@ -40,14 +16,6 @@ additionalProperties:
           required: true
           rule: paramPort
           type: number
-        - default: 40081
-          edit: true
-          envKey: PANEL_APP_PORT_HTTP2
-          labelEn: Detector Port
-          labelZh: Detector端口
-          required: true
-          rule: paramPort
-          type: number
         - default: ./data
           edit: true
           envKey: SAFELINE_DIR

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

@@ -21,7 +21,6 @@ services:
     - DATABASE_URL=postgres://safeline-ce:${POSTGRES_PASSWORD}@safeline-postgres/safeline-ce
     - MARIO_URL=http://safeline-mario:3335
     - FVM_MANAGER_URL=safeline-fvm-manager:9004
-    - REDIS_URL=redis://:${PANEL_REDIS_ROOT_PASSWORD}@${REDIS_HOST}:${REDIS_PORT}/0
     - MANAGEMENT_LOGS_DIR=/logs/management
     dns: 
       - 119.29.29.29
@@ -70,7 +69,6 @@ services:
     - LOG_DIR=/logs/mario
     - GOGC=100
     - DATABASE_URL=postgres://safeline-ce:${POSTGRES_PASSWORD}@safeline-postgres/safeline-ce
-    - REDIS_URL=redis://:${PANEL_REDIS_ROOT_PASSWORD}@${REDIS_HOST}:${REDIS_PORT}/0
     cap_drop:
     - net_raw
     labels:
@@ -89,8 +87,7 @@ services:
     - ${SAFELINE_DIR}/resources/cache:/usr/local/nginx/cache
     - /etc/resolv.conf:/etc/resolv.conf
     environment:
-    - REDIS_URL=redis://:${PANEL_REDIS_ROOT_PASSWORD}@${SUBNET_PREFIX}.3:${REDIS_PORT}/0
-    - MGT_ADDR=${SUBNET_PREFIX}.4:9002
+    - MGT_API=https://${SUBNET_PREFIX}.4:1443/api/publish/server
     ulimits:
       nofile: 131072
     network_mode: host
@@ -136,25 +133,6 @@ services:
     labels:
       createdBy: Apps
 
-  safeline-redis:
-    container_name: ${CONTAINER_NAME}-redis
-    restart: always
-    networks:
-      1panel-network:
-      safeline-ce:
-        ipv4_address: ${SUBNET_PREFIX}.3
-    image: redis:7.2.3
-    volumes:
-      - ${SAFELINE_DIR}/resources/redis/data:/data
-      - /etc/localtime:/etc/localtime:ro
-    command: redis-server --appendonly yes --requirepass  ${PANEL_REDIS_ROOT_PASSWORD}
-    cap_drop:
-      - net_raw
-    sysctls:
-      net.core.somaxconn: "511"
-    labels:
-      createdBy: Apps
-
 networks:
   1panel-network:
     external: true