From 1ec1c1a40078cea0adbfe0123cd4219ee7faca01 Mon Sep 17 00:00:00 2001 From: okxlin Date: Fri, 22 Mar 2024 11:32: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.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/safeline/{5.0.0 => 5.1.0}/.env.sample | 0 apps/safeline/{5.0.0 => 5.1.0}/data.yml | 0 .../safeline/{5.0.0 => 5.1.0}/docker-compose.yml | 16 +++++++++------- apps/safeline/latest/docker-compose.yml | 2 ++ .../{newnet-5.0.0 => newnet-5.1.0}/.env.sample | 0 .../{newnet-5.0.0 => newnet-5.1.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/{5.0.0 => 5.1.0}/.env.sample (100%) rename apps/safeline/{5.0.0 => 5.1.0}/data.yml (100%) rename apps/safeline/{5.0.0 => 5.1.0}/docker-compose.yml (91%) rename apps/safeline/{newnet-5.0.0 => newnet-5.1.0}/.env.sample (100%) rename apps/safeline/{newnet-5.0.0 => newnet-5.1.0}/data.yml (100%) rename apps/safeline/{newnet-5.0.0 => newnet-5.1.0}/docker-compose.yml (92%) diff --git a/apps/safeline/5.0.0/.env.sample b/apps/safeline/5.1.0/.env.sample similarity index 100% rename from apps/safeline/5.0.0/.env.sample rename to apps/safeline/5.1.0/.env.sample diff --git a/apps/safeline/5.0.0/data.yml b/apps/safeline/5.1.0/data.yml similarity index 100% rename from apps/safeline/5.0.0/data.yml rename to apps/safeline/5.1.0/data.yml diff --git a/apps/safeline/5.0.0/docker-compose.yml b/apps/safeline/5.1.0/docker-compose.yml similarity index 91% rename from apps/safeline/5.0.0/docker-compose.yml rename to apps/safeline/5.1.0/docker-compose.yml index 220a083f..698e891e 100644 --- a/apps/safeline/5.0.0/docker-compose.yml +++ b/apps/safeline/5.1.0/docker-compose.yml @@ -6,7 +6,7 @@ services: networks: 1panel-network: ipv4_address: ${SUBNET_PREFIX}.234 - image: chaitin/safeline-mgt:5.0.0 + image: chaitin/safeline-mgt:5.1.0 volumes: - /etc/localtime:/etc/localtime:ro - ${SAFELINE_DIR}/resources/mgt:/app/data @@ -39,7 +39,7 @@ services: networks: 1panel-network: ipv4_address: ${SUBNET_PREFIX}.235 - image: chaitin/safeline-detector:5.0.0 + image: chaitin/safeline-detector:5.1.0 volumes: - ${SAFELINE_DIR}/resources/detector:/resources/detector - ${SAFELINE_DIR}/logs/detector:/logs/detector @@ -55,7 +55,7 @@ services: networks: 1panel-network: ipv4_address: ${SUBNET_PREFIX}.236 - image: chaitin/safeline-mario:5.0.0 + image: chaitin/safeline-mario:5.1.0 volumes: - ${SAFELINE_DIR}/resources/mario:/resources/mario - ${SAFELINE_DIR}/logs/mario:/logs/mario @@ -70,7 +70,7 @@ services: safeline-tengine: container_name: ${CONTAINER_NAME}-tengine restart: always - image: chaitin/safeline-tengine:5.0.0 + image: chaitin/safeline-tengine:5.1.0 volumes: - /etc/localtime:/etc/localtime:ro - /etc/resolv.conf:/etc/resolv.conf:ro @@ -93,7 +93,7 @@ services: networks: 1panel-network: ipv4_address: ${SUBNET_PREFIX}.237 - image: chaitin/safeline-luigi:5.0.0 + image: chaitin/safeline-luigi:5.1.0 volumes: - /etc/localtime:/etc/localtime:ro - ${SAFELINE_DIR}/resources/luigi:/app/data @@ -111,7 +111,7 @@ services: networks: 1panel-network: ipv4_address: ${SUBNET_PREFIX}.238 - image: chaitin/safeline-fvm:5.0.0 + image: chaitin/safeline-fvm:5.1.0 volumes: - /etc/localtime:/etc/localtime:ro labels: @@ -123,7 +123,7 @@ services: networks: 1panel-network: ipv4_address: ${SUBNET_PREFIX}.239 - image: chaitin/safeline-bridge:5.0.0 + image: chaitin/safeline-bridge:5.1.0 volumes: - /etc/localtime:/etc/localtime:ro - /var/run:/app/run @@ -157,6 +157,8 @@ services: - POSTGRES_USER=safeline-ce - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} command: [postgres, -c, max_connections=200] + healthcheck: + test: pg_isready -U safeline-ce -d safeline-ce labels: createdBy: Apps diff --git a/apps/safeline/latest/docker-compose.yml b/apps/safeline/latest/docker-compose.yml index ab02023d..c6b7247f 100644 --- a/apps/safeline/latest/docker-compose.yml +++ b/apps/safeline/latest/docker-compose.yml @@ -157,6 +157,8 @@ services: - POSTGRES_USER=safeline-ce - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} command: [postgres, -c, max_connections=200] + healthcheck: + test: pg_isready -U safeline-ce -d safeline-ce labels: createdBy: Apps diff --git a/apps/safeline/newnet-5.0.0/.env.sample b/apps/safeline/newnet-5.1.0/.env.sample similarity index 100% rename from apps/safeline/newnet-5.0.0/.env.sample rename to apps/safeline/newnet-5.1.0/.env.sample diff --git a/apps/safeline/newnet-5.0.0/data.yml b/apps/safeline/newnet-5.1.0/data.yml similarity index 100% rename from apps/safeline/newnet-5.0.0/data.yml rename to apps/safeline/newnet-5.1.0/data.yml diff --git a/apps/safeline/newnet-5.0.0/docker-compose.yml b/apps/safeline/newnet-5.1.0/docker-compose.yml similarity index 92% rename from apps/safeline/newnet-5.0.0/docker-compose.yml rename to apps/safeline/newnet-5.1.0/docker-compose.yml index 03f8ce03..5909b04e 100644 --- a/apps/safeline/newnet-5.0.0/docker-compose.yml +++ b/apps/safeline/newnet-5.1.0/docker-compose.yml @@ -7,7 +7,7 @@ services: 1panel-network: safeline-ce: ipv4_address: ${SUBNET_PREFIX}.4 - image: chaitin/safeline-mgt:5.0.0 + image: chaitin/safeline-mgt:5.1.0 volumes: - /etc/localtime:/etc/localtime:ro - ${SAFELINE_DIR}/resources/mgt:/app/data @@ -41,7 +41,7 @@ services: 1panel-network: safeline-ce: ipv4_address: ${SUBNET_PREFIX}.5 - image: chaitin/safeline-detector:5.0.0 + image: chaitin/safeline-detector:5.1.0 volumes: - ${SAFELINE_DIR}/resources/detector:/resources/detector - ${SAFELINE_DIR}/logs/detector:/logs/detector @@ -58,7 +58,7 @@ services: 1panel-network: safeline-ce: ipv4_address: ${SUBNET_PREFIX}.6 - image: chaitin/safeline-mario:5.0.0 + image: chaitin/safeline-mario:5.1.0 volumes: - ${SAFELINE_DIR}/resources/mario:/resources/mario - ${SAFELINE_DIR}/logs/mario:/logs/mario @@ -73,7 +73,7 @@ services: safeline-tengine: container_name: ${CONTAINER_NAME}-tengine restart: always - image: chaitin/safeline-tengine:5.0.0 + image: chaitin/safeline-tengine:5.1.0 volumes: - /etc/localtime:/etc/localtime:ro - /etc/resolv.conf:/etc/resolv.conf:ro @@ -97,7 +97,7 @@ services: 1panel-network: safeline-ce: ipv4_address: ${SUBNET_PREFIX}.7 - image: chaitin/safeline-luigi:5.0.0 + image: chaitin/safeline-luigi:5.1.0 volumes: - /etc/localtime:/etc/localtime:ro - ${SAFELINE_DIR}/resources/luigi:/app/data @@ -116,7 +116,7 @@ services: 1panel-network: safeline-ce: ipv4_address: ${SUBNET_PREFIX}.8 - image: chaitin/safeline-fvm:5.0.0 + image: chaitin/safeline-fvm:5.1.0 volumes: - /etc/localtime:/etc/localtime:ro labels: @@ -129,7 +129,7 @@ services: 1panel-network: safeline-ce: ipv4_address: ${SUBNET_PREFIX}.9 - image: chaitin/safeline-bridge:5.0.0 + image: chaitin/safeline-bridge:5.1.0 volumes: - /etc/localtime:/etc/localtime:ro - /var/run:/app/run @@ -164,6 +164,8 @@ services: - POSTGRES_USER=safeline-ce - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} command: [postgres, -c, max_connections=200] + healthcheck: + test: pg_isready -U safeline-ce -d safeline-ce labels: createdBy: Apps diff --git a/apps/safeline/newnet-latest/docker-compose.yml b/apps/safeline/newnet-latest/docker-compose.yml index 69a6ab3d..a4c90fbb 100644 --- a/apps/safeline/newnet-latest/docker-compose.yml +++ b/apps/safeline/newnet-latest/docker-compose.yml @@ -164,6 +164,8 @@ services: - POSTGRES_USER=safeline-ce - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} command: [postgres, -c, max_connections=200] + healthcheck: + test: pg_isready -U safeline-ce -d safeline-ce labels: createdBy: Apps