From a8861b9e69b8f9abf349530df399726b3d0f2258 Mon Sep 17 00:00:00 2001 From: arch3rPro Date: Wed, 7 Jan 2026 17:11:02 +0800 Subject: [PATCH] feat: update safeline 9.3.1 --- apps/safeline/{9.3.0 => 9.3.1}/.env.sample | 0 apps/safeline/{9.3.0 => 9.3.1}/data.yml | 0 .../{9.3.0 => 9.3.1}/docker-compose.yml | 34 +++---------------- 3 files changed, 5 insertions(+), 29 deletions(-) rename apps/safeline/{9.3.0 => 9.3.1}/.env.sample (100%) rename apps/safeline/{9.3.0 => 9.3.1}/data.yml (100%) rename apps/safeline/{9.3.0 => 9.3.1}/docker-compose.yml (74%) diff --git a/apps/safeline/9.3.0/.env.sample b/apps/safeline/9.3.1/.env.sample similarity index 100% rename from apps/safeline/9.3.0/.env.sample rename to apps/safeline/9.3.1/.env.sample diff --git a/apps/safeline/9.3.0/data.yml b/apps/safeline/9.3.1/data.yml similarity index 100% rename from apps/safeline/9.3.0/data.yml rename to apps/safeline/9.3.1/data.yml diff --git a/apps/safeline/9.3.0/docker-compose.yml b/apps/safeline/9.3.1/docker-compose.yml similarity index 74% rename from apps/safeline/9.3.0/docker-compose.yml rename to apps/safeline/9.3.1/docker-compose.yml index ccb6f1c..1a754e3 100644 --- a/apps/safeline/9.3.0/docker-compose.yml +++ b/apps/safeline/9.3.1/docker-compose.yml @@ -5,11 +5,7 @@ services: networks: 1panel-network: ipv4_address: ${SUBNET_PREFIX}.234 -<<<<<<<< HEAD:apps/safeline/9.3.1/docker-compose.yml image: chaitin/safeline-mgt:9.3.1 -======== - image: chaitin/safeline-mgt:9.3.0 ->>>>>>>> 8e6cc572050a5c9325ed5d40b27a804e3b5f4032:apps/safeline/9.3.0/docker-compose.yml volumes: - /etc/localtime:/etc/localtime:ro - ${SAFELINE_DIR}/resources/mgt:/app/data @@ -37,11 +33,7 @@ services: networks: 1panel-network: ipv4_address: ${SUBNET_PREFIX}.235 -<<<<<<<< HEAD:apps/safeline/9.3.1/docker-compose.yml - image: chaitin/safeline-detector:9.2.9 -======== - image: chaitin/safeline-detector:9.3.0 ->>>>>>>> 8e6cc572050a5c9325ed5d40b27a804e3b5f4032:apps/safeline/9.3.0/docker-compose.yml + image: chaitin/safeline-detector:9.3.1 volumes: - ${SAFELINE_DIR}/resources/detector:/resources/detector - ${SAFELINE_DIR}/logs/detector:/logs/detector @@ -53,11 +45,7 @@ services: safeline-tengine: container_name: ${CONTAINER_NAME}-tengine restart: always -<<<<<<<< HEAD:apps/safeline/9.3.1/docker-compose.yml - image: chaitin/safeline-tengine:9.2.9 -======== - image: chaitin/safeline-tengine:9.3.0 ->>>>>>>> 8e6cc572050a5c9325ed5d40b27a804e3b5f4032:apps/safeline/9.3.0/docker-compose.yml + image: chaitin/safeline-tengine:9.3.1 volumes: - /etc/localtime:/etc/localtime:ro - /etc/resolv.conf:/etc/resolv.conf:ro @@ -81,11 +69,7 @@ services: networks: 1panel-network: ipv4_address: ${SUBNET_PREFIX}.237 -<<<<<<<< HEAD:apps/safeline/9.3.1/docker-compose.yml - image: chaitin/safeline-luigi:9.2.9 -======== - image: chaitin/safeline-luigi:9.3.0 ->>>>>>>> 8e6cc572050a5c9325ed5d40b27a804e3b5f4032:apps/safeline/9.3.0/docker-compose.yml + image: chaitin/safeline-luigi:9.3.1 volumes: - /etc/localtime:/etc/localtime:ro - ${SAFELINE_DIR}/resources/luigi:/app/data @@ -106,11 +90,7 @@ services: networks: 1panel-network: ipv4_address: ${SUBNET_PREFIX}.238 -<<<<<<<< HEAD:apps/safeline/9.3.1/docker-compose.yml - image: chaitin/safeline-fvm:9.2.9 -======== - image: chaitin/safeline-fvm:9.3.0 ->>>>>>>> 8e6cc572050a5c9325ed5d40b27a804e3b5f4032:apps/safeline/9.3.0/docker-compose.yml + image: chaitin/safeline-fvm:9.3.1 volumes: - /etc/localtime:/etc/localtime:ro logging: @@ -146,11 +126,7 @@ services: networks: 1panel-network: ipv4_address: ${SUBNET_PREFIX}.240 -<<<<<<<< HEAD:apps/safeline/9.3.1/docker-compose.yml - image: chaitin/safeline-chaos:9.2.9 -======== - image: chaitin/safeline-chaos:9.3.0 ->>>>>>>> 8e6cc572050a5c9325ed5d40b27a804e3b5f4032:apps/safeline/9.3.0/docker-compose.yml + image: chaitin/safeline-chaos:9.3.1 logging: options: max-size: 100m