From 31e8ad148853ba244c3c09eba87ef5fbaf10d6e9 Mon Sep 17 00:00:00 2001 From: okxlin Date: Tue, 19 Mar 2024 10:27:48 +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.0.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/safeline/{4.4.2 => 5.0.0}/.env.sample | 0 apps/safeline/{4.4.2 => 5.0.0}/data.yml | 0 .../safeline/{4.4.2 => 5.0.0}/docker-compose.yml | 16 +++++++++------- apps/safeline/latest/docker-compose.yml | 2 ++ .../{newnet-4.4.2 => newnet-5.0.0}/.env.sample | 0 .../{newnet-4.4.2 => newnet-5.0.0}/data.yml | 0 .../docker-compose.yml | 16 +++++++++------- apps/safeline/newnet-latest/docker-compose.yml | 2 ++ 8 files changed, 22 insertions(+), 14 deletions(-) rename apps/safeline/{4.4.2 => 5.0.0}/.env.sample (100%) rename apps/safeline/{4.4.2 => 5.0.0}/data.yml (100%) rename apps/safeline/{4.4.2 => 5.0.0}/docker-compose.yml (91%) rename apps/safeline/{newnet-4.4.2 => newnet-5.0.0}/.env.sample (100%) rename apps/safeline/{newnet-4.4.2 => newnet-5.0.0}/data.yml (100%) rename apps/safeline/{newnet-4.4.2 => newnet-5.0.0}/docker-compose.yml (92%) diff --git a/apps/safeline/4.4.2/.env.sample b/apps/safeline/5.0.0/.env.sample similarity index 100% rename from apps/safeline/4.4.2/.env.sample rename to apps/safeline/5.0.0/.env.sample diff --git a/apps/safeline/4.4.2/data.yml b/apps/safeline/5.0.0/data.yml similarity index 100% rename from apps/safeline/4.4.2/data.yml rename to apps/safeline/5.0.0/data.yml diff --git a/apps/safeline/4.4.2/docker-compose.yml b/apps/safeline/5.0.0/docker-compose.yml similarity index 91% rename from apps/safeline/4.4.2/docker-compose.yml rename to apps/safeline/5.0.0/docker-compose.yml index 6c870a66..220a083f 100644 --- a/apps/safeline/4.4.2/docker-compose.yml +++ b/apps/safeline/5.0.0/docker-compose.yml @@ -6,12 +6,14 @@ services: networks: 1panel-network: ipv4_address: ${SUBNET_PREFIX}.234 - image: chaitin/safeline-mgt:4.4.2 + image: chaitin/safeline-mgt:5.0.0 volumes: - /etc/localtime:/etc/localtime:ro - ${SAFELINE_DIR}/resources/mgt:/app/data ports: - ${PANEL_APP_PORT_HTTP:-9443}:1443 + healthcheck: + 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: @@ -37,7 +39,7 @@ services: networks: 1panel-network: ipv4_address: ${SUBNET_PREFIX}.235 - image: chaitin/safeline-detector:4.4.2 + image: chaitin/safeline-detector:5.0.0 volumes: - ${SAFELINE_DIR}/resources/detector:/resources/detector - ${SAFELINE_DIR}/logs/detector:/logs/detector @@ -53,7 +55,7 @@ services: networks: 1panel-network: ipv4_address: ${SUBNET_PREFIX}.236 - image: chaitin/safeline-mario:4.4.2 + image: chaitin/safeline-mario:5.0.0 volumes: - ${SAFELINE_DIR}/resources/mario:/resources/mario - ${SAFELINE_DIR}/logs/mario:/logs/mario @@ -68,7 +70,7 @@ services: safeline-tengine: container_name: ${CONTAINER_NAME}-tengine restart: always - image: chaitin/safeline-tengine:4.4.2 + image: chaitin/safeline-tengine:5.0.0 volumes: - /etc/localtime:/etc/localtime:ro - /etc/resolv.conf:/etc/resolv.conf:ro @@ -91,7 +93,7 @@ services: networks: 1panel-network: ipv4_address: ${SUBNET_PREFIX}.237 - image: chaitin/safeline-luigi:4.4.2 + image: chaitin/safeline-luigi:5.0.0 volumes: - /etc/localtime:/etc/localtime:ro - ${SAFELINE_DIR}/resources/luigi:/app/data @@ -109,7 +111,7 @@ services: networks: 1panel-network: ipv4_address: ${SUBNET_PREFIX}.238 - image: chaitin/safeline-fvm:4.4.2 + image: chaitin/safeline-fvm:5.0.0 volumes: - /etc/localtime:/etc/localtime:ro labels: @@ -121,7 +123,7 @@ services: networks: 1panel-network: ipv4_address: ${SUBNET_PREFIX}.239 - image: chaitin/safeline-bridge:4.4.2 + image: chaitin/safeline-bridge:5.0.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 6f2c8584..ab02023d 100644 --- a/apps/safeline/latest/docker-compose.yml +++ b/apps/safeline/latest/docker-compose.yml @@ -12,6 +12,8 @@ services: - ${SAFELINE_DIR}/resources/mgt:/app/data ports: - ${PANEL_APP_PORT_HTTP:-9443}:1443 + healthcheck: + 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: diff --git a/apps/safeline/newnet-4.4.2/.env.sample b/apps/safeline/newnet-5.0.0/.env.sample similarity index 100% rename from apps/safeline/newnet-4.4.2/.env.sample rename to apps/safeline/newnet-5.0.0/.env.sample diff --git a/apps/safeline/newnet-4.4.2/data.yml b/apps/safeline/newnet-5.0.0/data.yml similarity index 100% rename from apps/safeline/newnet-4.4.2/data.yml rename to apps/safeline/newnet-5.0.0/data.yml diff --git a/apps/safeline/newnet-4.4.2/docker-compose.yml b/apps/safeline/newnet-5.0.0/docker-compose.yml similarity index 92% rename from apps/safeline/newnet-4.4.2/docker-compose.yml rename to apps/safeline/newnet-5.0.0/docker-compose.yml index 542bd5cf..03f8ce03 100644 --- a/apps/safeline/newnet-4.4.2/docker-compose.yml +++ b/apps/safeline/newnet-5.0.0/docker-compose.yml @@ -7,12 +7,14 @@ services: 1panel-network: safeline-ce: ipv4_address: ${SUBNET_PREFIX}.4 - image: chaitin/safeline-mgt:4.4.2 + image: chaitin/safeline-mgt:5.0.0 volumes: - /etc/localtime:/etc/localtime:ro - ${SAFELINE_DIR}/resources/mgt:/app/data ports: - ${PANEL_APP_PORT_HTTP:-9443}:1443 + healthcheck: + 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: @@ -39,7 +41,7 @@ services: 1panel-network: safeline-ce: ipv4_address: ${SUBNET_PREFIX}.5 - image: chaitin/safeline-detector:4.4.2 + image: chaitin/safeline-detector:5.0.0 volumes: - ${SAFELINE_DIR}/resources/detector:/resources/detector - ${SAFELINE_DIR}/logs/detector:/logs/detector @@ -56,7 +58,7 @@ services: 1panel-network: safeline-ce: ipv4_address: ${SUBNET_PREFIX}.6 - image: chaitin/safeline-mario:4.4.2 + image: chaitin/safeline-mario:5.0.0 volumes: - ${SAFELINE_DIR}/resources/mario:/resources/mario - ${SAFELINE_DIR}/logs/mario:/logs/mario @@ -71,7 +73,7 @@ services: safeline-tengine: container_name: ${CONTAINER_NAME}-tengine restart: always - image: chaitin/safeline-tengine:4.4.2 + image: chaitin/safeline-tengine:5.0.0 volumes: - /etc/localtime:/etc/localtime:ro - /etc/resolv.conf:/etc/resolv.conf:ro @@ -95,7 +97,7 @@ services: 1panel-network: safeline-ce: ipv4_address: ${SUBNET_PREFIX}.7 - image: chaitin/safeline-luigi:4.4.2 + image: chaitin/safeline-luigi:5.0.0 volumes: - /etc/localtime:/etc/localtime:ro - ${SAFELINE_DIR}/resources/luigi:/app/data @@ -114,7 +116,7 @@ services: 1panel-network: safeline-ce: ipv4_address: ${SUBNET_PREFIX}.8 - image: chaitin/safeline-fvm:4.4.2 + image: chaitin/safeline-fvm:5.0.0 volumes: - /etc/localtime:/etc/localtime:ro labels: @@ -127,7 +129,7 @@ services: 1panel-network: safeline-ce: ipv4_address: ${SUBNET_PREFIX}.9 - image: chaitin/safeline-bridge:4.4.2 + image: chaitin/safeline-bridge:5.0.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 7f59bb75..69a6ab3d 100644 --- a/apps/safeline/newnet-latest/docker-compose.yml +++ b/apps/safeline/newnet-latest/docker-compose.yml @@ -13,6 +13,8 @@ services: - ${SAFELINE_DIR}/resources/mgt:/app/data ports: - ${PANEL_APP_PORT_HTTP:-9443}:1443 + healthcheck: + 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: