From 08619da86a5a3eff3a811b923a403bbbfc33c407 Mon Sep 17 00:00:00 2001 From: okxlin Date: Sun, 4 Feb 2024 21:16:19 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E6=9B=B4=E6=96=B0=E9=95=BF=E4=BA=AD?= =?UTF-8?q?=E9=9B=B7=E6=B1=A04.3.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/safeline/{4.2.1 => 4.3.0}/.env.sample | 0 apps/safeline/{4.2.1 => 4.3.0}/data.yml | 0 .../{4.2.1 => 4.3.0}/docker-compose.yml | 43 +++++++++++++++--- apps/safeline/latest/docker-compose.yml | 31 ++++++++++++- .../.env.sample | 0 .../{newnet-4.2.1 => newnet-4.3.0}/data.yml | 0 .../docker-compose.yml | 44 ++++++++++++++++--- .../safeline/newnet-latest/docker-compose.yml | 32 +++++++++++++- 8 files changed, 134 insertions(+), 16 deletions(-) rename apps/safeline/{4.2.1 => 4.3.0}/.env.sample (100%) rename apps/safeline/{4.2.1 => 4.3.0}/data.yml (100%) rename apps/safeline/{4.2.1 => 4.3.0}/docker-compose.yml (78%) rename apps/safeline/{newnet-4.2.1 => newnet-4.3.0}/.env.sample (100%) rename apps/safeline/{newnet-4.2.1 => newnet-4.3.0}/data.yml (100%) rename apps/safeline/{newnet-4.2.1 => newnet-4.3.0}/docker-compose.yml (79%) diff --git a/apps/safeline/4.2.1/.env.sample b/apps/safeline/4.3.0/.env.sample similarity index 100% rename from apps/safeline/4.2.1/.env.sample rename to apps/safeline/4.3.0/.env.sample diff --git a/apps/safeline/4.2.1/data.yml b/apps/safeline/4.3.0/data.yml similarity index 100% rename from apps/safeline/4.2.1/data.yml rename to apps/safeline/4.3.0/data.yml diff --git a/apps/safeline/4.2.1/docker-compose.yml b/apps/safeline/4.3.0/docker-compose.yml similarity index 78% rename from apps/safeline/4.2.1/docker-compose.yml rename to apps/safeline/4.3.0/docker-compose.yml index 33df0c0a2..ea4d290b8 100644 --- a/apps/safeline/4.2.1/docker-compose.yml +++ b/apps/safeline/4.3.0/docker-compose.yml @@ -6,7 +6,7 @@ services: networks: 1panel-network: ipv4_address: ${SUBNET_PREFIX}.234 - image: chaitin/safeline-mgt:4.2.1 + image: chaitin/safeline-mgt:4.3.0 volumes: - /etc/localtime:/etc/localtime:ro - ${SAFELINE_DIR}/resources/mgt:/app/data @@ -14,7 +14,6 @@ services: - ${PANEL_APP_PORT_HTTP:-9443}:1443 environment: - MGT_PG=postgres://safeline-ce:${POSTGRES_PASSWORD}@safeline-pg/safeline-ce?sslmode=disable - - MGT_LICENSE_SERVER=https://safeline-ce-4463.rivers.chaitin.cn/ dns: - 119.29.29.29 - 223.5.5.5 @@ -22,6 +21,10 @@ services: - 1.2.4.8 - 114.114.114.114 - 8.8.8.8 + logging: + options: + max-size: "100m" + max-file: "10" depends_on: - safeline-pg - safeline-fvm @@ -34,7 +37,7 @@ services: networks: 1panel-network: ipv4_address: ${SUBNET_PREFIX}.235 - image: chaitin/safeline-detector:4.2.1 + image: chaitin/safeline-detector:4.3.0 volumes: - ${SAFELINE_DIR}/resources/detector:/resources/detector - ${SAFELINE_DIR}/logs/detector:/logs/detector @@ -50,7 +53,7 @@ services: networks: 1panel-network: ipv4_address: ${SUBNET_PREFIX}.236 - image: chaitin/safeline-mario:4.2.1 + image: chaitin/safeline-mario:4.3.0 volumes: - ${SAFELINE_DIR}/resources/mario:/resources/mario - ${SAFELINE_DIR}/logs/mario:/logs/mario @@ -65,7 +68,7 @@ services: safeline-tengine: container_name: ${CONTAINER_NAME}-tengine restart: always - image: chaitin/safeline-tengine:4.2.1 + image: chaitin/safeline-tengine:4.3.0 volumes: - /etc/localtime:/etc/localtime:ro - /etc/resolv.conf:/etc/resolv.conf @@ -88,7 +91,7 @@ services: networks: 1panel-network: ipv4_address: ${SUBNET_PREFIX}.237 - image: chaitin/safeline-luigi:4.2.1 + image: chaitin/safeline-luigi:4.3.0 volumes: - /etc/localtime:/etc/localtime:ro - ${SAFELINE_DIR}/resources/luigi:/app/data @@ -101,12 +104,38 @@ services: networks: 1panel-network: ipv4_address: ${SUBNET_PREFIX}.238 - image: chaitin/safeline-fvm:4.2.1 + image: chaitin/safeline-fvm:4.3.0 volumes: - /etc/localtime:/etc/localtime:ro labels: createdBy: Apps + safeline-bridge: + container_name: ${CONTAINER_NAME}-bridge + restart: always + networks: + 1panel-network: + ipv4_address: ${SUBNET_PREFIX}.239 + image: chaitin/safeline-bridge:4.3.0 + volumes: + - /etc/localtime:/etc/localtime:ro + - /var/run:/app/run + command: + - /app/bridge + - serve + - -n + - unix + - -a + - /app/run/safeline.sock + logging: + options: + max-size: "100m" + max-file: "10" + depends_on: + - safeline-mgt + labels: + createdBy: Apps + safeline-pg: container_name: ${CONTAINER_NAME}-pg restart: always diff --git a/apps/safeline/latest/docker-compose.yml b/apps/safeline/latest/docker-compose.yml index c95191e49..b2fd4f049 100644 --- a/apps/safeline/latest/docker-compose.yml +++ b/apps/safeline/latest/docker-compose.yml @@ -14,7 +14,6 @@ services: - ${PANEL_APP_PORT_HTTP:-9443}:1443 environment: - MGT_PG=postgres://safeline-ce:${POSTGRES_PASSWORD}@safeline-pg/safeline-ce?sslmode=disable - - MGT_LICENSE_SERVER=https://safeline-ce-4463.rivers.chaitin.cn/ dns: - 119.29.29.29 - 223.5.5.5 @@ -22,6 +21,10 @@ services: - 1.2.4.8 - 114.114.114.114 - 8.8.8.8 + logging: + options: + max-size: "100m" + max-file: "10" depends_on: - safeline-pg - safeline-fvm @@ -107,6 +110,32 @@ services: labels: createdBy: Apps + safeline-bridge: + container_name: ${CONTAINER_NAME}-bridge + restart: always + networks: + 1panel-network: + ipv4_address: ${SUBNET_PREFIX}.239 + image: chaitin/safeline-bridge:latest + volumes: + - /etc/localtime:/etc/localtime:ro + - /var/run:/app/run + command: + - /app/bridge + - serve + - -n + - unix + - -a + - /app/run/safeline.sock + logging: + options: + max-size: "100m" + max-file: "10" + depends_on: + - safeline-mgt + labels: + createdBy: Apps + safeline-pg: container_name: ${CONTAINER_NAME}-pg restart: always diff --git a/apps/safeline/newnet-4.2.1/.env.sample b/apps/safeline/newnet-4.3.0/.env.sample similarity index 100% rename from apps/safeline/newnet-4.2.1/.env.sample rename to apps/safeline/newnet-4.3.0/.env.sample diff --git a/apps/safeline/newnet-4.2.1/data.yml b/apps/safeline/newnet-4.3.0/data.yml similarity index 100% rename from apps/safeline/newnet-4.2.1/data.yml rename to apps/safeline/newnet-4.3.0/data.yml diff --git a/apps/safeline/newnet-4.2.1/docker-compose.yml b/apps/safeline/newnet-4.3.0/docker-compose.yml similarity index 79% rename from apps/safeline/newnet-4.2.1/docker-compose.yml rename to apps/safeline/newnet-4.3.0/docker-compose.yml index 73a3b24c2..03e0e0fce 100644 --- a/apps/safeline/newnet-4.2.1/docker-compose.yml +++ b/apps/safeline/newnet-4.3.0/docker-compose.yml @@ -7,7 +7,7 @@ services: 1panel-network: safeline-ce: ipv4_address: ${SUBNET_PREFIX}.4 - image: chaitin/safeline-mgt:4.2.1 + image: chaitin/safeline-mgt:4.3.0 volumes: - /etc/localtime:/etc/localtime:ro - ${SAFELINE_DIR}/resources/mgt:/app/data @@ -15,7 +15,6 @@ services: - ${PANEL_APP_PORT_HTTP:-9443}:1443 environment: - MGT_PG=postgres://safeline-ce:${POSTGRES_PASSWORD}@safeline-pg/safeline-ce?sslmode=disable - - MGT_LICENSE_SERVER=https://safeline-ce-4463.rivers.chaitin.cn/ dns: - 119.29.29.29 - 223.5.5.5 @@ -23,6 +22,10 @@ services: - 1.2.4.8 - 114.114.114.114 - 8.8.8.8 + logging: + options: + max-size: "100m" + max-file: "10" depends_on: - safeline-pg - safeline-fvm @@ -36,7 +39,7 @@ services: 1panel-network: safeline-ce: ipv4_address: ${SUBNET_PREFIX}.5 - image: chaitin/safeline-detector:4.2.1 + image: chaitin/safeline-detector:4.3.0 volumes: - ${SAFELINE_DIR}/resources/detector:/resources/detector - ${SAFELINE_DIR}/logs/detector:/logs/detector @@ -53,7 +56,7 @@ services: 1panel-network: safeline-ce: ipv4_address: ${SUBNET_PREFIX}.6 - image: chaitin/safeline-mario:4.2.1 + image: chaitin/safeline-mario:4.3.0 volumes: - ${SAFELINE_DIR}/resources/mario:/resources/mario - ${SAFELINE_DIR}/logs/mario:/logs/mario @@ -68,7 +71,7 @@ services: safeline-tengine: container_name: ${CONTAINER_NAME}-tengine restart: always - image: chaitin/safeline-tengine:4.2.1 + image: chaitin/safeline-tengine:4.3.0 volumes: - /etc/localtime:/etc/localtime:ro - /etc/resolv.conf:/etc/resolv.conf @@ -92,7 +95,7 @@ services: 1panel-network: safeline-ce: ipv4_address: ${SUBNET_PREFIX}.7 - image: chaitin/safeline-luigi:4.2.1 + image: chaitin/safeline-luigi:4.3.0 volumes: - /etc/localtime:/etc/localtime:ro - ${SAFELINE_DIR}/resources/luigi:/app/data @@ -106,12 +109,39 @@ services: 1panel-network: safeline-ce: ipv4_address: ${SUBNET_PREFIX}.8 - image: chaitin/safeline-fvm:4.2.1 + image: chaitin/safeline-fvm:4.3.0 volumes: - /etc/localtime:/etc/localtime:ro labels: createdBy: Apps + safeline-bridge: + container_name: ${CONTAINER_NAME}-bridge + restart: always + networks: + 1panel-network: + safeline-ce: + ipv4_address: ${SUBNET_PREFIX}.9 + image: chaitin/safeline-bridge:4.3.0 + volumes: + - /etc/localtime:/etc/localtime:ro + - /var/run:/app/run + command: + - /app/bridge + - serve + - -n + - unix + - -a + - /app/run/safeline.sock + logging: + options: + max-size: "100m" + max-file: "10" + depends_on: + - safeline-mgt + labels: + createdBy: Apps + safeline-pg: container_name: ${CONTAINER_NAME}-pg restart: always diff --git a/apps/safeline/newnet-latest/docker-compose.yml b/apps/safeline/newnet-latest/docker-compose.yml index 54fc31e21..fe836f318 100644 --- a/apps/safeline/newnet-latest/docker-compose.yml +++ b/apps/safeline/newnet-latest/docker-compose.yml @@ -15,7 +15,6 @@ services: - ${PANEL_APP_PORT_HTTP:-9443}:1443 environment: - MGT_PG=postgres://safeline-ce:${POSTGRES_PASSWORD}@safeline-pg/safeline-ce?sslmode=disable - - MGT_LICENSE_SERVER=https://safeline-ce-4463.rivers.chaitin.cn/ dns: - 119.29.29.29 - 223.5.5.5 @@ -23,6 +22,10 @@ services: - 1.2.4.8 - 114.114.114.114 - 8.8.8.8 + logging: + options: + max-size: "100m" + max-file: "10" depends_on: - safeline-pg - safeline-fvm @@ -112,6 +115,33 @@ services: labels: createdBy: Apps + safeline-bridge: + container_name: ${CONTAINER_NAME}-bridge + restart: always + networks: + 1panel-network: + safeline-ce: + ipv4_address: ${SUBNET_PREFIX}.9 + image: chaitin/safeline-bridge:latest + volumes: + - /etc/localtime:/etc/localtime:ro + - /var/run:/app/run + command: + - /app/bridge + - serve + - -n + - unix + - -a + - /app/run/safeline.sock + logging: + options: + max-size: "100m" + max-file: "10" + depends_on: + - safeline-mgt + labels: + createdBy: Apps + safeline-pg: container_name: ${CONTAINER_NAME}-pg restart: always