diff --git a/apps/safeline/6.8.0/.env.sample b/apps/safeline/6.9.0/.env.sample similarity index 100% rename from apps/safeline/6.8.0/.env.sample rename to apps/safeline/6.9.0/.env.sample diff --git a/apps/safeline/6.8.0/data.yml b/apps/safeline/6.9.0/data.yml similarity index 100% rename from apps/safeline/6.8.0/data.yml rename to apps/safeline/6.9.0/data.yml diff --git a/apps/safeline/6.8.0/docker-compose.yml b/apps/safeline/6.9.0/docker-compose.yml similarity index 91% rename from apps/safeline/6.8.0/docker-compose.yml rename to apps/safeline/6.9.0/docker-compose.yml index 0eacd754..bb4a551f 100644 --- a/apps/safeline/6.8.0/docker-compose.yml +++ b/apps/safeline/6.9.0/docker-compose.yml @@ -5,11 +5,12 @@ services: networks: 1panel-network: ipv4_address: ${SUBNET_PREFIX}.234 - image: chaitin/safeline-mgt:6.8.0 + image: chaitin/safeline-mgt:6.9.0 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 ports: - ${PANEL_APP_PORT_HTTP:-9443}:1443 healthcheck: @@ -32,7 +33,7 @@ services: networks: 1panel-network: ipv4_address: ${SUBNET_PREFIX}.235 - image: chaitin/safeline-detector:6.8.0 + image: chaitin/safeline-detector:6.9.0 volumes: - ${SAFELINE_DIR}/resources/detector:/resources/detector - ${SAFELINE_DIR}/logs/detector:/logs/detector @@ -48,7 +49,7 @@ services: networks: 1panel-network: ipv4_address: ${SUBNET_PREFIX}.236 - image: chaitin/safeline-mario:6.8.0 + image: chaitin/safeline-mario:6.9.0 volumes: - ${SAFELINE_DIR}/resources/mario:/resources/mario - ${SAFELINE_DIR}/logs/mario:/logs/mario @@ -67,7 +68,7 @@ services: safeline-tengine: container_name: ${CONTAINER_NAME}-tengine restart: always - image: chaitin/safeline-tengine:6.8.0 + image: chaitin/safeline-tengine:6.9.0 volumes: - /etc/localtime:/etc/localtime:ro - /etc/resolv.conf:/etc/resolv.conf:ro @@ -76,6 +77,7 @@ services: - ${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 @@ -91,7 +93,7 @@ services: networks: 1panel-network: ipv4_address: ${SUBNET_PREFIX}.237 - image: chaitin/safeline-luigi:6.8.0 + image: chaitin/safeline-luigi:6.9.0 volumes: - /etc/localtime:/etc/localtime:ro - ${SAFELINE_DIR}/resources/luigi:/app/data @@ -113,7 +115,7 @@ services: networks: 1panel-network: ipv4_address: ${SUBNET_PREFIX}.238 - image: chaitin/safeline-fvm:6.8.0 + image: chaitin/safeline-fvm:6.9.0 volumes: - /etc/localtime:/etc/localtime:ro logging: @@ -129,7 +131,7 @@ services: networks: 1panel-network: ipv4_address: ${SUBNET_PREFIX}.239 - image: chaitin/safeline-bridge:6.8.0 + image: chaitin/safeline-bridge:6.9.0 volumes: - /etc/localtime:/etc/localtime:ro - /var/run:/app/run @@ -174,7 +176,7 @@ services: networks: 1panel-network: ipv4_address: ${SUBNET_PREFIX}.240 - image: chaitin/safeline-chaos:6.8.0 + image: chaitin/safeline-chaos:6.9.0 logging: options: max-size: "100m" diff --git a/apps/safeline/latest/docker-compose.yml b/apps/safeline/latest/docker-compose.yml index b61ec59b..8bf7ca11 100644 --- a/apps/safeline/latest/docker-compose.yml +++ b/apps/safeline/latest/docker-compose.yml @@ -10,6 +10,7 @@ services: - /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 ports: - ${PANEL_APP_PORT_HTTP:-9443}:1443 healthcheck: @@ -76,6 +77,7 @@ services: - ${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 diff --git a/apps/safeline/newnet-6.8.0/.env.sample b/apps/safeline/newnet-6.9.0/.env.sample similarity index 100% rename from apps/safeline/newnet-6.8.0/.env.sample rename to apps/safeline/newnet-6.9.0/.env.sample diff --git a/apps/safeline/newnet-6.8.0/data.yml b/apps/safeline/newnet-6.9.0/data.yml similarity index 100% rename from apps/safeline/newnet-6.8.0/data.yml rename to apps/safeline/newnet-6.9.0/data.yml diff --git a/apps/safeline/newnet-6.8.0/docker-compose.yml b/apps/safeline/newnet-6.9.0/docker-compose.yml similarity index 91% rename from apps/safeline/newnet-6.8.0/docker-compose.yml rename to apps/safeline/newnet-6.9.0/docker-compose.yml index c347d1f4..d11e314d 100644 --- a/apps/safeline/newnet-6.8.0/docker-compose.yml +++ b/apps/safeline/newnet-6.9.0/docker-compose.yml @@ -6,10 +6,12 @@ services: 1panel-network: safeline-ce: ipv4_address: ${SUBNET_PREFIX}.4 - image: chaitin/safeline-mgt:6.8.0 + image: chaitin/safeline-mgt:6.9.0 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 ports: - ${PANEL_APP_PORT_HTTP:-9443}:1443 healthcheck: @@ -33,7 +35,7 @@ services: 1panel-network: safeline-ce: ipv4_address: ${SUBNET_PREFIX}.5 - image: chaitin/safeline-detector:6.8.0 + image: chaitin/safeline-detector:6.9.0 volumes: - ${SAFELINE_DIR}/resources/detector:/resources/detector - ${SAFELINE_DIR}/logs/detector:/logs/detector @@ -50,7 +52,7 @@ services: 1panel-network: safeline-ce: ipv4_address: ${SUBNET_PREFIX}.6 - image: chaitin/safeline-mario:6.8.0 + image: chaitin/safeline-mario:6.9.0 volumes: - ${SAFELINE_DIR}/resources/mario:/resources/mario - ${SAFELINE_DIR}/logs/mario:/logs/mario @@ -69,7 +71,7 @@ services: safeline-tengine: container_name: ${CONTAINER_NAME}-tengine restart: always - image: chaitin/safeline-tengine:6.8.0 + image: chaitin/safeline-tengine:6.9.0 volumes: - /etc/localtime:/etc/localtime:ro - /etc/resolv.conf:/etc/resolv.conf:ro @@ -78,6 +80,7 @@ services: - ${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}.4:1443/api/open/publish/server - SNSERVER_ADDR=${SUBNET_PREFIX}.5:8000 @@ -94,7 +97,7 @@ services: 1panel-network: safeline-ce: ipv4_address: ${SUBNET_PREFIX}.7 - image: chaitin/safeline-luigi:6.8.0 + image: chaitin/safeline-luigi:6.9.0 volumes: - /etc/localtime:/etc/localtime:ro - ${SAFELINE_DIR}/resources/luigi:/app/data @@ -118,7 +121,7 @@ services: 1panel-network: safeline-ce: ipv4_address: ${SUBNET_PREFIX}.8 - image: chaitin/safeline-fvm:6.8.0 + image: chaitin/safeline-fvm:6.9.0 volumes: - /etc/localtime:/etc/localtime:ro logging: @@ -135,7 +138,7 @@ services: 1panel-network: safeline-ce: ipv4_address: ${SUBNET_PREFIX}.9 - image: chaitin/safeline-bridge:6.8.0 + image: chaitin/safeline-bridge:6.9.0 volumes: - /etc/localtime:/etc/localtime:ro - /var/run:/app/run @@ -182,7 +185,7 @@ services: 1panel-network: safeline-ce: ipv4_address: ${SUBNET_PREFIX}.10 - image: chaitin/safeline-chaos:6.8.0 + image: chaitin/safeline-chaos:6.9.0 logging: options: max-size: "100m" diff --git a/apps/safeline/newnet-latest/docker-compose.yml b/apps/safeline/newnet-latest/docker-compose.yml index dffb4960..1b57afac 100644 --- a/apps/safeline/newnet-latest/docker-compose.yml +++ b/apps/safeline/newnet-latest/docker-compose.yml @@ -11,6 +11,7 @@ services: - /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 ports: - ${PANEL_APP_PORT_HTTP:-9443}:1443 healthcheck: @@ -79,6 +80,7 @@ services: - ${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}.4:1443/api/open/publish/server - SNSERVER_ADDR=${SUBNET_PREFIX}.5:8000