From 4a1e40ff677def55deff26561afc45c74f50d5ce Mon Sep 17 00:00:00 2001 From: okxlin Date: Sat, 28 Sep 2024 17:54:17 +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=A06.10.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/safeline/{6.9.1 => 6.10.4}/.env.sample | 0 apps/safeline/{6.9.1 => 6.10.4}/data.yml | 0 .../{6.9.1 => 6.10.4}/docker-compose.yml | 36 ++++-------------- apps/safeline/latest/docker-compose.yml | 22 ----------- .../.env.sample | 0 .../{newnet-6.9.1 => newnet-6.10.4}/data.yml | 0 .../docker-compose.yml | 37 ++++--------------- .../safeline/newnet-latest/docker-compose.yml | 23 ------------ 8 files changed, 14 insertions(+), 104 deletions(-) rename apps/safeline/{6.9.1 => 6.10.4}/.env.sample (100%) rename apps/safeline/{6.9.1 => 6.10.4}/data.yml (100%) rename apps/safeline/{6.9.1 => 6.10.4}/docker-compose.yml (82%) rename apps/safeline/{newnet-6.9.1 => newnet-6.10.4}/.env.sample (100%) rename apps/safeline/{newnet-6.9.1 => newnet-6.10.4}/data.yml (100%) rename apps/safeline/{newnet-6.9.1 => newnet-6.10.4}/docker-compose.yml (83%) diff --git a/apps/safeline/6.9.1/.env.sample b/apps/safeline/6.10.4/.env.sample similarity index 100% rename from apps/safeline/6.9.1/.env.sample rename to apps/safeline/6.10.4/.env.sample diff --git a/apps/safeline/6.9.1/data.yml b/apps/safeline/6.10.4/data.yml similarity index 100% rename from apps/safeline/6.9.1/data.yml rename to apps/safeline/6.10.4/data.yml diff --git a/apps/safeline/6.9.1/docker-compose.yml b/apps/safeline/6.10.4/docker-compose.yml similarity index 82% rename from apps/safeline/6.9.1/docker-compose.yml rename to apps/safeline/6.10.4/docker-compose.yml index 60d07007..91c9a314 100644 --- a/apps/safeline/6.9.1/docker-compose.yml +++ b/apps/safeline/6.10.4/docker-compose.yml @@ -5,7 +5,7 @@ services: networks: 1panel-network: ipv4_address: ${SUBNET_PREFIX}.234 - image: chaitin/safeline-mgt:6.9.1 + image: chaitin/safeline-mgt:6.10.4 volumes: - /etc/localtime:/etc/localtime:ro - ${SAFELINE_DIR}/resources/mgt:/app/data @@ -33,7 +33,7 @@ services: networks: 1panel-network: ipv4_address: ${SUBNET_PREFIX}.235 - image: chaitin/safeline-detector:6.9.1 + image: chaitin/safeline-detector:6.10.4 volumes: - ${SAFELINE_DIR}/resources/detector:/resources/detector - ${SAFELINE_DIR}/logs/detector:/logs/detector @@ -43,32 +43,10 @@ services: labels: createdBy: Apps - safeline-mario: - container_name: ${CONTAINER_NAME}-mario - restart: always - networks: - 1panel-network: - ipv4_address: ${SUBNET_PREFIX}.236 - image: chaitin/safeline-mario:6.9.1 - volumes: - - ${SAFELINE_DIR}/resources/mario:/resources/mario - - ${SAFELINE_DIR}/logs/mario:/logs/mario - - /etc/localtime:/etc/localtime:ro - environment: - - LOG_DIR=/logs/mario - - GOGC=100 - - DATABASE_URL=postgres://safeline-ce:${POSTGRES_PASSWORD}@safeline-pg/safeline-ce - logging: - options: - max-size: "100m" - max-file: "5" - labels: - createdBy: Apps - safeline-tengine: container_name: ${CONTAINER_NAME}-tengine restart: always - image: chaitin/safeline-tengine:6.9.1 + image: chaitin/safeline-tengine:6.10.4 volumes: - /etc/localtime:/etc/localtime:ro - /etc/resolv.conf:/etc/resolv.conf:ro @@ -93,7 +71,7 @@ services: networks: 1panel-network: ipv4_address: ${SUBNET_PREFIX}.237 - image: chaitin/safeline-luigi:6.9.1 + image: chaitin/safeline-luigi:6.10.4 volumes: - /etc/localtime:/etc/localtime:ro - ${SAFELINE_DIR}/resources/luigi:/app/data @@ -115,7 +93,7 @@ services: networks: 1panel-network: ipv4_address: ${SUBNET_PREFIX}.238 - image: chaitin/safeline-fvm:6.9.1 + image: chaitin/safeline-fvm:6.10.4 volumes: - /etc/localtime:/etc/localtime:ro logging: @@ -131,7 +109,7 @@ services: networks: 1panel-network: ipv4_address: ${SUBNET_PREFIX}.239 - image: chaitin/safeline-bridge:6.9.1 + image: chaitin/safeline-bridge:6.10.4 volumes: - /etc/localtime:/etc/localtime:ro - /var/run:/app/run @@ -176,7 +154,7 @@ services: networks: 1panel-network: ipv4_address: ${SUBNET_PREFIX}.240 - image: chaitin/safeline-chaos:6.9.1 + image: chaitin/safeline-chaos:6.10.4 logging: options: max-size: "100m" diff --git a/apps/safeline/latest/docker-compose.yml b/apps/safeline/latest/docker-compose.yml index 8bf7ca11..05c1cf47 100644 --- a/apps/safeline/latest/docker-compose.yml +++ b/apps/safeline/latest/docker-compose.yml @@ -43,28 +43,6 @@ services: labels: createdBy: Apps - safeline-mario: - container_name: ${CONTAINER_NAME}-mario - restart: always - networks: - 1panel-network: - ipv4_address: ${SUBNET_PREFIX}.236 - image: chaitin/safeline-mario:latest - volumes: - - ${SAFELINE_DIR}/resources/mario:/resources/mario - - ${SAFELINE_DIR}/logs/mario:/logs/mario - - /etc/localtime:/etc/localtime:ro - environment: - - LOG_DIR=/logs/mario - - GOGC=100 - - DATABASE_URL=postgres://safeline-ce:${POSTGRES_PASSWORD}@safeline-pg/safeline-ce - logging: - options: - max-size: "100m" - max-file: "5" - labels: - createdBy: Apps - safeline-tengine: container_name: ${CONTAINER_NAME}-tengine restart: always diff --git a/apps/safeline/newnet-6.9.1/.env.sample b/apps/safeline/newnet-6.10.4/.env.sample similarity index 100% rename from apps/safeline/newnet-6.9.1/.env.sample rename to apps/safeline/newnet-6.10.4/.env.sample diff --git a/apps/safeline/newnet-6.9.1/data.yml b/apps/safeline/newnet-6.10.4/data.yml similarity index 100% rename from apps/safeline/newnet-6.9.1/data.yml rename to apps/safeline/newnet-6.10.4/data.yml diff --git a/apps/safeline/newnet-6.9.1/docker-compose.yml b/apps/safeline/newnet-6.10.4/docker-compose.yml similarity index 83% rename from apps/safeline/newnet-6.9.1/docker-compose.yml rename to apps/safeline/newnet-6.10.4/docker-compose.yml index bd7b60cc..c6cca7d2 100644 --- a/apps/safeline/newnet-6.9.1/docker-compose.yml +++ b/apps/safeline/newnet-6.10.4/docker-compose.yml @@ -6,7 +6,7 @@ services: 1panel-network: safeline-ce: ipv4_address: ${SUBNET_PREFIX}.4 - image: chaitin/safeline-mgt:6.9.1 + image: chaitin/safeline-mgt:6.10.4 volumes: - /etc/localtime:/etc/localtime:ro - ${SAFELINE_DIR}/resources/mgt:/app/data @@ -35,7 +35,7 @@ services: 1panel-network: safeline-ce: ipv4_address: ${SUBNET_PREFIX}.5 - image: chaitin/safeline-detector:6.9.1 + image: chaitin/safeline-detector:6.10.4 volumes: - ${SAFELINE_DIR}/resources/detector:/resources/detector - ${SAFELINE_DIR}/logs/detector:/logs/detector @@ -45,33 +45,10 @@ services: labels: createdBy: Apps - safeline-mario: - container_name: ${CONTAINER_NAME}-mario - restart: always - networks: - 1panel-network: - safeline-ce: - ipv4_address: ${SUBNET_PREFIX}.6 - image: chaitin/safeline-mario:6.9.1 - volumes: - - ${SAFELINE_DIR}/resources/mario:/resources/mario - - ${SAFELINE_DIR}/logs/mario:/logs/mario - - /etc/localtime:/etc/localtime:ro - environment: - - LOG_DIR=/logs/mario - - GOGC=100 - - DATABASE_URL=postgres://safeline-ce:${POSTGRES_PASSWORD}@safeline-pg/safeline-ce - logging: - options: - max-size: "100m" - max-file: "5" - labels: - createdBy: Apps - safeline-tengine: container_name: ${CONTAINER_NAME}-tengine restart: always - image: chaitin/safeline-tengine:6.9.1 + image: chaitin/safeline-tengine:6.10.4 volumes: - /etc/localtime:/etc/localtime:ro - /etc/resolv.conf:/etc/resolv.conf:ro @@ -97,7 +74,7 @@ services: 1panel-network: safeline-ce: ipv4_address: ${SUBNET_PREFIX}.7 - image: chaitin/safeline-luigi:6.9.1 + image: chaitin/safeline-luigi:6.10.4 volumes: - /etc/localtime:/etc/localtime:ro - ${SAFELINE_DIR}/resources/luigi:/app/data @@ -121,7 +98,7 @@ services: 1panel-network: safeline-ce: ipv4_address: ${SUBNET_PREFIX}.8 - image: chaitin/safeline-fvm:6.9.1 + image: chaitin/safeline-fvm:6.10.4 volumes: - /etc/localtime:/etc/localtime:ro logging: @@ -138,7 +115,7 @@ services: 1panel-network: safeline-ce: ipv4_address: ${SUBNET_PREFIX}.9 - image: chaitin/safeline-bridge:6.9.1 + image: chaitin/safeline-bridge:6.10.4 volumes: - /etc/localtime:/etc/localtime:ro - /var/run:/app/run @@ -185,7 +162,7 @@ services: 1panel-network: safeline-ce: ipv4_address: ${SUBNET_PREFIX}.10 - image: chaitin/safeline-chaos:6.9.1 + image: chaitin/safeline-chaos:6.10.4 logging: options: max-size: "100m" diff --git a/apps/safeline/newnet-latest/docker-compose.yml b/apps/safeline/newnet-latest/docker-compose.yml index 1b57afac..a7983dee 100644 --- a/apps/safeline/newnet-latest/docker-compose.yml +++ b/apps/safeline/newnet-latest/docker-compose.yml @@ -45,29 +45,6 @@ services: labels: createdBy: Apps - safeline-mario: - container_name: ${CONTAINER_NAME}-mario - restart: always - networks: - 1panel-network: - safeline-ce: - ipv4_address: ${SUBNET_PREFIX}.6 - image: chaitin/safeline-mario:latest - volumes: - - ${SAFELINE_DIR}/resources/mario:/resources/mario - - ${SAFELINE_DIR}/logs/mario:/logs/mario - - /etc/localtime:/etc/localtime:ro - environment: - - LOG_DIR=/logs/mario - - GOGC=100 - - DATABASE_URL=postgres://safeline-ce:${POSTGRES_PASSWORD}@safeline-pg/safeline-ce - logging: - options: - max-size: "100m" - max-file: "5" - labels: - createdBy: Apps - safeline-tengine: container_name: ${CONTAINER_NAME}-tengine restart: always