From d17271da2e30a1cb0883d0e0dd09f5e6c2e71254 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=9D=A4=E5=AD=90?= <ktv033@gmail.com>
Date: Fri, 23 Jul 2021 17:03:40 +0800
Subject: [PATCH 1/2] =?UTF-8?q?Docker=E9=83=A8=E5=88=86=E6=96=87=E6=A1=A3?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在 RadeME 增加了  Docker中配置文件变量映射的说明和示例
---
 README.md | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/README.md b/README.md
index 1b02b7a..df08176 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@ AnyLink 服务端仅在CentOS 7、Ubuntu 18.04测试通过，如需要安装在
 > 升级 go version = 1.16
 >
 > 需要提前安装好 golang 和 nodejs
-> 
+>
 > 使用客户端前，必须申请安全的https证书，不支持私有证书连接
 
 ```shell
@@ -89,14 +89,14 @@ sudo ./anylink
 
 > 数据库配置示例
 
-|  db_type   | db_source  |
-|  ----  | ----  |
-| sqlite3  | ./conf/anylink.db |
-| mysql  | user:password@tcp(127.0.0.1:3306)/anylink?charset=utf8 |
-| postgres  | user:password@localhost/anylink?sslmode=verify-full |
+| db_type  | db_source                                              |
+| -------- | ------------------------------------------------------ |
+| sqlite3  | ./conf/anylink.db                                      |
+| mysql    | user:password@tcp(127.0.0.1:3306)/anylink?charset=utf8 |
+| postgres | user:password@localhost/anylink?sslmode=verify-full    |
 
 > 示例配置文件
-> 
+>
 > [conf/server-sample.toml](server/conf/server-sample.toml)
 
 ## Setting
@@ -199,20 +199,23 @@ systemd 脚本放入：
 
    ```bash
    docker run -itd --name anylink --privileged \
-   -p 443:443 -p 8800:8800 \
-   --restart=always \
-   bjdgyc/anylink
+       -p 443:443 -p 8800:8800 \
+       --restart=always \
+       bjdgyc/anylink
    ```
 
 5. 使用自定义参数启动容器
 
    ```bash
    docker run -itd --name anylink --privileged \
-   -e IPV4_CIDR=192.168.10.0/24 \
-   -p 443:443 -p 8800:8800 \
-   --restart=always \
-   bjdgyc/anylink \
-   -c=/etc/server.toml --admin_addr=:8080
+       -e IPV4_CIDR=192.168.10.0/24 \
+       -p 443:443 -p 8800:8800 \
+       --restart=always \
+       bjdgyc/anylink \
+       # "-c=/etc/server.toml" 参数可以指定`server.toml`中多个变量 
+       -c=/etc/server.toml --admin_addr=:8080 \   # WEB管理IP和端口
+       -c=/etc/server.toml --ip_lease = 1209600 \ # IP地址租约时长
+       # -c=/etc/server.toml --<!请参考server.toml内变量!>
    ```
 
 6. 构建镜像
@@ -247,6 +250,7 @@ QQ群共享文件有相关软件下载
 <details>
 <summary>展开查看</summary>
 
+
 ![system.jpg](screenshot/system.jpg)
 ![setting.jpg](screenshot/setting.jpg)
 ![users.jpg](screenshot/users.jpg)
@@ -264,7 +268,3 @@ QQ群共享文件有相关软件下载
 <a href="https://www.jetbrains.com">
     <img src="screenshot/jetbrains.png" width="200" height="200" alt="jetbrains.png" />
 </a>
-
-
-
-

From 96276b8cac6afe96a46d83a01f659bb52de9faeb Mon Sep 17 00:00:00 2001
From: bjdgyc <bjdgyc@163.com>
Date: Fri, 23 Jul 2021 17:24:49 +0800
Subject: [PATCH 2/2] Update README.md

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index df08176..d6a82ca 100644
--- a/README.md
+++ b/README.md
@@ -179,6 +179,8 @@ systemd 脚本放入：
 
    ```bash
    docker pull bjdgyc/anylink:latest
+   # 查看帮助命令信息
+   docker run -it --rm bjdgyc/anylink -h
    ```
 
 2. 生成密码
@@ -212,10 +214,8 @@ systemd 脚本放入：
        -p 443:443 -p 8800:8800 \
        --restart=always \
        bjdgyc/anylink \
-       # "-c=/etc/server.toml" 参数可以指定`server.toml`中多个变量 
-       -c=/etc/server.toml --admin_addr=:8080 \   # WEB管理IP和端口
+       # "-c=/etc/server.toml" 参数可以参考 -h 命令
        -c=/etc/server.toml --ip_lease = 1209600 \ # IP地址租约时长
-       # -c=/etc/server.toml --<!请参考server.toml内变量!>
    ```
 
 6. 构建镜像