diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index cab11bc..f7d3d63 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -1,5 +1,6 @@ ## 如何贡献项目 -* 领取或创建新的 [Issue](https://github.com/yeasy/docker_practice/issues),如 [issue 235](https://github.com/yeasy/docker_practice/issues/235),添加自己为 Assignee。 + +* 领取或创建新的 [Issue](https://github.com/yeasy/docker_practice/issues),如 [issue 235](https://github.com/yeasy/docker_practice/issues/235),添加自己为 `Assignee`。 * 在 [GitHub](https://github.com/yeasy/docker_practice/fork) 上 `fork` 到自己的仓库,如 `docker_user/docker_practice`,然后 `clone` 到本地,并设置用户信息。 @@ -19,7 +20,7 @@ $ git push ``` -* 在 [GitHub](https://github.com/yeasy/docker_practice/pulls) 上提交 Pull Request,添加标签,并邀请维护者进行 Review。 +* 在 [GitHub](https://github.com/yeasy/docker_practice/pulls) 上提交 `Pull Request`,添加标签,并邀请维护者进行 `Review`。 * 定期使用项目仓库内容更新自己仓库内容。 diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 8997279..85d8009 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -13,11 +13,12 @@ * [ ] Debian 9 * [ ] macOS * [ ] Windows 10 +* [ ] Raspberry Pi (ARM) * [ ] Others (Pls describe below) ### Docker Version - - + + * [x] 17.11 Edge * [ ] 17.09 Stable diff --git a/.gitignore b/.gitignore index d126aa1..e9372eb 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,4 @@ _book/ *.swp *.edx .DS_Store - - node_modules/ diff --git a/.travis/book.json b/.travis/book.json index 855b604..07a348b 100644 --- a/.travis/book.json +++ b/.travis/book.json @@ -8,6 +8,7 @@ } }, "plugins": [ + "-livereload", "image-captions", "github-buttons", "page-treeview" @@ -20,17 +21,17 @@ "caption": "图 _PAGE_LEVEL_._PAGE_IMAGE_NUMBER_ - _CAPTION_" }, "github-buttons": { - "repo": "yeasy/docker_practice", - "types": [ - "star", - "watch" - ], - "size": "small" + "buttons": [{ + "user": "yeasy", + "repo": "docker_practice", + "type": "star", + "size": "small" + }] }, "page-treeview": { "copyright": "Copyright © yeasy", "minHeaderCount": "2", "minHeaderDeep": "2" - } + } } } diff --git a/_layouts/website/page.html b/_layouts/website/page.html deleted file mode 100644 index cabab1b..0000000 --- a/_layouts/website/page.html +++ /dev/null @@ -1,12 +0,0 @@ -{% extends template.self %} - -{% block head %} - {{ super() }} - -{% endblock %} diff --git a/book.json b/book.json index 855b604..07a348b 100644 --- a/book.json +++ b/book.json @@ -8,6 +8,7 @@ } }, "plugins": [ + "-livereload", "image-captions", "github-buttons", "page-treeview" @@ -20,17 +21,17 @@ "caption": "图 _PAGE_LEVEL_._PAGE_IMAGE_NUMBER_ - _CAPTION_" }, "github-buttons": { - "repo": "yeasy/docker_practice", - "types": [ - "star", - "watch" - ], - "size": "small" + "buttons": [{ + "user": "yeasy", + "repo": "docker_practice", + "type": "star", + "size": "small" + }] }, "page-treeview": { "copyright": "Copyright © yeasy", "minHeaderCount": "2", "minHeaderDeep": "2" - } + } } } diff --git a/swarm_mode/create.md b/swarm_mode/create.md index 7f9b149..0cfcc8f 100644 --- a/swarm_mode/create.md +++ b/swarm_mode/create.md @@ -25,7 +25,7 @@ To add a manager to this swarm, run 'docker swarm join-token manager' and follow ### 增加工作节点 -上一步中我们在本机初始化了一个 `Swarm` 集群,拥有了一个管理节点,下面我们使用 [`Docker Machine`](../machine) 创建两个 Docker 主机,并加入到集群中。 +上一步我们在本机初始化了一个 `Swarm` 集群,拥有了一个管理节点,在 [`Docker Machine`](../machine) 一节中我们了解到 `Docker Machine` 可以在数秒内创建一个虚拟的 Docker 主机,下面我们使用它来创建两个 Docker 主机,并加入到集群中。 ```bash $ docker-machine create -d virtualbox worker1 @@ -51,7 +51,7 @@ docker@worker1:~$ docker swarm join \ This node joined a swarm as a worker. ``` -*注意:* 一些细心的读者可能通过 `docker-machine create --help` 查看到 `--swarm*` 等一系列参数。该参数是用于旧的 `Docker Swarm`,与本章所讲的 `Swarm mode` 没有关系。 +>注意:一些细心的读者可能通过 `docker-machine create --help` 查看到 `--swarm*` 等一系列参数。该参数是用于旧的 `Docker Swarm`,与本章所讲的 `Swarm mode` 没有关系。 ### 查看集群