From ad124a1bb22778ba9ff9f800d34ad78a2e22fcf2 Mon Sep 17 00:00:00 2001 From: okxlin Date: Thu, 6 Jun 2024 21:51:59 +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.0.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/safeline/{6.0.2 => 6.0.3}/.env.sample | 1 - apps/safeline/{6.0.2 => 6.0.3}/data.yml | 8 ------- .../{6.0.2 => 6.0.3}/docker-compose.yml | 21 ++++++++++--------- apps/safeline/latest/.env.sample | 1 - apps/safeline/latest/data.yml | 8 ------- apps/safeline/latest/docker-compose.yml | 5 +++-- .../.env.sample | 1 - .../{newnet-6.0.2 => newnet-6.0.3}/data.yml | 8 ------- .../docker-compose.yml | 21 ++++++++++--------- apps/safeline/newnet-latest/.env.sample | 1 - apps/safeline/newnet-latest/data.yml | 8 ------- .../safeline/newnet-latest/docker-compose.yml | 5 +++-- 12 files changed, 28 insertions(+), 60 deletions(-) rename apps/safeline/{6.0.2 => 6.0.3}/.env.sample (82%) rename apps/safeline/{6.0.2 => 6.0.3}/data.yml (79%) rename apps/safeline/{6.0.2 => 6.0.3}/docker-compose.yml (91%) rename apps/safeline/{newnet-6.0.2 => newnet-6.0.3}/.env.sample (82%) rename apps/safeline/{newnet-6.0.2 => newnet-6.0.3}/data.yml (78%) rename apps/safeline/{newnet-6.0.2 => newnet-6.0.3}/docker-compose.yml (91%) diff --git a/apps/safeline/6.0.2/.env.sample b/apps/safeline/6.0.3/.env.sample similarity index 82% rename from apps/safeline/6.0.2/.env.sample rename to apps/safeline/6.0.3/.env.sample index c801c8f4..b7379d9d 100644 --- a/apps/safeline/6.0.2/.env.sample +++ b/apps/safeline/6.0.3/.env.sample @@ -1,6 +1,5 @@ CONTAINER_NAME="safeline" PANEL_APP_PORT_HTTP="40080" -PANEL_APP_PORT_CHAOS="23333" POSTGRES_PASSWORD="password_xxJdZD" SAFELINE_DIR="./data" SUBNET_PREFIX="172.18.0" diff --git a/apps/safeline/6.0.2/data.yml b/apps/safeline/6.0.3/data.yml similarity index 79% rename from apps/safeline/6.0.2/data.yml rename to apps/safeline/6.0.3/data.yml index f1cc3be8..9ee53a62 100644 --- a/apps/safeline/6.0.2/data.yml +++ b/apps/safeline/6.0.3/data.yml @@ -16,14 +16,6 @@ additionalProperties: required: true rule: paramPort type: number - - default: 23333 - edit: true - envKey: PANEL_APP_PORT_CHAOS - labelEn: Chaos Port - labelZh: Chaos 端口 - required: true - rule: paramPort - type: number - default: ./data edit: true envKey: SAFELINE_DIR diff --git a/apps/safeline/6.0.2/docker-compose.yml b/apps/safeline/6.0.3/docker-compose.yml similarity index 91% rename from apps/safeline/6.0.2/docker-compose.yml rename to apps/safeline/6.0.3/docker-compose.yml index 933805fc..3f1cc417 100644 --- a/apps/safeline/6.0.2/docker-compose.yml +++ b/apps/safeline/6.0.3/docker-compose.yml @@ -5,7 +5,7 @@ services: networks: 1panel-network: ipv4_address: ${SUBNET_PREFIX}.234 - image: chaitin/safeline-mgt:6.0.2 + image: chaitin/safeline-mgt:6.0.3 volumes: - /etc/localtime:/etc/localtime:ro - ${SAFELINE_DIR}/resources/mgt:/app/data @@ -31,7 +31,7 @@ services: networks: 1panel-network: ipv4_address: ${SUBNET_PREFIX}.235 - image: chaitin/safeline-detector:6.0.2 + image: chaitin/safeline-detector:6.0.3 volumes: - ${SAFELINE_DIR}/resources/detector:/resources/detector - ${SAFELINE_DIR}/logs/detector:/logs/detector @@ -47,7 +47,7 @@ services: networks: 1panel-network: ipv4_address: ${SUBNET_PREFIX}.236 - image: chaitin/safeline-mario:6.0.2 + image: chaitin/safeline-mario:6.0.3 volumes: - ${SAFELINE_DIR}/resources/mario:/resources/mario - ${SAFELINE_DIR}/logs/mario:/logs/mario @@ -66,12 +66,13 @@ services: safeline-tengine: container_name: ${CONTAINER_NAME}-tengine restart: always - image: chaitin/safeline-tengine:6.0.2 + image: chaitin/safeline-tengine:6.0.3 volumes: - /etc/localtime:/etc/localtime:ro - /etc/resolv.conf:/etc/resolv.conf:ro - ${SAFELINE_DIR}/resources/nginx:/etc/nginx - ${SAFELINE_DIR}/resources/detector:/resources/detector + - ${SAFELINE_DIR}/resources/chaos:/resources/chaos - ${SAFELINE_DIR}/logs/nginx:/var/log/nginx - ${SAFELINE_DIR}/resources/cache:/usr/local/nginx/cache environment: @@ -89,7 +90,7 @@ services: networks: 1panel-network: ipv4_address: ${SUBNET_PREFIX}.237 - image: chaitin/safeline-luigi:6.0.2 + image: chaitin/safeline-luigi:6.0.3 volumes: - /etc/localtime:/etc/localtime:ro - ${SAFELINE_DIR}/resources/luigi:/app/data @@ -111,7 +112,7 @@ services: networks: 1panel-network: ipv4_address: ${SUBNET_PREFIX}.238 - image: chaitin/safeline-fvm:6.0.2 + image: chaitin/safeline-fvm:6.0.3 volumes: - /etc/localtime:/etc/localtime:ro logging: @@ -127,7 +128,7 @@ services: networks: 1panel-network: ipv4_address: ${SUBNET_PREFIX}.239 - image: chaitin/safeline-bridge:6.0.2 + image: chaitin/safeline-bridge:6.0.3 volumes: - /etc/localtime:/etc/localtime:ro - /var/run:/app/run @@ -172,13 +173,13 @@ services: networks: 1panel-network: ipv4_address: ${SUBNET_PREFIX}.240 - image: chaitin/safeline-chaos:6.0.2 + image: chaitin/safeline-chaos:6.0.3 logging: options: max-size: "100m" max-file: "5" - ports: - - ${PANEL_APP_PORT_CHAOS:-23333}:23333 + volumes: + - ${SAFELINE_DIR}/resources/chaos:/app/chaos labels: createdBy: Apps diff --git a/apps/safeline/latest/.env.sample b/apps/safeline/latest/.env.sample index c801c8f4..b7379d9d 100644 --- a/apps/safeline/latest/.env.sample +++ b/apps/safeline/latest/.env.sample @@ -1,6 +1,5 @@ CONTAINER_NAME="safeline" PANEL_APP_PORT_HTTP="40080" -PANEL_APP_PORT_CHAOS="23333" POSTGRES_PASSWORD="password_xxJdZD" SAFELINE_DIR="./data" SUBNET_PREFIX="172.18.0" diff --git a/apps/safeline/latest/data.yml b/apps/safeline/latest/data.yml index f1cc3be8..9ee53a62 100644 --- a/apps/safeline/latest/data.yml +++ b/apps/safeline/latest/data.yml @@ -16,14 +16,6 @@ additionalProperties: required: true rule: paramPort type: number - - default: 23333 - edit: true - envKey: PANEL_APP_PORT_CHAOS - labelEn: Chaos Port - labelZh: Chaos 端口 - required: true - rule: paramPort - type: number - default: ./data edit: true envKey: SAFELINE_DIR diff --git a/apps/safeline/latest/docker-compose.yml b/apps/safeline/latest/docker-compose.yml index 0642ef38..d7919789 100644 --- a/apps/safeline/latest/docker-compose.yml +++ b/apps/safeline/latest/docker-compose.yml @@ -72,6 +72,7 @@ services: - /etc/resolv.conf:/etc/resolv.conf:ro - ${SAFELINE_DIR}/resources/nginx:/etc/nginx - ${SAFELINE_DIR}/resources/detector:/resources/detector + - ${SAFELINE_DIR}/resources/chaos:/resources/chaos - ${SAFELINE_DIR}/logs/nginx:/var/log/nginx - ${SAFELINE_DIR}/resources/cache:/usr/local/nginx/cache environment: @@ -177,8 +178,8 @@ services: options: max-size: "100m" max-file: "5" - ports: - - ${PANEL_APP_PORT_CHAOS:-23333}:23333 + volumes: + - ${SAFELINE_DIR}/resources/chaos:/app/chaos labels: createdBy: Apps diff --git a/apps/safeline/newnet-6.0.2/.env.sample b/apps/safeline/newnet-6.0.3/.env.sample similarity index 82% rename from apps/safeline/newnet-6.0.2/.env.sample rename to apps/safeline/newnet-6.0.3/.env.sample index 475e24c4..3cd644f4 100644 --- a/apps/safeline/newnet-6.0.2/.env.sample +++ b/apps/safeline/newnet-6.0.3/.env.sample @@ -1,6 +1,5 @@ CONTAINER_NAME="safeline" PANEL_APP_PORT_HTTP="40080" -PANEL_APP_PORT_CHAOS="23333" POSTGRES_PASSWORD="password_xxJdZD" SAFELINE_DIR="./data" SUBNET_PREFIX="169.254.0" \ No newline at end of file diff --git a/apps/safeline/newnet-6.0.2/data.yml b/apps/safeline/newnet-6.0.3/data.yml similarity index 78% rename from apps/safeline/newnet-6.0.2/data.yml rename to apps/safeline/newnet-6.0.3/data.yml index 0cc04166..7da98c11 100644 --- a/apps/safeline/newnet-6.0.2/data.yml +++ b/apps/safeline/newnet-6.0.3/data.yml @@ -16,14 +16,6 @@ additionalProperties: required: true rule: paramPort type: number - - default: 23333 - edit: true - envKey: PANEL_APP_PORT_CHAOS - labelEn: Chaos Port - labelZh: Chaos 端口 - required: true - rule: paramPort - type: number - default: ./data edit: true envKey: SAFELINE_DIR diff --git a/apps/safeline/newnet-6.0.2/docker-compose.yml b/apps/safeline/newnet-6.0.3/docker-compose.yml similarity index 91% rename from apps/safeline/newnet-6.0.2/docker-compose.yml rename to apps/safeline/newnet-6.0.3/docker-compose.yml index ccb2d495..e5752f13 100644 --- a/apps/safeline/newnet-6.0.2/docker-compose.yml +++ b/apps/safeline/newnet-6.0.3/docker-compose.yml @@ -6,7 +6,7 @@ services: 1panel-network: safeline-ce: ipv4_address: ${SUBNET_PREFIX}.4 - image: chaitin/safeline-mgt:6.0.2 + image: chaitin/safeline-mgt:6.0.3 volumes: - /etc/localtime:/etc/localtime:ro - ${SAFELINE_DIR}/resources/mgt:/app/data @@ -33,7 +33,7 @@ services: 1panel-network: safeline-ce: ipv4_address: ${SUBNET_PREFIX}.5 - image: chaitin/safeline-detector:6.0.2 + image: chaitin/safeline-detector:6.0.3 volumes: - ${SAFELINE_DIR}/resources/detector:/resources/detector - ${SAFELINE_DIR}/logs/detector:/logs/detector @@ -50,7 +50,7 @@ services: 1panel-network: safeline-ce: ipv4_address: ${SUBNET_PREFIX}.6 - image: chaitin/safeline-mario:6.0.2 + image: chaitin/safeline-mario:6.0.3 volumes: - ${SAFELINE_DIR}/resources/mario:/resources/mario - ${SAFELINE_DIR}/logs/mario:/logs/mario @@ -69,12 +69,13 @@ services: safeline-tengine: container_name: ${CONTAINER_NAME}-tengine restart: always - image: chaitin/safeline-tengine:6.0.2 + image: chaitin/safeline-tengine:6.0.3 volumes: - /etc/localtime:/etc/localtime:ro - /etc/resolv.conf:/etc/resolv.conf:ro - ${SAFELINE_DIR}/resources/nginx:/etc/nginx - ${SAFELINE_DIR}/resources/detector:/resources/detector + - ${SAFELINE_DIR}/resources/chaos:/resources/chaos - ${SAFELINE_DIR}/logs/nginx:/var/log/nginx - ${SAFELINE_DIR}/resources/cache:/usr/local/nginx/cache environment: @@ -93,7 +94,7 @@ services: 1panel-network: safeline-ce: ipv4_address: ${SUBNET_PREFIX}.7 - image: chaitin/safeline-luigi:6.0.2 + image: chaitin/safeline-luigi:6.0.3 volumes: - /etc/localtime:/etc/localtime:ro - ${SAFELINE_DIR}/resources/luigi:/app/data @@ -116,7 +117,7 @@ services: 1panel-network: safeline-ce: ipv4_address: ${SUBNET_PREFIX}.8 - image: chaitin/safeline-fvm:6.0.2 + image: chaitin/safeline-fvm:6.0.3 volumes: - /etc/localtime:/etc/localtime:ro logging: @@ -133,7 +134,7 @@ services: 1panel-network: safeline-ce: ipv4_address: ${SUBNET_PREFIX}.9 - image: chaitin/safeline-bridge:6.0.2 + image: chaitin/safeline-bridge:6.0.3 volumes: - /etc/localtime:/etc/localtime:ro - /var/run:/app/run @@ -180,13 +181,13 @@ services: 1panel-network: safeline-ce: ipv4_address: ${SUBNET_PREFIX}.10 - image: chaitin/safeline-chaos:6.0.2 + image: chaitin/safeline-chaos:6.0.3 logging: options: max-size: "100m" max-file: "5" - ports: - - ${PANEL_APP_PORT_CHAOS:-23333}:23333 + volumes: + - ${SAFELINE_DIR}/resources/chaos:/app/chaos labels: createdBy: Apps diff --git a/apps/safeline/newnet-latest/.env.sample b/apps/safeline/newnet-latest/.env.sample index 475e24c4..3cd644f4 100644 --- a/apps/safeline/newnet-latest/.env.sample +++ b/apps/safeline/newnet-latest/.env.sample @@ -1,6 +1,5 @@ CONTAINER_NAME="safeline" PANEL_APP_PORT_HTTP="40080" -PANEL_APP_PORT_CHAOS="23333" POSTGRES_PASSWORD="password_xxJdZD" SAFELINE_DIR="./data" SUBNET_PREFIX="169.254.0" \ No newline at end of file diff --git a/apps/safeline/newnet-latest/data.yml b/apps/safeline/newnet-latest/data.yml index 0cc04166..7da98c11 100644 --- a/apps/safeline/newnet-latest/data.yml +++ b/apps/safeline/newnet-latest/data.yml @@ -16,14 +16,6 @@ additionalProperties: required: true rule: paramPort type: number - - default: 23333 - edit: true - envKey: PANEL_APP_PORT_CHAOS - labelEn: Chaos Port - labelZh: Chaos 端口 - required: true - rule: paramPort - type: number - default: ./data edit: true envKey: SAFELINE_DIR diff --git a/apps/safeline/newnet-latest/docker-compose.yml b/apps/safeline/newnet-latest/docker-compose.yml index 28624523..df643eda 100644 --- a/apps/safeline/newnet-latest/docker-compose.yml +++ b/apps/safeline/newnet-latest/docker-compose.yml @@ -75,6 +75,7 @@ services: - /etc/resolv.conf:/etc/resolv.conf:ro - ${SAFELINE_DIR}/resources/nginx:/etc/nginx - ${SAFELINE_DIR}/resources/detector:/resources/detector + - ${SAFELINE_DIR}/resources/chaos:/resources/chaos - ${SAFELINE_DIR}/logs/nginx:/var/log/nginx - ${SAFELINE_DIR}/resources/cache:/usr/local/nginx/cache environment: @@ -185,8 +186,8 @@ services: options: max-size: "100m" max-file: "5" - ports: - - ${PANEL_APP_PORT_CHAOS:-23333}:23333 + volumes: + - ${SAFELINE_DIR}/resources/chaos:/app/chaos labels: createdBy: Apps