From 5a1611a284f44c051c7a153a3d882fcf72a8564b Mon Sep 17 00:00:00 2001 From: xiaoY233 Date: Mon, 14 Jul 2025 16:37:18 +0800 Subject: [PATCH] feat: update safeline 9.0.3 --- apps/safeline/{8.10.1 => 9.0.3}/.env.sample | 0 apps/safeline/{8.10.1 => 9.0.3}/data.yml | 0 .../{8.10.1 => 9.0.3}/docker-compose.yml | 82 +++++++++---------- 3 files changed, 39 insertions(+), 43 deletions(-) rename apps/safeline/{8.10.1 => 9.0.3}/.env.sample (100%) rename apps/safeline/{8.10.1 => 9.0.3}/data.yml (100%) rename apps/safeline/{8.10.1 => 9.0.3}/docker-compose.yml (60%) diff --git a/apps/safeline/8.10.1/.env.sample b/apps/safeline/9.0.3/.env.sample similarity index 100% rename from apps/safeline/8.10.1/.env.sample rename to apps/safeline/9.0.3/.env.sample diff --git a/apps/safeline/8.10.1/data.yml b/apps/safeline/9.0.3/data.yml similarity index 100% rename from apps/safeline/8.10.1/data.yml rename to apps/safeline/9.0.3/data.yml diff --git a/apps/safeline/8.10.1/docker-compose.yml b/apps/safeline/9.0.3/docker-compose.yml similarity index 60% rename from apps/safeline/8.10.1/docker-compose.yml rename to apps/safeline/9.0.3/docker-compose.yml index 2ec3423..1b97534 100644 --- a/apps/safeline/8.10.1/docker-compose.yml +++ b/apps/safeline/9.0.3/docker-compose.yml @@ -5,29 +5,28 @@ services: networks: 1panel-network: ipv4_address: ${SUBNET_PREFIX}.234 - image: chaitin/safeline-mgt:8.10.1 + image: chaitin/safeline-mgt:9.0.3 volumes: - - /etc/localtime:/etc/localtime:ro - - ${SAFELINE_DIR}/resources/mgt:/app/data - - ${SAFELINE_DIR}/logs/nginx:/app/log/nginx:z - - ${SAFELINE_DIR}/resources/sock:/app/sock - - /var/run:/app/run + - /etc/localtime:/etc/localtime:ro + - ${SAFELINE_DIR}/resources/mgt:/app/data + - ${SAFELINE_DIR}/logs/nginx:/app/log/nginx:z + - ${SAFELINE_DIR}/resources/sock:/app/sock + - /var/run:/app/run ports: - - ${PANEL_APP_PORT_HTTP:-9443}:1443 + - ${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 + - MGT_PG=postgres://safeline-ce:${POSTGRES_PASSWORD}@safeline-pg/safeline-ce?sslmode=disable logging: options: - max-size: "100m" - max-file: "5" + max-size: 100m + max-file: '5' depends_on: - safeline-pg - safeline-fvm labels: createdBy: Apps - safeline-detector: container_name: ${CONTAINER_NAME}-detector restart: always @@ -36,36 +35,34 @@ services: ipv4_address: ${SUBNET_PREFIX}.235 image: chaitin/safeline-detector:8.10.1 volumes: - - ${SAFELINE_DIR}/resources/detector:/resources/detector - - ${SAFELINE_DIR}/logs/detector:/logs/detector - - /etc/localtime:/etc/localtime:ro + - ${SAFELINE_DIR}/resources/detector:/resources/detector + - ${SAFELINE_DIR}/logs/detector:/logs/detector + - /etc/localtime:/etc/localtime:ro environment: - - LOG_DIR=/logs/detector + - LOG_DIR=/logs/detector labels: createdBy: Apps - safeline-tengine: container_name: ${CONTAINER_NAME}-tengine restart: always image: chaitin/safeline-tengine:8.10.1 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:z - - ${SAFELINE_DIR}/resources/cache:/usr/local/nginx/cache - - ${SAFELINE_DIR}/resources/sock:/app/sock + - /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:z + - ${SAFELINE_DIR}/resources/cache:/usr/local/nginx/cache + - ${SAFELINE_DIR}/resources/sock:/app/sock environment: - - TCD_MGT_API=https://${SUBNET_PREFIX}.234:1443/api/open/publish/server - - SNSERVER_ADDR=${SUBNET_PREFIX}.235:8000 + - TCD_MGT_API=https://${SUBNET_PREFIX}.234:1443/api/open/publish/server + - SNSERVER_ADDR=${SUBNET_PREFIX}.235:8000 ulimits: nofile: 131072 network_mode: host labels: createdBy: Apps - safeline-luigi: container_name: ${CONTAINER_NAME}-luigi restart: always @@ -80,14 +77,13 @@ services: - MGT_IP=${SUBNET_PREFIX}.234 logging: options: - max-size: "100m" - max-file: "5" + max-size: 100m + max-file: '5' depends_on: - safeline-detector - safeline-mgt labels: createdBy: Apps - safeline-fvm: container_name: ${CONTAINER_NAME}-fvm restart: always @@ -99,11 +95,10 @@ services: - /etc/localtime:/etc/localtime:ro logging: options: - max-size: "100m" - max-file: "5" + max-size: 100m + max-file: '5' labels: createdBy: Apps - safeline-pg: container_name: ${CONTAINER_NAME}-pg restart: always @@ -112,17 +107,19 @@ services: ipv4_address: ${SUBNET_PREFIX}.232 image: chaitin/safeline-postgres:15.2 volumes: - - ${SAFELINE_DIR}/resources/postgres/data:/var/lib/postgresql/data - - /etc/localtime:/etc/localtime:ro + - ${SAFELINE_DIR}/resources/postgres/data:/var/lib/postgresql/data + - /etc/localtime:/etc/localtime:ro environment: - - POSTGRES_USER=safeline-ce - - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} - command: [postgres, -c, max_connections=600] + - POSTGRES_USER=safeline-ce + - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} + command: + - postgres + - -c + - max_connections=600 healthcheck: test: pg_isready -U safeline-ce -d safeline-ce labels: createdBy: Apps - safeline-chaos: container_name: ${CONTAINER_NAME}-chaos restart: always @@ -132,14 +129,13 @@ services: image: chaitin/safeline-chaos:8.10.1 logging: options: - max-size: "100m" - max-file: "5" + max-size: 100m + max-file: '5' volumes: - ${SAFELINE_DIR}/resources/sock:/app/sock - ${SAFELINE_DIR}/resources/chaos:/app/chaos labels: createdBy: Apps - networks: 1panel-network: - external: true \ No newline at end of file + external: true