From b60f8fe58daa875be4531bafa3aade6814b2d208 Mon Sep 17 00:00:00 2001 From: okxlin Date: Fri, 5 Jan 2024 20:55:40 +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=A04.0.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/safeline/{3.16.1 => 4.0.0}/.env.sample | 0 apps/safeline/{3.16.1 => 4.0.0}/data.yml | 0 .../{3.16.1 => 4.0.0}/docker-compose.yml | 76 +++++++++--------- apps/safeline/latest/docker-compose.yml | 70 ++++++++--------- .../.env.sample | 0 .../{newnet-3.16.1 => newnet-4.0.0}/data.yml | 0 .../docker-compose.yml | 77 +++++++++---------- .../safeline/newnet-latest/docker-compose.yml | 71 ++++++++--------- 8 files changed, 140 insertions(+), 154 deletions(-) rename apps/safeline/{3.16.1 => 4.0.0}/.env.sample (100%) rename apps/safeline/{3.16.1 => 4.0.0}/data.yml (100%) rename apps/safeline/{3.16.1 => 4.0.0}/docker-compose.yml (63%) rename apps/safeline/{newnet-3.16.1 => newnet-4.0.0}/.env.sample (100%) rename apps/safeline/{newnet-3.16.1 => newnet-4.0.0}/data.yml (100%) rename apps/safeline/{newnet-3.16.1 => newnet-4.0.0}/docker-compose.yml (65%) diff --git a/apps/safeline/3.16.1/.env.sample b/apps/safeline/4.0.0/.env.sample similarity index 100% rename from apps/safeline/3.16.1/.env.sample rename to apps/safeline/4.0.0/.env.sample diff --git a/apps/safeline/3.16.1/data.yml b/apps/safeline/4.0.0/data.yml similarity index 100% rename from apps/safeline/3.16.1/data.yml rename to apps/safeline/4.0.0/data.yml diff --git a/apps/safeline/3.16.1/docker-compose.yml b/apps/safeline/4.0.0/docker-compose.yml similarity index 63% rename from apps/safeline/3.16.1/docker-compose.yml rename to apps/safeline/4.0.0/docker-compose.yml index 5a241303f..80610982a 100644 --- a/apps/safeline/3.16.1/docker-compose.yml +++ b/apps/safeline/4.0.0/docker-compose.yml @@ -1,26 +1,20 @@ version: '3' services: - safeline-management: - container_name: ${CONTAINER_NAME}-mgt-api + safeline-mgt: + container_name: ${CONTAINER_NAME}-mgt restart: always networks: 1panel-network: ipv4_address: ${SUBNET_PREFIX}.234 - image: chaitin/safeline-mgt-api:3.16.1 + image: chaitin/safeline-mgt:4.0.0 volumes: - - ${SAFELINE_DIR}/resources/management:/resources/management - - ${SAFELINE_DIR}/resources/nginx:/resources/nginx - - ${SAFELINE_DIR}/logs:/logs - /etc/localtime:/etc/localtime:ro + - ${SAFELINE_DIR}/resources/mgt:/app/data ports: - ${PANEL_APP_PORT_HTTP:-9443}:1443 environment: - - MANAGEMENT_RESOURCES_DIR=/resources/management - - NGINX_RESOURCES_DIR=/resources/nginx - - DATABASE_URL=postgres://safeline-ce:${POSTGRES_PASSWORD}@safeline-postgres/safeline-ce - - MARIO_URL=http://safeline-mario:3335 - - FVM_MANAGER_URL=safeline-fvm-manager:9004 - - MANAGEMENT_LOGS_DIR=/logs/management + - MGT_PG=postgres://safeline-ce:${POSTGRES_PASSWORD}@safeline-pg/safeline-ce?sslmode=disable + #- MGT_LICENSE_SERVER=https://safeline-ce-4463.rivers.chaitin.cn/ dns: - 119.29.29.29 - 223.5.5.5 @@ -28,8 +22,9 @@ services: - 1.2.4.8 - 114.114.114.114 - 8.8.8.8 - cap_drop: - - net_raw + depends_on: + - safeline-pg + - safeline-fvm labels: createdBy: Apps @@ -39,15 +34,13 @@ services: networks: 1panel-network: ipv4_address: ${SUBNET_PREFIX}.235 - image: chaitin/safeline-detector:3.16.1 + image: chaitin/safeline-detector:4.0.0 volumes: - ${SAFELINE_DIR}/resources/detector:/resources/detector - ${SAFELINE_DIR}/logs/detector:/logs/detector - /etc/localtime:/etc/localtime:ro environment: - LOG_DIR=/logs/detector - cap_drop: - - net_raw labels: createdBy: Apps @@ -57,7 +50,7 @@ services: networks: 1panel-network: ipv4_address: ${SUBNET_PREFIX}.236 - image: chaitin/safeline-mario:3.16.1 + image: chaitin/safeline-mario:4.0.0 volumes: - ${SAFELINE_DIR}/resources/mario:/resources/mario - ${SAFELINE_DIR}/logs/mario:/logs/mario @@ -65,65 +58,68 @@ services: environment: - LOG_DIR=/logs/mario - GOGC=100 - - DATABASE_URL=postgres://safeline-ce:${POSTGRES_PASSWORD}@safeline-postgres/safeline-ce - cap_drop: - - net_raw + - DATABASE_URL=postgres://safeline-ce:${POSTGRES_PASSWORD}@safeline-pg/safeline-ce labels: createdBy: Apps safeline-tengine: container_name: ${CONTAINER_NAME}-tengine restart: always - image: chaitin/safeline-tengine:3.16.1 + image: chaitin/safeline-tengine:4.0.0 volumes: + - /etc/localtime:/etc/localtime:ro + - /etc/resolv.conf:/etc/resolv.conf - ${SAFELINE_DIR}/resources/nginx:/etc/nginx - - ${SAFELINE_DIR}/resources/management:/resources/management - ${SAFELINE_DIR}/resources/detector:/resources/detector - ${SAFELINE_DIR}/logs/nginx:/var/log/nginx - - /etc/localtime:/etc/localtime:ro - ${SAFELINE_DIR}/resources/cache:/usr/local/nginx/cache - - /etc/resolv.conf:/etc/resolv.conf environment: - - MGT_API=https://${SUBNET_PREFIX}.234:1443/api/publish/server + - 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 - fvm-manager: - container_name: ${CONTAINER_NAME}-fvm-manager + safeline-luigi: + container_name: ${CONTAINER_NAME}-luigi + restart: always + networks: + 1panel-network: + ipv4_address: ${SUBNET_PREFIX}.237 + image: chaitin/safeline-luigi:4.0.0 + volumes: + - /etc/localtime:/etc/localtime:ro + - ${SAFELINE_DIR}/resources/luigi:/app/data + labels: + createdBy: Apps + + safeline-fvm: + container_name: ${CONTAINER_NAME}-fvm restart: always networks: 1panel-network: ipv4_address: ${SUBNET_PREFIX}.238 - image: chaitin/safeline-fvm-manager:3.16.1 + image: chaitin/safeline-fvm:4.0.0 volumes: - /etc/localtime:/etc/localtime:ro - - ${SAFELINE_DIR}/logs:/logs - environment: - - FVM_LOGS_DIR=/logs/management - - DETECTOR_URL=http://safeline-detector:8001 - cap_drop: - - net_raw labels: createdBy: Apps - safeline-postgres: - container_name: ${CONTAINER_NAME}-postgres + safeline-pg: + container_name: ${CONTAINER_NAME}-pg restart: always networks: 1panel-network: ipv4_address: ${SUBNET_PREFIX}.232 - image: postgres:15.5-bookworm + image: postgres:15.5-alpine volumes: - ${SAFELINE_DIR}/resources/postgres/data:/var/lib/postgresql/data - /etc/localtime:/etc/localtime:ro environment: - POSTGRES_USER=safeline-ce - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} - cap_drop: - - net_raw command: [postgres, -c, max_connections=200] labels: createdBy: Apps diff --git a/apps/safeline/latest/docker-compose.yml b/apps/safeline/latest/docker-compose.yml index 997750e3a..ca313ff78 100644 --- a/apps/safeline/latest/docker-compose.yml +++ b/apps/safeline/latest/docker-compose.yml @@ -1,26 +1,20 @@ version: '3' services: - safeline-management: - container_name: ${CONTAINER_NAME}-mgt-api + safeline-mgt: + container_name: ${CONTAINER_NAME}-mgt restart: always networks: 1panel-network: ipv4_address: ${SUBNET_PREFIX}.234 - image: chaitin/safeline-mgt-api:latest + image: chaitin/safeline-mgt:latest volumes: - - ${SAFELINE_DIR}/resources/management:/resources/management - - ${SAFELINE_DIR}/resources/nginx:/resources/nginx - - ${SAFELINE_DIR}/logs:/logs - /etc/localtime:/etc/localtime:ro + - ${SAFELINE_DIR}/resources/mgt:/app/data ports: - ${PANEL_APP_PORT_HTTP:-9443}:1443 environment: - - MANAGEMENT_RESOURCES_DIR=/resources/management - - NGINX_RESOURCES_DIR=/resources/nginx - - DATABASE_URL=postgres://safeline-ce:${POSTGRES_PASSWORD}@safeline-postgres/safeline-ce - - MARIO_URL=http://safeline-mario:3335 - - FVM_MANAGER_URL=safeline-fvm-manager:9004 - - MANAGEMENT_LOGS_DIR=/logs/management + - MGT_PG=postgres://safeline-ce:${POSTGRES_PASSWORD}@safeline-pg/safeline-ce?sslmode=disable + #- MGT_LICENSE_SERVER=https://safeline-ce-4463.rivers.chaitin.cn/ dns: - 119.29.29.29 - 223.5.5.5 @@ -28,8 +22,9 @@ services: - 1.2.4.8 - 114.114.114.114 - 8.8.8.8 - cap_drop: - - net_raw + depends_on: + - safeline-pg + - safeline-fvm labels: createdBy: Apps @@ -46,8 +41,6 @@ services: - /etc/localtime:/etc/localtime:ro environment: - LOG_DIR=/logs/detector - cap_drop: - - net_raw labels: createdBy: Apps @@ -65,9 +58,7 @@ services: environment: - LOG_DIR=/logs/mario - GOGC=100 - - DATABASE_URL=postgres://safeline-ce:${POSTGRES_PASSWORD}@safeline-postgres/safeline-ce - cap_drop: - - net_raw + - DATABASE_URL=postgres://safeline-ce:${POSTGRES_PASSWORD}@safeline-pg/safeline-ce labels: createdBy: Apps @@ -76,54 +67,59 @@ services: restart: always image: chaitin/safeline-tengine:latest volumes: + - /etc/localtime:/etc/localtime:ro + - /etc/resolv.conf:/etc/resolv.conf - ${SAFELINE_DIR}/resources/nginx:/etc/nginx - - ${SAFELINE_DIR}/resources/management:/resources/management - ${SAFELINE_DIR}/resources/detector:/resources/detector - ${SAFELINE_DIR}/logs/nginx:/var/log/nginx - - /etc/localtime:/etc/localtime:ro - ${SAFELINE_DIR}/resources/cache:/usr/local/nginx/cache - - /etc/resolv.conf:/etc/resolv.conf environment: - - MGT_API=https://${SUBNET_PREFIX}.234:1443/api/publish/server + - 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 - fvm-manager: - container_name: ${CONTAINER_NAME}-fvm-manager + safeline-luigi: + container_name: ${CONTAINER_NAME}-luigi + restart: always + networks: + 1panel-network: + ipv4_address: ${SUBNET_PREFIX}.237 + image: chaitin/safeline-luigi:latest + volumes: + - /etc/localtime:/etc/localtime:ro + - ${SAFELINE_DIR}/resources/luigi:/app/data + labels: + createdBy: Apps + + safeline-fvm: + container_name: ${CONTAINER_NAME}-fvm restart: always networks: 1panel-network: ipv4_address: ${SUBNET_PREFIX}.238 - image: chaitin/safeline-fvm-manager:latest + image: chaitin/safeline-fvm:latest volumes: - /etc/localtime:/etc/localtime:ro - - ${SAFELINE_DIR}/logs:/logs - environment: - - FVM_LOGS_DIR=/logs/management - - DETECTOR_URL=http://safeline-detector:8001 - cap_drop: - - net_raw labels: createdBy: Apps - safeline-postgres: - container_name: ${CONTAINER_NAME}-postgres + safeline-pg: + container_name: ${CONTAINER_NAME}-pg restart: always networks: 1panel-network: ipv4_address: ${SUBNET_PREFIX}.232 - image: postgres:15.4-bookworm + image: postgres:15-alpine volumes: - ${SAFELINE_DIR}/resources/postgres/data:/var/lib/postgresql/data - /etc/localtime:/etc/localtime:ro environment: - POSTGRES_USER=safeline-ce - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} - cap_drop: - - net_raw command: [postgres, -c, max_connections=200] labels: createdBy: Apps diff --git a/apps/safeline/newnet-3.16.1/.env.sample b/apps/safeline/newnet-4.0.0/.env.sample similarity index 100% rename from apps/safeline/newnet-3.16.1/.env.sample rename to apps/safeline/newnet-4.0.0/.env.sample diff --git a/apps/safeline/newnet-3.16.1/data.yml b/apps/safeline/newnet-4.0.0/data.yml similarity index 100% rename from apps/safeline/newnet-3.16.1/data.yml rename to apps/safeline/newnet-4.0.0/data.yml diff --git a/apps/safeline/newnet-3.16.1/docker-compose.yml b/apps/safeline/newnet-4.0.0/docker-compose.yml similarity index 65% rename from apps/safeline/newnet-3.16.1/docker-compose.yml rename to apps/safeline/newnet-4.0.0/docker-compose.yml index a7d449ed8..70798ee13 100644 --- a/apps/safeline/newnet-3.16.1/docker-compose.yml +++ b/apps/safeline/newnet-4.0.0/docker-compose.yml @@ -1,27 +1,21 @@ version: '3' services: - safeline-management: - container_name: ${CONTAINER_NAME}-mgt-api + safeline-mgt: + container_name: ${CONTAINER_NAME}-mgt restart: always networks: 1panel-network: safeline-ce: ipv4_address: ${SUBNET_PREFIX}.4 - image: chaitin/safeline-mgt-api:3.16.1 + image: chaitin/safeline-mgt:4.0.0 volumes: - - ${SAFELINE_DIR}/resources/management:/resources/management - - ${SAFELINE_DIR}/resources/nginx:/resources/nginx - - ${SAFELINE_DIR}/logs:/logs - /etc/localtime:/etc/localtime:ro + - ${SAFELINE_DIR}/resources/mgt:/app/data ports: - ${PANEL_APP_PORT_HTTP:-9443}:1443 environment: - - MANAGEMENT_RESOURCES_DIR=/resources/management - - NGINX_RESOURCES_DIR=/resources/nginx - - DATABASE_URL=postgres://safeline-ce:${POSTGRES_PASSWORD}@safeline-postgres/safeline-ce - - MARIO_URL=http://safeline-mario:3335 - - FVM_MANAGER_URL=safeline-fvm-manager:9004 - - MANAGEMENT_LOGS_DIR=/logs/management + - MGT_PG=postgres://safeline-ce:${POSTGRES_PASSWORD}@safeline-pg/safeline-ce?sslmode=disable + #- MGT_LICENSE_SERVER=https://safeline-ce-4463.rivers.chaitin.cn/ dns: - 119.29.29.29 - 223.5.5.5 @@ -29,8 +23,9 @@ services: - 1.2.4.8 - 114.114.114.114 - 8.8.8.8 - cap_drop: - - net_raw + depends_on: + - safeline-pg + - safeline-fvm labels: createdBy: Apps @@ -41,15 +36,13 @@ services: 1panel-network: safeline-ce: ipv4_address: ${SUBNET_PREFIX}.5 - image: chaitin/safeline-detector:3.16.1 + image: chaitin/safeline-detector:4.0.0 volumes: - ${SAFELINE_DIR}/resources/detector:/resources/detector - ${SAFELINE_DIR}/logs/detector:/logs/detector - /etc/localtime:/etc/localtime:ro environment: - LOG_DIR=/logs/detector - cap_drop: - - net_raw labels: createdBy: Apps @@ -60,7 +53,7 @@ services: 1panel-network: safeline-ce: ipv4_address: ${SUBNET_PREFIX}.6 - image: chaitin/safeline-mario:3.16.1 + image: chaitin/safeline-mario:4.0.0 volumes: - ${SAFELINE_DIR}/resources/mario:/resources/mario - ${SAFELINE_DIR}/logs/mario:/logs/mario @@ -68,67 +61,71 @@ services: environment: - LOG_DIR=/logs/mario - GOGC=100 - - DATABASE_URL=postgres://safeline-ce:${POSTGRES_PASSWORD}@safeline-postgres/safeline-ce - cap_drop: - - net_raw + - DATABASE_URL=postgres://safeline-ce:${POSTGRES_PASSWORD}@safeline-pg/safeline-ce labels: createdBy: Apps safeline-tengine: container_name: ${CONTAINER_NAME}-tengine restart: always - image: chaitin/safeline-tengine:3.16.1 + image: chaitin/safeline-tengine:4.0.0 volumes: + - /etc/localtime:/etc/localtime:ro + - /etc/resolv.conf:/etc/resolv.conf - ${SAFELINE_DIR}/resources/nginx:/etc/nginx - - ${SAFELINE_DIR}/resources/management:/resources/management - ${SAFELINE_DIR}/resources/detector:/resources/detector - ${SAFELINE_DIR}/logs/nginx:/var/log/nginx - - /etc/localtime:/etc/localtime:ro - ${SAFELINE_DIR}/resources/cache:/usr/local/nginx/cache - - /etc/resolv.conf:/etc/resolv.conf environment: - - MGT_API=https://${SUBNET_PREFIX}.4:1443/api/publish/server + - TCD_MGT_API=https://${SUBNET_PREFIX}.4:1443/api/open/publish/server + - SNSERVER_ADDR=${SUBNET_PREFIX}.5:8000 ulimits: nofile: 131072 network_mode: host labels: createdBy: Apps - fvm-manager: - container_name: ${CONTAINER_NAME}-fvm-manager + safeline-luigi: + container_name: ${CONTAINER_NAME}-luigi + restart: always + networks: + 1panel-network: + safeline-ce: + ipv4_address: ${SUBNET_PREFIX}.7 + image: chaitin/safeline-luigi:4.0.0 + volumes: + - /etc/localtime:/etc/localtime:ro + - ${SAFELINE_DIR}/resources/luigi:/app/data + labels: + createdBy: Apps + + safeline-fvm: + container_name: ${CONTAINER_NAME}-fvm restart: always networks: 1panel-network: safeline-ce: ipv4_address: ${SUBNET_PREFIX}.8 - image: chaitin/safeline-fvm-manager:3.16.1 + image: chaitin/safeline-fvm:4.0.0 volumes: - /etc/localtime:/etc/localtime:ro - - ${SAFELINE_DIR}/logs:/logs - environment: - - FVM_LOGS_DIR=/logs/management - - DETECTOR_URL=http://safeline-detector:8001 - cap_drop: - - net_raw labels: createdBy: Apps - safeline-postgres: - container_name: ${CONTAINER_NAME}-postgres + safeline-pg: + container_name: ${CONTAINER_NAME}-pg restart: always networks: 1panel-network: safeline-ce: ipv4_address: ${SUBNET_PREFIX}.2 - image: postgres:15.5-bookworm + image: postgres:15.5-alpine volumes: - ${SAFELINE_DIR}/resources/postgres/data:/var/lib/postgresql/data - /etc/localtime:/etc/localtime:ro environment: - POSTGRES_USER=safeline-ce - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} - cap_drop: - - net_raw command: [postgres, -c, max_connections=200] labels: createdBy: Apps diff --git a/apps/safeline/newnet-latest/docker-compose.yml b/apps/safeline/newnet-latest/docker-compose.yml index 3c828a111..6392fb7dd 100644 --- a/apps/safeline/newnet-latest/docker-compose.yml +++ b/apps/safeline/newnet-latest/docker-compose.yml @@ -1,27 +1,21 @@ version: '3' services: - safeline-management: - container_name: ${CONTAINER_NAME}-mgt-api + safeline-mgt: + container_name: ${CONTAINER_NAME}-mgt restart: always networks: 1panel-network: safeline-ce: ipv4_address: ${SUBNET_PREFIX}.4 - image: chaitin/safeline-mgt-api:latest + image: chaitin/safeline-mgt:latest volumes: - - ${SAFELINE_DIR}/resources/management:/resources/management - - ${SAFELINE_DIR}/resources/nginx:/resources/nginx - - ${SAFELINE_DIR}/logs:/logs - /etc/localtime:/etc/localtime:ro + - ${SAFELINE_DIR}/resources/mgt:/app/data ports: - ${PANEL_APP_PORT_HTTP:-9443}:1443 environment: - - MANAGEMENT_RESOURCES_DIR=/resources/management - - NGINX_RESOURCES_DIR=/resources/nginx - - DATABASE_URL=postgres://safeline-ce:${POSTGRES_PASSWORD}@safeline-postgres/safeline-ce - - MARIO_URL=http://safeline-mario:3335 - - FVM_MANAGER_URL=safeline-fvm-manager:9004 - - MANAGEMENT_LOGS_DIR=/logs/management + - MGT_PG=postgres://safeline-ce:${POSTGRES_PASSWORD}@safeline-pg/safeline-ce?sslmode=disable + #- MGT_LICENSE_SERVER=https://safeline-ce-4463.rivers.chaitin.cn/ dns: - 119.29.29.29 - 223.5.5.5 @@ -29,8 +23,9 @@ services: - 1.2.4.8 - 114.114.114.114 - 8.8.8.8 - cap_drop: - - net_raw + depends_on: + - safeline-pg + - safeline-fvm labels: createdBy: Apps @@ -48,8 +43,6 @@ services: - /etc/localtime:/etc/localtime:ro environment: - LOG_DIR=/logs/detector - cap_drop: - - net_raw labels: createdBy: Apps @@ -68,9 +61,7 @@ services: environment: - LOG_DIR=/logs/mario - GOGC=100 - - DATABASE_URL=postgres://safeline-ce:${POSTGRES_PASSWORD}@safeline-postgres/safeline-ce - cap_drop: - - net_raw + - DATABASE_URL=postgres://safeline-ce:${POSTGRES_PASSWORD}@safeline-pg/safeline-ce labels: createdBy: Apps @@ -79,56 +70,62 @@ services: restart: always image: chaitin/safeline-tengine:latest volumes: + - /etc/localtime:/etc/localtime:ro + - /etc/resolv.conf:/etc/resolv.conf - ${SAFELINE_DIR}/resources/nginx:/etc/nginx - - ${SAFELINE_DIR}/resources/management:/resources/management - ${SAFELINE_DIR}/resources/detector:/resources/detector - ${SAFELINE_DIR}/logs/nginx:/var/log/nginx - - /etc/localtime:/etc/localtime:ro - ${SAFELINE_DIR}/resources/cache:/usr/local/nginx/cache - - /etc/resolv.conf:/etc/resolv.conf environment: - - MGT_API=https://${SUBNET_PREFIX}.4:1443/api/publish/server + - TCD_MGT_API=https://${SUBNET_PREFIX}.4:1443/api/open/publish/server + - SNSERVER_ADDR=${SUBNET_PREFIX}.5:8000 ulimits: nofile: 131072 network_mode: host labels: createdBy: Apps - fvm-manager: - container_name: ${CONTAINER_NAME}-fvm-manager + safeline-luigi: + container_name: ${CONTAINER_NAME}-luigi + restart: always + networks: + 1panel-network: + safeline-ce: + ipv4_address: ${SUBNET_PREFIX}.7 + image: chaitin/safeline-luigi:latest + volumes: + - /etc/localtime:/etc/localtime:ro + - ${SAFELINE_DIR}/resources/luigi:/app/data + labels: + createdBy: Apps + + safeline-fvm: + container_name: ${CONTAINER_NAME}-fvm restart: always networks: 1panel-network: safeline-ce: ipv4_address: ${SUBNET_PREFIX}.8 - image: chaitin/safeline-fvm-manager:latest + image: chaitin/safeline-fvm:latest volumes: - /etc/localtime:/etc/localtime:ro - - ${SAFELINE_DIR}/logs:/logs - environment: - - FVM_LOGS_DIR=/logs/management - - DETECTOR_URL=http://safeline-detector:8001 - cap_drop: - - net_raw labels: createdBy: Apps - safeline-postgres: - container_name: ${CONTAINER_NAME}-postgres + safeline-pg: + container_name: ${CONTAINER_NAME}-pg restart: always networks: 1panel-network: safeline-ce: ipv4_address: ${SUBNET_PREFIX}.2 - image: postgres:15.4-bookworm + image: postgres:15-alpine volumes: - ${SAFELINE_DIR}/resources/postgres/data:/var/lib/postgresql/data - /etc/localtime:/etc/localtime:ro environment: - POSTGRES_USER=safeline-ce - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} - cap_drop: - - net_raw command: [postgres, -c, max_connections=200] labels: createdBy: Apps