From a49a601243d6c350c157d590ad0aa1a01eef9efb Mon Sep 17 00:00:00 2001 From: okxlin Date: Thu, 29 Feb 2024 21:30:40 +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.4.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/safeline/{4.3.3 => 4.4.0}/.env.sample | 0 apps/safeline/{4.3.3 => 4.4.0}/data.yml | 0 .../{4.3.3 => 4.4.0}/docker-compose.yml | 21 ++++++++++++------- apps/safeline/latest/docker-compose.yml | 7 ++++++- .../.env.sample | 0 .../{newnet-4.3.3 => newnet-4.4.0}/data.yml | 0 .../docker-compose.yml | 21 ++++++++++++------- .../safeline/newnet-latest/docker-compose.yml | 7 ++++++- 8 files changed, 38 insertions(+), 18 deletions(-) rename apps/safeline/{4.3.3 => 4.4.0}/.env.sample (100%) rename apps/safeline/{4.3.3 => 4.4.0}/data.yml (100%) rename apps/safeline/{4.3.3 => 4.4.0}/docker-compose.yml (89%) rename apps/safeline/{newnet-4.3.3 => newnet-4.4.0}/.env.sample (100%) rename apps/safeline/{newnet-4.3.3 => newnet-4.4.0}/data.yml (100%) rename apps/safeline/{newnet-4.3.3 => newnet-4.4.0}/docker-compose.yml (90%) diff --git a/apps/safeline/4.3.3/.env.sample b/apps/safeline/4.4.0/.env.sample similarity index 100% rename from apps/safeline/4.3.3/.env.sample rename to apps/safeline/4.4.0/.env.sample diff --git a/apps/safeline/4.3.3/data.yml b/apps/safeline/4.4.0/data.yml similarity index 100% rename from apps/safeline/4.3.3/data.yml rename to apps/safeline/4.4.0/data.yml diff --git a/apps/safeline/4.3.3/docker-compose.yml b/apps/safeline/4.4.0/docker-compose.yml similarity index 89% rename from apps/safeline/4.3.3/docker-compose.yml rename to apps/safeline/4.4.0/docker-compose.yml index 5161cf74..2e1c315b 100644 --- a/apps/safeline/4.3.3/docker-compose.yml +++ b/apps/safeline/4.4.0/docker-compose.yml @@ -6,7 +6,7 @@ services: networks: 1panel-network: ipv4_address: ${SUBNET_PREFIX}.234 - image: chaitin/safeline-mgt:4.3.3 + image: chaitin/safeline-mgt:4.4.0 volumes: - /etc/localtime:/etc/localtime:ro - ${SAFELINE_DIR}/resources/mgt:/app/data @@ -37,7 +37,7 @@ services: networks: 1panel-network: ipv4_address: ${SUBNET_PREFIX}.235 - image: chaitin/safeline-detector:4.3.3 + image: chaitin/safeline-detector:4.4.0 volumes: - ${SAFELINE_DIR}/resources/detector:/resources/detector - ${SAFELINE_DIR}/logs/detector:/logs/detector @@ -53,7 +53,7 @@ services: networks: 1panel-network: ipv4_address: ${SUBNET_PREFIX}.236 - image: chaitin/safeline-mario:4.3.3 + image: chaitin/safeline-mario:4.4.0 volumes: - ${SAFELINE_DIR}/resources/mario:/resources/mario - ${SAFELINE_DIR}/logs/mario:/logs/mario @@ -68,10 +68,10 @@ services: safeline-tengine: container_name: ${CONTAINER_NAME}-tengine restart: always - image: chaitin/safeline-tengine:4.3.3 + image: chaitin/safeline-tengine:4.4.0 volumes: - /etc/localtime:/etc/localtime:ro - - /etc/resolv.conf:/etc/resolv.conf + - /etc/resolv.conf:/etc/resolv.conf:ro - ${SAFELINE_DIR}/resources/nginx:/etc/nginx - ${SAFELINE_DIR}/resources/detector:/resources/detector - ${SAFELINE_DIR}/logs/nginx:/var/log/nginx @@ -91,10 +91,15 @@ services: networks: 1panel-network: ipv4_address: ${SUBNET_PREFIX}.237 - image: chaitin/safeline-luigi:4.3.3 + image: chaitin/safeline-luigi:4.4.0 volumes: - /etc/localtime:/etc/localtime:ro - ${SAFELINE_DIR}/resources/luigi:/app/data + environment: + - MGT_IP=${SUBNET_PREFIX}.234 + depends_on: + - safeline-detector + - safeline-mgt labels: createdBy: Apps @@ -104,7 +109,7 @@ services: networks: 1panel-network: ipv4_address: ${SUBNET_PREFIX}.238 - image: chaitin/safeline-fvm:4.3.3 + image: chaitin/safeline-fvm:4.4.0 volumes: - /etc/localtime:/etc/localtime:ro labels: @@ -116,7 +121,7 @@ services: networks: 1panel-network: ipv4_address: ${SUBNET_PREFIX}.239 - image: chaitin/safeline-bridge:4.3.3 + image: chaitin/safeline-bridge:4.4.0 volumes: - /etc/localtime:/etc/localtime:ro - /var/run:/app/run diff --git a/apps/safeline/latest/docker-compose.yml b/apps/safeline/latest/docker-compose.yml index ed5988fd..6f2c8584 100644 --- a/apps/safeline/latest/docker-compose.yml +++ b/apps/safeline/latest/docker-compose.yml @@ -71,7 +71,7 @@ services: image: chaitin/safeline-tengine:latest volumes: - /etc/localtime:/etc/localtime:ro - - /etc/resolv.conf:/etc/resolv.conf + - /etc/resolv.conf:/etc/resolv.conf:ro - ${SAFELINE_DIR}/resources/nginx:/etc/nginx - ${SAFELINE_DIR}/resources/detector:/resources/detector - ${SAFELINE_DIR}/logs/nginx:/var/log/nginx @@ -95,6 +95,11 @@ services: volumes: - /etc/localtime:/etc/localtime:ro - ${SAFELINE_DIR}/resources/luigi:/app/data + environment: + - MGT_IP=${SUBNET_PREFIX}.234 + depends_on: + - safeline-detector + - safeline-mgt labels: createdBy: Apps diff --git a/apps/safeline/newnet-4.3.3/.env.sample b/apps/safeline/newnet-4.4.0/.env.sample similarity index 100% rename from apps/safeline/newnet-4.3.3/.env.sample rename to apps/safeline/newnet-4.4.0/.env.sample diff --git a/apps/safeline/newnet-4.3.3/data.yml b/apps/safeline/newnet-4.4.0/data.yml similarity index 100% rename from apps/safeline/newnet-4.3.3/data.yml rename to apps/safeline/newnet-4.4.0/data.yml diff --git a/apps/safeline/newnet-4.3.3/docker-compose.yml b/apps/safeline/newnet-4.4.0/docker-compose.yml similarity index 90% rename from apps/safeline/newnet-4.3.3/docker-compose.yml rename to apps/safeline/newnet-4.4.0/docker-compose.yml index adc3214b..972881a4 100644 --- a/apps/safeline/newnet-4.3.3/docker-compose.yml +++ b/apps/safeline/newnet-4.4.0/docker-compose.yml @@ -7,7 +7,7 @@ services: 1panel-network: safeline-ce: ipv4_address: ${SUBNET_PREFIX}.4 - image: chaitin/safeline-mgt:4.3.3 + image: chaitin/safeline-mgt:4.4.0 volumes: - /etc/localtime:/etc/localtime:ro - ${SAFELINE_DIR}/resources/mgt:/app/data @@ -39,7 +39,7 @@ services: 1panel-network: safeline-ce: ipv4_address: ${SUBNET_PREFIX}.5 - image: chaitin/safeline-detector:4.3.3 + image: chaitin/safeline-detector:4.4.0 volumes: - ${SAFELINE_DIR}/resources/detector:/resources/detector - ${SAFELINE_DIR}/logs/detector:/logs/detector @@ -56,7 +56,7 @@ services: 1panel-network: safeline-ce: ipv4_address: ${SUBNET_PREFIX}.6 - image: chaitin/safeline-mario:4.3.3 + image: chaitin/safeline-mario:4.4.0 volumes: - ${SAFELINE_DIR}/resources/mario:/resources/mario - ${SAFELINE_DIR}/logs/mario:/logs/mario @@ -71,10 +71,10 @@ services: safeline-tengine: container_name: ${CONTAINER_NAME}-tengine restart: always - image: chaitin/safeline-tengine:4.3.3 + image: chaitin/safeline-tengine:4.4.0 volumes: - /etc/localtime:/etc/localtime:ro - - /etc/resolv.conf:/etc/resolv.conf + - /etc/resolv.conf:/etc/resolv.conf:ro - ${SAFELINE_DIR}/resources/nginx:/etc/nginx - ${SAFELINE_DIR}/resources/detector:/resources/detector - ${SAFELINE_DIR}/logs/nginx:/var/log/nginx @@ -95,10 +95,15 @@ services: 1panel-network: safeline-ce: ipv4_address: ${SUBNET_PREFIX}.7 - image: chaitin/safeline-luigi:4.3.3 + image: chaitin/safeline-luigi:4.4.0 volumes: - /etc/localtime:/etc/localtime:ro - ${SAFELINE_DIR}/resources/luigi:/app/data + environment: + - MGT_IP=${SUBNET_PREFIX}.4 + depends_on: + - safeline-detector + - safeline-mgt labels: createdBy: Apps @@ -109,7 +114,7 @@ services: 1panel-network: safeline-ce: ipv4_address: ${SUBNET_PREFIX}.8 - image: chaitin/safeline-fvm:4.3.3 + image: chaitin/safeline-fvm:4.4.0 volumes: - /etc/localtime:/etc/localtime:ro labels: @@ -122,7 +127,7 @@ services: 1panel-network: safeline-ce: ipv4_address: ${SUBNET_PREFIX}.9 - image: chaitin/safeline-bridge:4.3.3 + image: chaitin/safeline-bridge:4.4.0 volumes: - /etc/localtime:/etc/localtime:ro - /var/run:/app/run diff --git a/apps/safeline/newnet-latest/docker-compose.yml b/apps/safeline/newnet-latest/docker-compose.yml index 682a3adb..7f59bb75 100644 --- a/apps/safeline/newnet-latest/docker-compose.yml +++ b/apps/safeline/newnet-latest/docker-compose.yml @@ -74,7 +74,7 @@ services: image: chaitin/safeline-tengine:latest volumes: - /etc/localtime:/etc/localtime:ro - - /etc/resolv.conf:/etc/resolv.conf + - /etc/resolv.conf:/etc/resolv.conf:ro - ${SAFELINE_DIR}/resources/nginx:/etc/nginx - ${SAFELINE_DIR}/resources/detector:/resources/detector - ${SAFELINE_DIR}/logs/nginx:/var/log/nginx @@ -99,6 +99,11 @@ services: volumes: - /etc/localtime:/etc/localtime:ro - ${SAFELINE_DIR}/resources/luigi:/app/data + environment: + - MGT_IP=${SUBNET_PREFIX}.4 + depends_on: + - safeline-detector + - safeline-mgt labels: createdBy: Apps