From d4bbcc0cfba15dfb684f043e4b43ac887443aad0 Mon Sep 17 00:00:00 2001 From: Xiang Dai <764524258@qq.com> Date: Thu, 21 Feb 2019 10:53:33 +0800 Subject: [PATCH] delete all duplicate empty blanks Signed-off-by: Xiang Dai <764524258@qq.com> --- .github/PULL_REQUEST_TEMPLATE.md | 8 ++++---- cases/ci/drone.md | 4 ++-- coreos/intro_tools.md | 2 +- data_management/bind-mounts.md | 2 +- etcd/cluster.md | 2 +- etcd/demo/cluster/docker-compose.yml | 2 +- image/multistage-builds/README.md | 8 ++++---- image/multistage-builds/laravel.md | 2 +- install/centos.md | 2 +- install/debian.md | 2 +- install/raspberry-pi.md | 2 +- install/ubuntu.md | 2 +- repository/nexus3_registry.md | 6 +++--- swarm_mode/create.md | 4 ++-- 14 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 460deb2..39d35fd 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,20 +1,20 @@ ### Proposed changes (Mandatory) ### Fix issues (Optional) diff --git a/cases/ci/drone.md b/cases/ci/drone.md index 0d617e8..2e22b05 100644 --- a/cases/ci/drone.md +++ b/cases/ci/drone.md @@ -67,7 +67,7 @@ services: dns: 114.114.114.114 volumes: - drone-data: + drone-data: ``` 替换 `${SSL_PATH}` 为你网站的 SSL 证书路径。 @@ -117,7 +117,7 @@ package main import "fmt" -func main(){ +func main(){ fmt.Printf("Hello World!"); } ``` diff --git a/coreos/intro_tools.md b/coreos/intro_tools.md index 8c67921..0bb6383 100644 --- a/coreos/intro_tools.md +++ b/coreos/intro_tools.md @@ -13,7 +13,7 @@ UUID APP IMAGE NAME STATE CREATED STARTED NETWORKS 57581644 etcd quay.io/coreos/etcd:v3.2.10 running 1 minute ago 1 minute ago ``` -`etcd` 使用方法请查看 [etcd 章节](../etcd/)。 +`etcd` 使用方法请查看 [etcd 章节](../etcd/)。 ## 容器管理 diff --git a/data_management/bind-mounts.md b/data_management/bind-mounts.md index a98165f..6d0bef7 100644 --- a/data_management/bind-mounts.md +++ b/data_management/bind-mounts.md @@ -69,7 +69,7 @@ $ docker run --rm -it \ root@2affd44b4667:/# history 1 ls -2 diskutil list +2 diskutil list ``` 这样就可以记录在容器输入过的命令了。 diff --git a/etcd/cluster.md b/etcd/cluster.md index 64da797..fe7b270 100644 --- a/etcd/cluster.md +++ b/etcd/cluster.md @@ -14,7 +14,7 @@ services: - node1-data:/etcd-data expose: - 2379 - - 2380 + - 2380 networks: cluster_net: ipv4_address: 172.16.238.100 diff --git a/etcd/demo/cluster/docker-compose.yml b/etcd/demo/cluster/docker-compose.yml index 0258269..2a365d5 100644 --- a/etcd/demo/cluster/docker-compose.yml +++ b/etcd/demo/cluster/docker-compose.yml @@ -7,7 +7,7 @@ services: - node1-data:/etcd-data expose: - 2379 - - 2380 + - 2380 networks: cluster_net: ipv4_address: 172.16.238.100 diff --git a/image/multistage-builds/README.md b/image/multistage-builds/README.md index 986674c..59c3707 100644 --- a/image/multistage-builds/README.md +++ b/image/multistage-builds/README.md @@ -15,11 +15,11 @@ 例如，编写 `app.go` 文件，该程序输出 `Hello World!` ```go -package main +package main -import "fmt" +import "fmt" -func main(){ +func main(){ fmt.Printf("Hello World!"); } ``` @@ -146,7 +146,7 @@ WORKDIR /root/ COPY --from=0 /go/src/github.com/go/helloworld/app . -CMD ["./app"] +CMD ["./app"] ``` 构建镜像 diff --git a/image/multistage-builds/laravel.md b/image/multistage-builds/laravel.md index e295466..1209aec 100644 --- a/image/multistage-builds/laravel.md +++ b/image/multistage-builds/laravel.md @@ -62,7 +62,7 @@ COPY webpack.mix.js /app/ COPY resources/assets/ /app/resources/assets/ RUN cd /app \ - && npm run production + && npm run production ``` ### 安装 Composer 依赖 diff --git a/install/centos.md b/install/centos.md index 89a2fde..8c986a7 100644 --- a/install/centos.md +++ b/install/centos.md @@ -48,7 +48,7 @@ $ sudo yum-config-manager \ # 官方源 # $ sudo yum-config-manager \ # --add-repo \ -# https://download.docker.com/linux/centos/docker-ce.repo +# https://download.docker.com/linux/centos/docker-ce.repo ``` 如果需要测试版本的 Docker CE 请使用以下命令： diff --git a/install/debian.md b/install/debian.md index 74ffd91..e6dd720 100644 --- a/install/debian.md +++ b/install/debian.md @@ -83,7 +83,7 @@ $ sudo add-apt-repository \ # $ sudo add-apt-repository \ # "deb [arch=amd64] https://download.docker.com/linux/debian \ # $(lsb_release -cs) \ -# stable" +# stable" ``` >以上命令会添加稳定版本的 Docker CE APT 源，如果需要测试或每日构建版本的 Docker CE 请将 stable 改为 test 或者 nightly。 diff --git a/install/raspberry-pi.md b/install/raspberry-pi.md index 787ab78..2d5fffd 100644 --- a/install/raspberry-pi.md +++ b/install/raspberry-pi.md @@ -55,7 +55,7 @@ $ sudo add-apt-repository \ # $ sudo add-apt-repository \ # "deb [arch=armhf] https://download.docker.com/linux/raspbian \ # $(lsb_release -cs) \ -# stable" +# stable" ``` >以上命令会添加稳定版本的 Docker CE APT 源，如果需要测试或每日构建版本的 Docker CE 请将 stable 改为 test 或者 nightly。 diff --git a/install/ubuntu.md b/install/ubuntu.md index e681fd8..b0ecd4c 100644 --- a/install/ubuntu.md +++ b/install/ubuntu.md @@ -81,7 +81,7 @@ $ sudo add-apt-repository \ # $ sudo add-apt-repository \ # "deb [arch=amd64] https://download.docker.com/linux/ubuntu \ # $(lsb_release -cs) \ -# stable" +# stable" ``` >以上命令会添加稳定版本的 Docker CE APT 镜像源，如果需要测试或每日构建版本的 Docker CE 请将 stable 改为 test 或者 nightly。 diff --git a/repository/nexus3_registry.md b/repository/nexus3_registry.md index 7e2dbea..45a6ae6 100644 --- a/repository/nexus3_registry.md +++ b/repository/nexus3_registry.md @@ -2,7 +2,7 @@ 使用 Docker 官方的 Registry 创建的仓库面临一些维护问题。比如某些镜像删除以后空间默认是不会回收的，需要一些命令去回收空间然后重启 Registry 程序。在企业中把内部的一些工具包放入 Nexus 中是比较常见的做法，最新版本 `Nexus3.x` 全面支持 Docker 的私有镜像。所以使用 [`Nexus3.x`](https://www.sonatype.com/download-oss-sonatype/) 一个软件来管理 `Docker` , `Maven` , `Yum` , `PyPI` 等是一个明智的选择。 -### 启动 Nexus 容器 +### 启动 Nexus 容器 ```bash $ docker run -d --name nexus3 --restart=always \ @@ -52,10 +52,10 @@ upstream register server { server_name YourDomainName;#如果没有 DNS 服务器做解析，请删除此选项使用本机 IP 地址访问 listen 443 ssl; - + ssl_certificate key/example.crt; ssl_certificate_key key/example.key; - + ssl_session_timeout 5m; ssl_protocols TLSv1 TLSv1.1 TLSv1.2; ssl_ciphers HIGH:!aNULL:!MD5; diff --git a/swarm_mode/create.md b/swarm_mode/create.md index 07450ec..4e35b61 100644 --- a/swarm_mode/create.md +++ b/swarm_mode/create.md @@ -46,7 +46,7 @@ docker@worker1:~$ docker swarm join \ --token SWMTKN-1-49nj1cmql0jkz5s954yi3oex3nedyz0fb0xx14ie39trti4wxv-8vxv8rssmk743ojnwacrr2e7c \ 192.168.99.100:2377 -This node joined a swarm as a worker. +This node joined a swarm as a worker. ``` ```bash @@ -58,7 +58,7 @@ docker@worker1:~$ docker swarm join \ --token SWMTKN-1-49nj1cmql0jkz5s954yi3oex3nedyz0fb0xx14ie39trti4wxv-8vxv8rssmk743ojnwacrr2e7c \ 192.168.99.100:2377 -This node joined a swarm as a worker. +This node joined a swarm as a worker. ``` >注意：一些细心的读者可能通过 `docker-machine create --help` 查看到 `--swarm*` 等一系列参数。该参数是用于旧的 `Docker Swarm`,与本章所讲的 `Swarm mode` 没有关系。