From 05b9e83467db46b3ddd4035a14473fa5e73e101a Mon Sep 17 00:00:00 2001 From: Stille Date: Fri, 22 Jul 2022 00:28:48 +0800 Subject: [PATCH] update --- Dockerfile | 4 ++-- README.md | 26 +++++++++++++++++++++----- docker-compose.yml | 14 ++++++++++++++ web/img/clients/ZA.png | Bin 0 -> 5896 bytes 4 files changed, 37 insertions(+), 7 deletions(-) create mode 100644 docker-compose.yml create mode 100644 web/img/clients/ZA.png diff --git a/Dockerfile b/Dockerfile index 83efc6b..2232578 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM ubuntu:bionic-20200112 as builder -MAINTAINER Stille +LABEL maintainer="Stille " ENV VERSION 2.0 WORKDIR / @@ -11,7 +11,7 @@ RUN apt-get update && \ cp -rf /web /usr/local/ServerStatus/ FROM nginx:1.17.8 -MAINTAINER Stille +LABEL maintainer="Stille " COPY --from=builder /usr/local/ServerStatus/server /ServerStatus/server/ COPY --from=builder /usr/local/ServerStatus/web /usr/share/nginx/html/ diff --git a/README.md b/README.md index b4c1c0c..2a79f6e 100644 --- a/README.md +++ b/README.md @@ -9,26 +9,37 @@ ServerStatus 在 GitHub 上已经有各种版本,本项目是基于 [ToyoDAdoubi **2021-06-06** 更新 docker 镜像同时支持 X86 和 ARM ## 部署 -### 创建配置文件 +### docker 部署 推荐直接 **git clone** 本仓库到服务器 **/root** 目录内.或者手动下载仓库中的 **config.json** 至 **/root/ServerStatus/** 目录内. ```shell cd /root git clone https://github.com/stilleshan/ServerStatus.git ``` -### 启动容器 示例 **8888** 端口为 Web 访问端口, **35601** 为客户端通信端口,根据需求自行修改映射端口.注意防火墙需放行此端口. ```shell -docker run -d --name=serverstatus --restart=always -p 8888:80 -p 35601:35601 -v ~/ServerStatus/config.json:/ServerStatus/server/config.json stilleshan/serverstatus +docker run -d --name=serverstatus --restart=always \ + -p 8888:80 \ + -p 35601:35601 \ + -v ~/ServerStatus/config.json:/ServerStatus/server/config.json \ + stilleshan/serverstatus ``` +### docker compose 部署 +```shell +cd /root +git clone https://github.com/stilleshan/ServerStatus.git +cd ServerStatus +docker-compose up -d +``` + +## 使用 ### 访问地址 ``` http://服务器IP:8888 ``` > 使用域名和 HTTPS 协议可配置 Nginx 反向代理 - ### 配置 **config.json** 为服务器端配置文件,默认已经添加示例配置,可以根据示例格式修改,删除或者增加服务器.修改完毕后重启容器. ```shell @@ -38,7 +49,12 @@ docker restart serverstatus ### 自定义前端页面 上述默认启动命令没有挂载 web 目录,如需自定义修改前端页面,需 **git clone** 本仓库到服务器 **/root** 目录内,执行以下命令挂载 web 目录. ```shell -docker run -d --name=serverstatus --restart=always -p 8888:80 -p 35601:35601 -v ~/ServerStatus/config.json:/ServerStatus/server/config.json -v ~/ServerStatus/web:/usr/share/nginx/html stilleshan/serverstatus +docker run -d --name=serverstatus --restart=always \ + -p 8888:80 \ + -p 35601:35601 \ + -v ~/ServerStatus/config.json:/ServerStatus/server/config.json \ + -v ~/ServerStatus/web:/usr/share/nginx/html \ + stilleshan/serverstatus ``` ### 客户端 diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..8d08dad --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,14 @@ +version: "3" +services: + serverstatus: + image: stilleshan/serverstatus + container_name: serverstatus + ports: + - 8888:80 + - 35601:35601 + volumes: + # - ./web:/usr/share/nginx/html + - ./config.json:/ServerStatus/server/config.json + environment: + TZ: Asia/Shanghai + restart: always diff --git a/web/img/clients/ZA.png b/web/img/clients/ZA.png new file mode 100644 index 0000000000000000000000000000000000000000..8f97391cdc957612b14a7b5b33c58b7cdb987488 GIT binary patch literal 5896 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