update docker compose

README.md

@@ -21,9 +21,10 @@
 `Docker`:
 
 wget --no-check-certificate -qO ~/serverstatus-config.json https://raw.githubusercontent.com/cppla/ServerStatus/master/server/config.json && mkdir ~/serverstatus-monthtraffic    
-docker run -d --restart=always --name=serverstatus -v ~/serverstatus-config.json:/ServerStatus/server/config.json -v ~/serverstatus-monthtraffic:/usr/share/nginx/html/json -p 80:80 -p 35601:35601 cppla/serverstatus:latest     
+docker run -d --restart=always --name=serverstatus -v ~/serverstatus-config.json:/ServerStatus/server/config.json -v ~/serverstatus-monthtraffic:/usr/share/nginx/html/json -p 80:80 -p 35601:35601 cppla/serverstatus:server     
 
-`Docker-compose(推荐)`: docker-compose up -d
+`Docker-compose`: 
+docker compose -f docker-compose-server.yml up -d
 
 `Dockerfile.server`(本地构建服务端):
 docker build -f Dockerfile.server -t serverstatus-server .
@@ -31,33 +32,35 @@ docker build -f Dockerfile.server -t serverstatus-server .
 
 【客户端】：
 ```bash
-wget --no-check-certificate -qO client-linux.py 'https://raw.githubusercontent.com/cppla/ServerStatus/master/clients/client-linux.py' && nohup python3 client-linux.py SERVER={$SERVER} USER={$USER} PASSWORD={$PASSWORD} >/dev/null 2>&1 &
 
-eg:
+`Shell`:
-wget --no-check-certificate -qO client-linux.py 'https://raw.githubusercontent.com/cppla/ServerStatus/master/clients/client-linux.py' && nohup python3 client-linux.py SERVER=45.79.67.132 USER=s04  >/dev/null 2>&1 &
-```
 
-【客户端 Docker】：
+wget --no-check-certificate -qO client-linux.py 'https://raw.githubusercontent.com/cppla/ServerStatus/master/clients/client-linux.py' && nohup python3 client-linux.py SERVER={$SERVER} USER={$USER} >/dev/null 2>&1 &  
-```bash
+
-# 构建客户端镜像
+`Docker`: 
+docker run --network=host -e SERVER=127.0.0.1 -e USER=s01 cppla/serververstatus:client
+
+`Docker-compose`: 
+docker compose -f docker-compose-client.yml up -d
+
+`Dockerfile.client`(本地构建客户端):
 docker build -f Dockerfile.client -t serverstatus-client .
 
-# 默认 client-linux.py
+`docker环境变量`: 
-docker run --network=host --rm \
+SERVER --- 可选 - 默认 127.0.0.1
-  -e SERVER=127.0.0.1 -e USER=s01 -e PASSWORD=USER_DEFAULT_PASSWORD \
+USER --- 可选 - 默认 s01
-  serverstatus-client
+PORT --- 可选 - 默认 35601
-
+PASSWORD --- 可选 - 默认 USER_DEFAULT_PASSWORD
-# 选择 client-psutil.py
+INTERVAL --- 可选 - 默认 1
-docker run --network=host --rm \
+PROBEPORT --- 可选 - 默认 80
-  -e CLIENT=psutil \
+PROBE_PROTOCOL_PREFER --- 可选 - 默认 ipv4
-  -e SERVER=127.0.0.1 -e USER=s01 -e PASSWORD=USER_DEFAULT_PASSWORD \
+PING_PACKET_HISTORY_LEN --- 可选 - 默认 100
-  serverstatus-client
+CU --- 可选 - 默认 cu.tz.cloudcpp.com
-
+CT --- 可选 - 默认 ct.tz.cloudcpp.com
-# 或直接覆盖命令
+CM --- 可选 - 默认 cm.tz.cloudcpp.com
-docker run --network=host --rm serverstatus-client python3 /app/client-psutil.py
+CLIENT --- 可选 - 默认client, psutil可选
 ```
 
-
 # 教程：     
    
 **【服务端配置】**           

docker-compose-client.yml

@@ -0,0 +1,23 @@
+version: "3"
+services:
+  serverstatus-client:
+    build:
+      context: .
+      dockerfile: Dockerfile.client
+    image: cppla/serverstatus:client
+    container_name: serverstatus-client
+    restart: unless-stopped
+    network_mode: host
+    environment:
+      SERVER: "${SERVER:-127.0.0.1}"
+      USER: "${USER:-s01}"
+      PORT: "${PORT:-35601}"
+      PASSWORD: "${PASSWORD:-USER_DEFAULT_PASSWORD}"
+      INTERVAL: "${INTERVAL:-1}"
+      PROBEPORT: "${PROBEPORT:-80}"
+      PROBE_PROTOCOL_PREFER: "${PROBE_PROTOCOL_PREFER:-ipv4}"
+      PING_PACKET_HISTORY_LEN: "${PING_PACKET_HISTORY_LEN:-100}"
+      CU: "${CU:-cu.tz.cloudcpp.com}"
+      CT: "${CT:-ct.tz.cloudcpp.com}"
+      CM: "${CM:-cm.tz.cloudcpp.com}"
+      CLIENT: "${CLIENT:-linux}"

docker-compose-server.yml

@@ -1,16 +1,16 @@
 version: "3"
 services:
-  serverstatus:
+  serverstatus-server:
     build:
       context: .
-      dockerfile: Dockerfile
+      dockerfile: Dockerfile.server
-    image: cppla/serverstatus:latest
+    image: cppla/serverstatus:server
     healthcheck:
       test: curl --fail http://localhost:80 || bash -c 'kill -s 15 -1 && (sleep 10; kill -s 9 -1)'
       interval: 30s
       timeout: 10s
       retries: 5
-    container_name: serverstatus
+    container_name: serverstatus-server
     restart: unless-stopped
     networks:
       serverstatus-network: