From 5f08fa327c6f091260676d7ea7785045e1edba3c Mon Sep 17 00:00:00 2001 From: okxlin Date: Fri, 31 May 2024 19:20:37 +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.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/safeline/{5.6.2 => 6.0.1}/.env.sample | 1 + apps/safeline/{5.6.2 => 6.0.1}/data.yml | 8 +++++ .../{5.6.2 => 6.0.1}/docker-compose.yml | 30 +++++++++++++----- apps/safeline/latest/.env.sample | 1 + apps/safeline/latest/data.yml | 8 +++++ apps/safeline/latest/docker-compose.yml | 16 ++++++++++ .../.env.sample | 1 + .../{newnet-5.6.2 => newnet-6.0.1}/data.yml | 8 +++++ .../docker-compose.yml | 31 ++++++++++++++----- apps/safeline/newnet-latest/.env.sample | 1 + apps/safeline/newnet-latest/data.yml | 8 +++++ .../safeline/newnet-latest/docker-compose.yml | 17 ++++++++++ 12 files changed, 116 insertions(+), 14 deletions(-) rename apps/safeline/{5.6.2 => 6.0.1}/.env.sample (82%) rename apps/safeline/{5.6.2 => 6.0.1}/data.yml (79%) rename apps/safeline/{5.6.2 => 6.0.1}/docker-compose.yml (86%) rename apps/safeline/{newnet-5.6.2 => newnet-6.0.1}/.env.sample (82%) rename apps/safeline/{newnet-5.6.2 => newnet-6.0.1}/data.yml (78%) rename apps/safeline/{newnet-5.6.2 => newnet-6.0.1}/docker-compose.yml (87%) diff --git a/apps/safeline/5.6.2/.env.sample b/apps/safeline/6.0.1/.env.sample similarity index 82% rename from apps/safeline/5.6.2/.env.sample rename to apps/safeline/6.0.1/.env.sample index b7379d9d..c801c8f4 100644 --- a/apps/safeline/5.6.2/.env.sample +++ b/apps/safeline/6.0.1/.env.sample @@ -1,5 +1,6 @@ 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/5.6.2/data.yml b/apps/safeline/6.0.1/data.yml similarity index 79% rename from apps/safeline/5.6.2/data.yml rename to apps/safeline/6.0.1/data.yml index 9ee53a62..f1cc3be8 100644 --- a/apps/safeline/5.6.2/data.yml +++ b/apps/safeline/6.0.1/data.yml @@ -16,6 +16,14 @@ 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/5.6.2/docker-compose.yml b/apps/safeline/6.0.1/docker-compose.yml similarity index 86% rename from apps/safeline/5.6.2/docker-compose.yml rename to apps/safeline/6.0.1/docker-compose.yml index 962755d4..53b2e9fd 100644 --- a/apps/safeline/5.6.2/docker-compose.yml +++ b/apps/safeline/6.0.1/docker-compose.yml @@ -6,7 +6,7 @@ services: networks: 1panel-network: ipv4_address: ${SUBNET_PREFIX}.234 - image: chaitin/safeline-mgt:5.6.2 + image: chaitin/safeline-mgt:6.0.1 volumes: - /etc/localtime:/etc/localtime:ro - ${SAFELINE_DIR}/resources/mgt:/app/data @@ -32,7 +32,7 @@ services: networks: 1panel-network: ipv4_address: ${SUBNET_PREFIX}.235 - image: chaitin/safeline-detector:5.6.2 + image: chaitin/safeline-detector:6.0.1 volumes: - ${SAFELINE_DIR}/resources/detector:/resources/detector - ${SAFELINE_DIR}/logs/detector:/logs/detector @@ -48,7 +48,7 @@ services: networks: 1panel-network: ipv4_address: ${SUBNET_PREFIX}.236 - image: chaitin/safeline-mario:5.6.2 + image: chaitin/safeline-mario:6.0.1 volumes: - ${SAFELINE_DIR}/resources/mario:/resources/mario - ${SAFELINE_DIR}/logs/mario:/logs/mario @@ -67,7 +67,7 @@ services: safeline-tengine: container_name: ${CONTAINER_NAME}-tengine restart: always - image: chaitin/safeline-tengine:5.6.2 + image: chaitin/safeline-tengine:6.0.1 volumes: - /etc/localtime:/etc/localtime:ro - /etc/resolv.conf:/etc/resolv.conf:ro @@ -90,7 +90,7 @@ services: networks: 1panel-network: ipv4_address: ${SUBNET_PREFIX}.237 - image: chaitin/safeline-luigi:5.6.2 + image: chaitin/safeline-luigi:6.0.1 volumes: - /etc/localtime:/etc/localtime:ro - ${SAFELINE_DIR}/resources/luigi:/app/data @@ -112,7 +112,7 @@ services: networks: 1panel-network: ipv4_address: ${SUBNET_PREFIX}.238 - image: chaitin/safeline-fvm:5.6.2 + image: chaitin/safeline-fvm:6.0.1 volumes: - /etc/localtime:/etc/localtime:ro logging: @@ -128,7 +128,7 @@ services: networks: 1panel-network: ipv4_address: ${SUBNET_PREFIX}.239 - image: chaitin/safeline-bridge:5.6.2 + image: chaitin/safeline-bridge:6.0.1 volumes: - /etc/localtime:/etc/localtime:ro - /var/run:/app/run @@ -167,6 +167,22 @@ services: labels: createdBy: Apps + safeline-chaos: + container_name: ${CONTAINER_NAME}-chaos + restart: always + networks: + 1panel-network: + ipv4_address: ${SUBNET_PREFIX}.240 + image: chaitin/safeline-chaos:6.0.1 + logging: + options: + max-size: "100m" + max-file: "5" + ports: + - ${PANEL_APP_PORT_CHAOS:-23333}:23333 + labels: + createdBy: Apps + networks: 1panel-network: external: true \ No newline at end of file diff --git a/apps/safeline/latest/.env.sample b/apps/safeline/latest/.env.sample index b7379d9d..c801c8f4 100644 --- a/apps/safeline/latest/.env.sample +++ b/apps/safeline/latest/.env.sample @@ -1,5 +1,6 @@ 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 9ee53a62..f1cc3be8 100644 --- a/apps/safeline/latest/data.yml +++ b/apps/safeline/latest/data.yml @@ -16,6 +16,14 @@ 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 65747e49..9baccced 100644 --- a/apps/safeline/latest/docker-compose.yml +++ b/apps/safeline/latest/docker-compose.yml @@ -167,6 +167,22 @@ services: labels: createdBy: Apps + safeline-chaos: + container_name: ${CONTAINER_NAME}-chaos + restart: always + networks: + 1panel-network: + ipv4_address: ${SUBNET_PREFIX}.240 + image: chaitin/safeline-chaos:latest + logging: + options: + max-size: "100m" + max-file: "5" + ports: + - ${PANEL_APP_PORT_CHAOS:-23333}:23333 + labels: + createdBy: Apps + networks: 1panel-network: external: true \ No newline at end of file diff --git a/apps/safeline/newnet-5.6.2/.env.sample b/apps/safeline/newnet-6.0.1/.env.sample similarity index 82% rename from apps/safeline/newnet-5.6.2/.env.sample rename to apps/safeline/newnet-6.0.1/.env.sample index 3cd644f4..475e24c4 100644 --- a/apps/safeline/newnet-5.6.2/.env.sample +++ b/apps/safeline/newnet-6.0.1/.env.sample @@ -1,5 +1,6 @@ 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-5.6.2/data.yml b/apps/safeline/newnet-6.0.1/data.yml similarity index 78% rename from apps/safeline/newnet-5.6.2/data.yml rename to apps/safeline/newnet-6.0.1/data.yml index 7da98c11..0cc04166 100644 --- a/apps/safeline/newnet-5.6.2/data.yml +++ b/apps/safeline/newnet-6.0.1/data.yml @@ -16,6 +16,14 @@ 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-5.6.2/docker-compose.yml b/apps/safeline/newnet-6.0.1/docker-compose.yml similarity index 87% rename from apps/safeline/newnet-5.6.2/docker-compose.yml rename to apps/safeline/newnet-6.0.1/docker-compose.yml index d72b2c99..f97bb253 100644 --- a/apps/safeline/newnet-5.6.2/docker-compose.yml +++ b/apps/safeline/newnet-6.0.1/docker-compose.yml @@ -7,7 +7,7 @@ services: 1panel-network: safeline-ce: ipv4_address: ${SUBNET_PREFIX}.4 - image: chaitin/safeline-mgt:5.6.2 + image: chaitin/safeline-mgt:6.0.1 volumes: - /etc/localtime:/etc/localtime:ro - ${SAFELINE_DIR}/resources/mgt:/app/data @@ -34,7 +34,7 @@ services: 1panel-network: safeline-ce: ipv4_address: ${SUBNET_PREFIX}.5 - image: chaitin/safeline-detector:5.6.2 + image: chaitin/safeline-detector:6.0.1 volumes: - ${SAFELINE_DIR}/resources/detector:/resources/detector - ${SAFELINE_DIR}/logs/detector:/logs/detector @@ -51,7 +51,7 @@ services: 1panel-network: safeline-ce: ipv4_address: ${SUBNET_PREFIX}.6 - image: chaitin/safeline-mario:5.6.2 + image: chaitin/safeline-mario:6.0.1 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.6.2 + image: chaitin/safeline-tengine:6.0.1 volumes: - /etc/localtime:/etc/localtime:ro - /etc/resolv.conf:/etc/resolv.conf:ro @@ -94,7 +94,7 @@ services: 1panel-network: safeline-ce: ipv4_address: ${SUBNET_PREFIX}.7 - image: chaitin/safeline-luigi:5.6.2 + image: chaitin/safeline-luigi:6.0.1 volumes: - /etc/localtime:/etc/localtime:ro - ${SAFELINE_DIR}/resources/luigi:/app/data @@ -117,7 +117,7 @@ services: 1panel-network: safeline-ce: ipv4_address: ${SUBNET_PREFIX}.8 - image: chaitin/safeline-fvm:5.6.2 + image: chaitin/safeline-fvm:6.0.1 volumes: - /etc/localtime:/etc/localtime:ro logging: @@ -134,7 +134,7 @@ services: 1panel-network: safeline-ce: ipv4_address: ${SUBNET_PREFIX}.9 - image: chaitin/safeline-bridge:5.6.2 + image: chaitin/safeline-bridge:6.0.1 volumes: - /etc/localtime:/etc/localtime:ro - /var/run:/app/run @@ -174,6 +174,23 @@ services: labels: createdBy: Apps + safeline-chaos: + container_name: ${CONTAINER_NAME}-chaos + restart: always + networks: + 1panel-network: + safeline-ce: + ipv4_address: ${SUBNET_PREFIX}.10 + image: chaitin/safeline-chaos:6.0.1 + logging: + options: + max-size: "100m" + max-file: "5" + ports: + - ${PANEL_APP_PORT_CHAOS:-23333}:23333 + labels: + createdBy: Apps + networks: 1panel-network: external: true diff --git a/apps/safeline/newnet-latest/.env.sample b/apps/safeline/newnet-latest/.env.sample index 3cd644f4..475e24c4 100644 --- a/apps/safeline/newnet-latest/.env.sample +++ b/apps/safeline/newnet-latest/.env.sample @@ -1,5 +1,6 @@ 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 7da98c11..0cc04166 100644 --- a/apps/safeline/newnet-latest/data.yml +++ b/apps/safeline/newnet-latest/data.yml @@ -16,6 +16,14 @@ 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 b6e93ad9..d01a1788 100644 --- a/apps/safeline/newnet-latest/docker-compose.yml +++ b/apps/safeline/newnet-latest/docker-compose.yml @@ -174,6 +174,23 @@ services: labels: createdBy: Apps + safeline-chaos: + container_name: ${CONTAINER_NAME}-chaos + restart: always + networks: + 1panel-network: + safeline-ce: + ipv4_address: ${SUBNET_PREFIX}.10 + image: chaitin/safeline-chaos:latest + logging: + options: + max-size: "100m" + max-file: "5" + ports: + - ${PANEL_APP_PORT_CHAOS:-23333}:23333 + labels: + createdBy: Apps + networks: 1panel-network: external: true