From a9b2f722219edb29d565c0e48efea693666cea1f Mon Sep 17 00:00:00 2001 From: okxlin Date: Thu, 23 Nov 2023 20:49:05 +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=A03.13.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/safeline/{3.12.2 => 3.13.1}/.env.sample | 0 apps/safeline/{3.12.2 => 3.13.1}/data.yml | 0 .../{3.12.2 => 3.13.1}/docker-compose.yml | 28 ++++++++++++++---- apps/safeline/latest/docker-compose.yml | 22 ++++++++++++-- .../.env.sample | 0 .../{newnet-3.12.2 => newnet-3.13.1}/data.yml | 0 .../docker-compose.yml | 29 +++++++++++++++---- .../safeline/newnet-latest/docker-compose.yml | 23 +++++++++++++-- 8 files changed, 88 insertions(+), 14 deletions(-) rename apps/safeline/{3.12.2 => 3.13.1}/.env.sample (100%) rename apps/safeline/{3.12.2 => 3.13.1}/data.yml (100%) rename apps/safeline/{3.12.2 => 3.13.1}/docker-compose.yml (84%) rename apps/safeline/{newnet-3.12.2 => newnet-3.13.1}/.env.sample (100%) rename apps/safeline/{newnet-3.12.2 => newnet-3.13.1}/data.yml (100%) rename apps/safeline/{newnet-3.12.2 => newnet-3.13.1}/docker-compose.yml (85%) diff --git a/apps/safeline/3.12.2/.env.sample b/apps/safeline/3.13.1/.env.sample similarity index 100% rename from apps/safeline/3.12.2/.env.sample rename to apps/safeline/3.13.1/.env.sample diff --git a/apps/safeline/3.12.2/data.yml b/apps/safeline/3.13.1/data.yml similarity index 100% rename from apps/safeline/3.12.2/data.yml rename to apps/safeline/3.13.1/data.yml diff --git a/apps/safeline/3.12.2/docker-compose.yml b/apps/safeline/3.13.1/docker-compose.yml similarity index 84% rename from apps/safeline/3.12.2/docker-compose.yml rename to apps/safeline/3.13.1/docker-compose.yml index b5552f4a..bf82dbf1 100644 --- a/apps/safeline/3.12.2/docker-compose.yml +++ b/apps/safeline/3.13.1/docker-compose.yml @@ -6,7 +6,7 @@ services: networks: 1panel-network: ipv4_address: ${SUBNET_PREFIX}.234 - image: chaitin/safeline-mgt-api:3.12.2 + image: chaitin/safeline-mgt-api:3.13.1 volumes: - ${SAFELINE_DIR}/resources/management:/resources/management - ${SAFELINE_DIR}/resources/nginx:/resources/nginx @@ -19,7 +19,7 @@ services: - NGINX_RESOURCES_DIR=/resources/nginx - DATABASE_URL=postgres://safeline-ce:${POSTGRES_PASSWORD}@safeline-postgres/safeline-ce - MARIO_URL=http://safeline-mario:3335 - - DETECTOR_URL=http://safeline-detector:8001 + - 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: @@ -40,7 +40,7 @@ services: networks: 1panel-network: ipv4_address: ${SUBNET_PREFIX}.235 - image: chaitin/safeline-detector:3.12.2 + image: chaitin/safeline-detector:3.13.1 volumes: - ${SAFELINE_DIR}/resources/detector:/resources/detector - ${SAFELINE_DIR}/logs/detector:/logs/detector @@ -60,7 +60,7 @@ services: networks: 1panel-network: ipv4_address: ${SUBNET_PREFIX}.236 - image: chaitin/safeline-mario:3.12.2 + image: chaitin/safeline-mario:3.13.1 volumes: - ${SAFELINE_DIR}/resources/mario:/resources/mario - ${SAFELINE_DIR}/logs/mario:/logs/mario @@ -78,7 +78,7 @@ services: safeline-tengine: container_name: ${CONTAINER_NAME}-tengine restart: always - image: chaitin/safeline-tengine:3.12.2 + image: chaitin/safeline-tengine:3.13.1 volumes: - ${SAFELINE_DIR}/resources/nginx:/etc/nginx - ${SAFELINE_DIR}/resources/management:/resources/management @@ -96,6 +96,24 @@ services: labels: createdBy: Apps + fvm-manager: + container_name: ${CONTAINER_NAME}-fvm-manager + restart: always + networks: + 1panel-network: + ipv4_address: ${SUBNET_PREFIX}.238 + image: chaitin/safeline-fvm-manager:3.13.1 + volumes: + - /etc/localtime:/etc/localtime:ro + - ${SAFELINE_DIR}/logs:/logs + environment: + - FVM_LOGS_DIR=/logs/management + - DETECTOR_URL=http://safeline-detector:8001 + cap_drop: + - net_raw + labels: + createdBy: Apps + safeline-postgres: container_name: ${CONTAINER_NAME}-postgres restart: always diff --git a/apps/safeline/latest/docker-compose.yml b/apps/safeline/latest/docker-compose.yml index 97ce27d6..700f9008 100644 --- a/apps/safeline/latest/docker-compose.yml +++ b/apps/safeline/latest/docker-compose.yml @@ -19,7 +19,7 @@ services: - NGINX_RESOURCES_DIR=/resources/nginx - DATABASE_URL=postgres://safeline-ce:${POSTGRES_PASSWORD}@safeline-postgres/safeline-ce - MARIO_URL=http://safeline-mario:3335 - - DETECTOR_URL=http://safeline-detector:8001 + - 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: @@ -96,6 +96,24 @@ services: labels: createdBy: Apps + fvm-manager: + container_name: ${CONTAINER_NAME}-fvm-manager + restart: always + networks: + 1panel-network: + ipv4_address: ${SUBNET_PREFIX}.238 + image: chaitin/safeline-fvm-manager:latest + volumes: + - /etc/localtime:/etc/localtime:ro + - ${SAFELINE_DIR}/logs:/logs + environment: + - FVM_LOGS_DIR=/logs/management + - DETECTOR_URL=http://safeline-detector:8001 + cap_drop: + - net_raw + labels: + createdBy: Apps + safeline-postgres: container_name: ${CONTAINER_NAME}-postgres restart: always @@ -121,7 +139,7 @@ services: networks: 1panel-network: ipv4_address: ${SUBNET_PREFIX}.233 - image: redis:7.2.2 + image: redis:7.2.3 volumes: - ${SAFELINE_DIR}/resources/redis/data:/data - /etc/localtime:/etc/localtime:ro diff --git a/apps/safeline/newnet-3.12.2/.env.sample b/apps/safeline/newnet-3.13.1/.env.sample similarity index 100% rename from apps/safeline/newnet-3.12.2/.env.sample rename to apps/safeline/newnet-3.13.1/.env.sample diff --git a/apps/safeline/newnet-3.12.2/data.yml b/apps/safeline/newnet-3.13.1/data.yml similarity index 100% rename from apps/safeline/newnet-3.12.2/data.yml rename to apps/safeline/newnet-3.13.1/data.yml diff --git a/apps/safeline/newnet-3.12.2/docker-compose.yml b/apps/safeline/newnet-3.13.1/docker-compose.yml similarity index 85% rename from apps/safeline/newnet-3.12.2/docker-compose.yml rename to apps/safeline/newnet-3.13.1/docker-compose.yml index 2c5dbdd8..d7b30f02 100644 --- a/apps/safeline/newnet-3.12.2/docker-compose.yml +++ b/apps/safeline/newnet-3.13.1/docker-compose.yml @@ -7,7 +7,7 @@ services: 1panel-network: safeline-ce: ipv4_address: ${SUBNET_PREFIX}.4 - image: chaitin/safeline-mgt-api:3.12.2 + image: chaitin/safeline-mgt-api:3.13.1 volumes: - ${SAFELINE_DIR}/resources/management:/resources/management - ${SAFELINE_DIR}/resources/nginx:/resources/nginx @@ -20,7 +20,7 @@ services: - NGINX_RESOURCES_DIR=/resources/nginx - DATABASE_URL=postgres://safeline-ce:${POSTGRES_PASSWORD}@safeline-postgres/safeline-ce - MARIO_URL=http://safeline-mario:3335 - - DETECTOR_URL=http://safeline-detector:8001 + - 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: @@ -42,7 +42,7 @@ services: 1panel-network: safeline-ce: ipv4_address: ${SUBNET_PREFIX}.5 - image: chaitin/safeline-detector:3.12.2 + image: chaitin/safeline-detector:3.13.1 volumes: - ${SAFELINE_DIR}/resources/detector:/resources/detector - ${SAFELINE_DIR}/logs/detector:/logs/detector @@ -61,7 +61,7 @@ services: 1panel-network: safeline-ce: ipv4_address: ${SUBNET_PREFIX}.6 - image: chaitin/safeline-mario:3.12.2 + image: chaitin/safeline-mario:3.13.1 volumes: - ${SAFELINE_DIR}/resources/mario:/resources/mario - ${SAFELINE_DIR}/logs/mario:/logs/mario @@ -79,7 +79,7 @@ services: safeline-tengine: container_name: ${CONTAINER_NAME}-tengine restart: always - image: chaitin/safeline-tengine:3.12.2 + image: chaitin/safeline-tengine:3.13.1 volumes: - ${SAFELINE_DIR}/resources/nginx:/etc/nginx - ${SAFELINE_DIR}/resources/management:/resources/management @@ -97,6 +97,25 @@ services: labels: createdBy: Apps + fvm-manager: + container_name: ${CONTAINER_NAME}-fvm-manager + restart: always + networks: + 1panel-network: + safeline-ce: + ipv4_address: ${SUBNET_PREFIX}.8 + image: chaitin/safeline-fvm-manager:3.13.1 + volumes: + - /etc/localtime:/etc/localtime:ro + - ${SAFELINE_DIR}/logs:/logs + environment: + - FVM_LOGS_DIR=/logs/management + - DETECTOR_URL=http://safeline-detector:8001 + cap_drop: + - net_raw + labels: + createdBy: Apps + safeline-postgres: container_name: ${CONTAINER_NAME}-postgres restart: always diff --git a/apps/safeline/newnet-latest/docker-compose.yml b/apps/safeline/newnet-latest/docker-compose.yml index da4c29a6..d9dc280f 100644 --- a/apps/safeline/newnet-latest/docker-compose.yml +++ b/apps/safeline/newnet-latest/docker-compose.yml @@ -20,7 +20,7 @@ services: - NGINX_RESOURCES_DIR=/resources/nginx - DATABASE_URL=postgres://safeline-ce:${POSTGRES_PASSWORD}@safeline-postgres/safeline-ce - MARIO_URL=http://safeline-mario:3335 - - DETECTOR_URL=http://safeline-detector:8001 + - 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: @@ -97,6 +97,25 @@ services: labels: createdBy: Apps + fvm-manager: + container_name: ${CONTAINER_NAME}-fvm-manager + restart: always + networks: + 1panel-network: + safeline-ce: + ipv4_address: ${SUBNET_PREFIX}.8 + image: chaitin/safeline-fvm-manager:latest + volumes: + - /etc/localtime:/etc/localtime:ro + - ${SAFELINE_DIR}/logs:/logs + environment: + - FVM_LOGS_DIR=/logs/management + - DETECTOR_URL=http://safeline-detector:8001 + cap_drop: + - net_raw + labels: + createdBy: Apps + safeline-postgres: container_name: ${CONTAINER_NAME}-postgres restart: always @@ -124,7 +143,7 @@ services: 1panel-network: safeline-ce: ipv4_address: ${SUBNET_PREFIX}.3 - image: redis:7.2.2 + image: redis:7.2.3 volumes: - ${SAFELINE_DIR}/resources/redis/data:/data - /etc/localtime:/etc/localtime:ro