From 2defdf80fffed88deb6c308378f4a639ed8501b3 Mon Sep 17 00:00:00 2001 From: okxlin Date: Thu, 23 May 2024 22:18:30 +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=A05.6.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/safeline/{5.6.1 => 5.6.2}/.env.sample | 0 apps/safeline/{5.6.1 => 5.6.2}/data.yml | 0 .../{5.6.1 => 5.6.2}/docker-compose.yml | 31 +++++++------------ apps/safeline/latest/docker-compose.yml | 17 +++------- .../.env.sample | 0 .../{newnet-5.6.1 => newnet-5.6.2}/data.yml | 0 .../docker-compose.yml | 31 +++++++------------ .../safeline/newnet-latest/docker-compose.yml | 17 +++------- 8 files changed, 34 insertions(+), 62 deletions(-) rename apps/safeline/{5.6.1 => 5.6.2}/.env.sample (100%) rename apps/safeline/{5.6.1 => 5.6.2}/data.yml (100%) rename apps/safeline/{5.6.1 => 5.6.2}/docker-compose.yml (88%) rename apps/safeline/{newnet-5.6.1 => newnet-5.6.2}/.env.sample (100%) rename apps/safeline/{newnet-5.6.1 => newnet-5.6.2}/data.yml (100%) rename apps/safeline/{newnet-5.6.1 => newnet-5.6.2}/docker-compose.yml (89%) diff --git a/apps/safeline/5.6.1/.env.sample b/apps/safeline/5.6.2/.env.sample similarity index 100% rename from apps/safeline/5.6.1/.env.sample rename to apps/safeline/5.6.2/.env.sample diff --git a/apps/safeline/5.6.1/data.yml b/apps/safeline/5.6.2/data.yml similarity index 100% rename from apps/safeline/5.6.1/data.yml rename to apps/safeline/5.6.2/data.yml diff --git a/apps/safeline/5.6.1/docker-compose.yml b/apps/safeline/5.6.2/docker-compose.yml similarity index 88% rename from apps/safeline/5.6.1/docker-compose.yml rename to apps/safeline/5.6.2/docker-compose.yml index 3b23cfdb..962755d4 100644 --- a/apps/safeline/5.6.1/docker-compose.yml +++ b/apps/safeline/5.6.2/docker-compose.yml @@ -6,7 +6,7 @@ services: networks: 1panel-network: ipv4_address: ${SUBNET_PREFIX}.234 - image: chaitin/safeline-mgt:5.6.1 + image: chaitin/safeline-mgt:5.6.2 volumes: - /etc/localtime:/etc/localtime:ro - ${SAFELINE_DIR}/resources/mgt:/app/data @@ -16,17 +16,10 @@ services: test: curl -k -f https://localhost:1443/api/open/health environment: - MGT_PG=postgres://safeline-ce:${POSTGRES_PASSWORD}@safeline-pg/safeline-ce?sslmode=disable - dns: - - 119.29.29.29 - - 223.5.5.5 - - 180.76.76.76 - - 1.2.4.8 - - 114.114.114.114 - - 8.8.8.8 logging: options: max-size: "100m" - max-file: "10" + max-file: "5" depends_on: - safeline-pg - safeline-fvm @@ -39,7 +32,7 @@ services: networks: 1panel-network: ipv4_address: ${SUBNET_PREFIX}.235 - image: chaitin/safeline-detector:5.6.1 + image: chaitin/safeline-detector:5.6.2 volumes: - ${SAFELINE_DIR}/resources/detector:/resources/detector - ${SAFELINE_DIR}/logs/detector:/logs/detector @@ -55,7 +48,7 @@ services: networks: 1panel-network: ipv4_address: ${SUBNET_PREFIX}.236 - image: chaitin/safeline-mario:5.6.1 + image: chaitin/safeline-mario:5.6.2 volumes: - ${SAFELINE_DIR}/resources/mario:/resources/mario - ${SAFELINE_DIR}/logs/mario:/logs/mario @@ -67,14 +60,14 @@ services: logging: options: max-size: "100m" - max-file: "10" + max-file: "5" labels: createdBy: Apps safeline-tengine: container_name: ${CONTAINER_NAME}-tengine restart: always - image: chaitin/safeline-tengine:5.6.1 + image: chaitin/safeline-tengine:5.6.2 volumes: - /etc/localtime:/etc/localtime:ro - /etc/resolv.conf:/etc/resolv.conf:ro @@ -97,7 +90,7 @@ services: networks: 1panel-network: ipv4_address: ${SUBNET_PREFIX}.237 - image: chaitin/safeline-luigi:5.6.1 + image: chaitin/safeline-luigi:5.6.2 volumes: - /etc/localtime:/etc/localtime:ro - ${SAFELINE_DIR}/resources/luigi:/app/data @@ -106,7 +99,7 @@ services: logging: options: max-size: "100m" - max-file: "10" + max-file: "5" depends_on: - safeline-detector - safeline-mgt @@ -119,13 +112,13 @@ services: networks: 1panel-network: ipv4_address: ${SUBNET_PREFIX}.238 - image: chaitin/safeline-fvm:5.6.1 + image: chaitin/safeline-fvm:5.6.2 volumes: - /etc/localtime:/etc/localtime:ro logging: options: max-size: "100m" - max-file: "10" + max-file: "5" labels: createdBy: Apps @@ -135,7 +128,7 @@ services: networks: 1panel-network: ipv4_address: ${SUBNET_PREFIX}.239 - image: chaitin/safeline-bridge:5.6.1 + image: chaitin/safeline-bridge:5.6.2 volumes: - /etc/localtime:/etc/localtime:ro - /var/run:/app/run @@ -149,7 +142,7 @@ services: logging: options: max-size: "100m" - max-file: "10" + max-file: "5" depends_on: - safeline-mgt labels: diff --git a/apps/safeline/latest/docker-compose.yml b/apps/safeline/latest/docker-compose.yml index 3994113f..65747e49 100644 --- a/apps/safeline/latest/docker-compose.yml +++ b/apps/safeline/latest/docker-compose.yml @@ -16,17 +16,10 @@ services: test: curl -k -f https://localhost:1443/api/open/health environment: - MGT_PG=postgres://safeline-ce:${POSTGRES_PASSWORD}@safeline-pg/safeline-ce?sslmode=disable - dns: - - 119.29.29.29 - - 223.5.5.5 - - 180.76.76.76 - - 1.2.4.8 - - 114.114.114.114 - - 8.8.8.8 logging: options: max-size: "100m" - max-file: "10" + max-file: "5" depends_on: - safeline-pg - safeline-fvm @@ -67,7 +60,7 @@ services: logging: options: max-size: "100m" - max-file: "10" + max-file: "5" labels: createdBy: Apps @@ -106,7 +99,7 @@ services: logging: options: max-size: "100m" - max-file: "10" + max-file: "5" depends_on: - safeline-detector - safeline-mgt @@ -125,7 +118,7 @@ services: logging: options: max-size: "100m" - max-file: "10" + max-file: "5" labels: createdBy: Apps @@ -149,7 +142,7 @@ services: logging: options: max-size: "100m" - max-file: "10" + max-file: "5" depends_on: - safeline-mgt labels: diff --git a/apps/safeline/newnet-5.6.1/.env.sample b/apps/safeline/newnet-5.6.2/.env.sample similarity index 100% rename from apps/safeline/newnet-5.6.1/.env.sample rename to apps/safeline/newnet-5.6.2/.env.sample diff --git a/apps/safeline/newnet-5.6.1/data.yml b/apps/safeline/newnet-5.6.2/data.yml similarity index 100% rename from apps/safeline/newnet-5.6.1/data.yml rename to apps/safeline/newnet-5.6.2/data.yml diff --git a/apps/safeline/newnet-5.6.1/docker-compose.yml b/apps/safeline/newnet-5.6.2/docker-compose.yml similarity index 89% rename from apps/safeline/newnet-5.6.1/docker-compose.yml rename to apps/safeline/newnet-5.6.2/docker-compose.yml index 11a54a55..d72b2c99 100644 --- a/apps/safeline/newnet-5.6.1/docker-compose.yml +++ b/apps/safeline/newnet-5.6.2/docker-compose.yml @@ -7,7 +7,7 @@ services: 1panel-network: safeline-ce: ipv4_address: ${SUBNET_PREFIX}.4 - image: chaitin/safeline-mgt:5.6.1 + image: chaitin/safeline-mgt:5.6.2 volumes: - /etc/localtime:/etc/localtime:ro - ${SAFELINE_DIR}/resources/mgt:/app/data @@ -17,17 +17,10 @@ services: test: curl -k -f https://localhost:1443/api/open/health environment: - MGT_PG=postgres://safeline-ce:${POSTGRES_PASSWORD}@safeline-pg/safeline-ce?sslmode=disable - dns: - - 119.29.29.29 - - 223.5.5.5 - - 180.76.76.76 - - 1.2.4.8 - - 114.114.114.114 - - 8.8.8.8 logging: options: max-size: "100m" - max-file: "10" + max-file: "5" depends_on: - safeline-pg - safeline-fvm @@ -41,7 +34,7 @@ services: 1panel-network: safeline-ce: ipv4_address: ${SUBNET_PREFIX}.5 - image: chaitin/safeline-detector:5.6.1 + image: chaitin/safeline-detector:5.6.2 volumes: - ${SAFELINE_DIR}/resources/detector:/resources/detector - ${SAFELINE_DIR}/logs/detector:/logs/detector @@ -58,7 +51,7 @@ services: 1panel-network: safeline-ce: ipv4_address: ${SUBNET_PREFIX}.6 - image: chaitin/safeline-mario:5.6.1 + image: chaitin/safeline-mario:5.6.2 volumes: - ${SAFELINE_DIR}/resources/mario:/resources/mario - ${SAFELINE_DIR}/logs/mario:/logs/mario @@ -70,14 +63,14 @@ services: logging: options: max-size: "100m" - max-file: "10" + max-file: "5" labels: createdBy: Apps safeline-tengine: container_name: ${CONTAINER_NAME}-tengine restart: always - image: chaitin/safeline-tengine:5.6.1 + image: chaitin/safeline-tengine:5.6.2 volumes: - /etc/localtime:/etc/localtime:ro - /etc/resolv.conf:/etc/resolv.conf:ro @@ -101,7 +94,7 @@ services: 1panel-network: safeline-ce: ipv4_address: ${SUBNET_PREFIX}.7 - image: chaitin/safeline-luigi:5.6.1 + image: chaitin/safeline-luigi:5.6.2 volumes: - /etc/localtime:/etc/localtime:ro - ${SAFELINE_DIR}/resources/luigi:/app/data @@ -110,7 +103,7 @@ services: logging: options: max-size: "100m" - max-file: "10" + max-file: "5" depends_on: - safeline-detector - safeline-mgt @@ -124,13 +117,13 @@ services: 1panel-network: safeline-ce: ipv4_address: ${SUBNET_PREFIX}.8 - image: chaitin/safeline-fvm:5.6.1 + image: chaitin/safeline-fvm:5.6.2 volumes: - /etc/localtime:/etc/localtime:ro logging: options: max-size: "100m" - max-file: "10" + max-file: "5" labels: createdBy: Apps @@ -141,7 +134,7 @@ services: 1panel-network: safeline-ce: ipv4_address: ${SUBNET_PREFIX}.9 - image: chaitin/safeline-bridge:5.6.1 + image: chaitin/safeline-bridge:5.6.2 volumes: - /etc/localtime:/etc/localtime:ro - /var/run:/app/run @@ -155,7 +148,7 @@ services: logging: options: max-size: "100m" - max-file: "10" + max-file: "5" depends_on: - safeline-mgt labels: diff --git a/apps/safeline/newnet-latest/docker-compose.yml b/apps/safeline/newnet-latest/docker-compose.yml index 9627de9c..b6e93ad9 100644 --- a/apps/safeline/newnet-latest/docker-compose.yml +++ b/apps/safeline/newnet-latest/docker-compose.yml @@ -17,17 +17,10 @@ services: test: curl -k -f https://localhost:1443/api/open/health environment: - MGT_PG=postgres://safeline-ce:${POSTGRES_PASSWORD}@safeline-pg/safeline-ce?sslmode=disable - dns: - - 119.29.29.29 - - 223.5.5.5 - - 180.76.76.76 - - 1.2.4.8 - - 114.114.114.114 - - 8.8.8.8 logging: options: max-size: "100m" - max-file: "10" + max-file: "5" depends_on: - safeline-pg - safeline-fvm @@ -70,7 +63,7 @@ services: logging: options: max-size: "100m" - max-file: "10" + max-file: "5" labels: createdBy: Apps @@ -110,7 +103,7 @@ services: logging: options: max-size: "100m" - max-file: "10" + max-file: "5" depends_on: - safeline-detector - safeline-mgt @@ -130,7 +123,7 @@ services: logging: options: max-size: "100m" - max-file: "10" + max-file: "5" labels: createdBy: Apps @@ -155,7 +148,7 @@ services: logging: options: max-size: "100m" - max-file: "10" + max-file: "5" depends_on: - safeline-mgt labels: