From 33bccf2ac44982107bacbc1cd06639b76ec3d84d Mon Sep 17 00:00:00 2001 From: khs1994 Date: Sun, 21 Oct 2018 09:51:36 +0800 Subject: [PATCH] Next version is 1.0.0 --- CHANGELOG.md | 2 +- README.md | 2 +- install/centos.md | 10 +++++----- install/debian.md | 10 +++++----- install/raspberry-pi.md | 8 ++++---- install/ubuntu.md | 11 +++++------ 6 files changed, 21 insertions(+), 22 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 104d12c..4d046f9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ ## 主要修订记录 -* 0.9.1: 2018-07-31 +* 1.0.0: 2018-12-31 * 错误修正 * 0.9.0: 2017-12-31 diff --git a/README.md b/README.md index 6c1a2b4..0bc0f1b 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![](https://img.shields.io/github/stars/yeasy/docker_practice.svg?style=social&label=Stars)](https://github.com/yeasy/docker_practice) [![](https://img.shields.io/docker/pulls/yeasy/docker_practice.svg)](https://store.docker.com/community/images/yeasy/docker_practice) [![](https://travis-ci.org/yeasy/docker_practice.svg?branch=master)](https://travis-ci.org/yeasy/docker_practice) [![](https://img.shields.io/github/release/yeasy/docker_practice/all.svg)](https://github.com/yeasy/docker_practice/releases) [![](https://badges.gitter.im/docker_practice/Lobby.svg)](https://gitter.im/docker_practice/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) -0.9.1 +1.0.0 *说明：本书自 0.9.0 版本起基于最新的 Docker CE v18.X 特性进行讲解。Docker 旧版本（1.13-）使用，请参考 [docker-legacy](https://github.com/yeasy/docker_practice/tree/docker-legacy) 分支。* diff --git a/install/centos.md b/install/centos.md index 339e06c..66623b5 100644 --- a/install/centos.md +++ b/install/centos.md @@ -115,8 +115,8 @@ $ docker run hello-world Unable to find image 'hello-world:latest' locally latest: Pulling from library/hello-world -ca4f61b1923c: Pull complete -Digest: sha256:be0cd392e45be79ffeffa6b05338b98ebb16c87b255f48e297ec7f98e123905c +d1725b59e92d: Pull complete +Digest: sha256:0add3ace90ecb4adbf7777e9aacf18357296e799f81cabc9fde470971e499788 Status: Downloaded newer image for hello-world:latest Hello from Docker! @@ -135,10 +135,10 @@ To try something more ambitious, you can run an Ubuntu container with: $ docker run -it ubuntu bash Share images, automate workflows, and more with a free Docker ID: - https://cloud.docker.com/ + https://hub.docker.com/ For more examples and ideas, visit: - https://docs.docker.com/engine/userguide/ + https://docs.docker.com/get-started/ ``` 若能正常输出以上信息，则说明安装成功。 @@ -173,4 +173,4 @@ $ sudo sysctl -p ### 参考文档 -* [Docker 官方 CentOS 安装文档](https://docs.docker.com/engine/installation/linux/docker-ce/centos/)。 +* [Docker 官方 CentOS 安装文档](https://docs.docker.com/install/linux/docker-ce/centos/)。 diff --git a/install/debian.md b/install/debian.md index feb3929..0797023 100644 --- a/install/debian.md +++ b/install/debian.md @@ -155,8 +155,8 @@ $ docker run hello-world Unable to find image 'hello-world:latest' locally latest: Pulling from library/hello-world -ca4f61b1923c: Pull complete -Digest: sha256:be0cd392e45be79ffeffa6b05338b98ebb16c87b255f48e297ec7f98e123905c +d1725b59e92d: Pull complete +Digest: sha256:0add3ace90ecb4adbf7777e9aacf18357296e799f81cabc9fde470971e499788 Status: Downloaded newer image for hello-world:latest Hello from Docker! @@ -175,10 +175,10 @@ To try something more ambitious, you can run an Ubuntu container with: $ docker run -it ubuntu bash Share images, automate workflows, and more with a free Docker ID: - https://cloud.docker.com/ + https://hub.docker.com/ For more examples and ideas, visit: - https://docs.docker.com/engine/userguide/ + https://docs.docker.com/get-started/ ``` 若能正常输出以上信息，则说明安装成功。 @@ -189,4 +189,4 @@ For more examples and ideas, visit: ### 参考文档 -* [Docker 官方 Debian 安装文档](https://docs.docker.com/engine/installation/linux/docker-ce/debian/) +* [Docker 官方 Debian 安装文档](https://docs.docker.com/install/linux/docker-ce/debian/) diff --git a/install/raspberry-pi.md b/install/raspberry-pi.md index 992cf91..884f923 100644 --- a/install/raspberry-pi.md +++ b/install/raspberry-pi.md @@ -113,8 +113,8 @@ $ docker run arm32v7/hello-world Unable to find image 'hello-world:latest' locally latest: Pulling from library/hello-world -ca4f61b1923c: Pull complete -Digest: sha256:be0cd392e45be79ffeffa6b05338b98ebb16c87b255f48e297ec7f98e123905c +d1725b59e92d: Pull complete +Digest: sha256:0add3ace90ecb4adbf7777e9aacf18357296e799f81cabc9fde470971e499788 Status: Downloaded newer image for hello-world:latest Hello from Docker! @@ -133,10 +133,10 @@ To try something more ambitious, you can run an Ubuntu container with: $ docker run -it ubuntu bash Share images, automate workflows, and more with a free Docker ID: - https://cloud.docker.com/ + https://hub.docker.com/ For more examples and ideas, visit: - https://docs.docker.com/engine/userguide/ + https://docs.docker.com/get-started/ ``` 若能正常输出以上信息，则说明安装成功。 diff --git a/install/ubuntu.md b/install/ubuntu.md index db55c44..1e3425a 100644 --- a/install/ubuntu.md +++ b/install/ubuntu.md @@ -9,7 +9,6 @@ Docker CE 支持以下版本的 [Ubuntu](https://www.ubuntu.com/server) 操作系统： * Bionic 18.04 (LTS) -* Artful 17.10 (Docker CE 17.11 Edge +) * Xenial 16.04 (LTS) * Trusty 14.04 (LTS) @@ -146,8 +145,8 @@ $ docker run hello-world Unable to find image 'hello-world:latest' locally latest: Pulling from library/hello-world -ca4f61b1923c: Pull complete -Digest: sha256:be0cd392e45be79ffeffa6b05338b98ebb16c87b255f48e297ec7f98e123905c +d1725b59e92d: Pull complete +Digest: sha256:0add3ace90ecb4adbf7777e9aacf18357296e799f81cabc9fde470971e499788 Status: Downloaded newer image for hello-world:latest Hello from Docker! @@ -166,10 +165,10 @@ To try something more ambitious, you can run an Ubuntu container with: $ docker run -it ubuntu bash Share images, automate workflows, and more with a free Docker ID: - https://cloud.docker.com/ + https://hub.docker.com/ For more examples and ideas, visit: - https://docs.docker.com/engine/userguide/ + https://docs.docker.com/get-started/ ``` 若能正常输出以上信息，则说明安装成功。 @@ -180,4 +179,4 @@ For more examples and ideas, visit: ### 参考文档 -* [Docker 官方 Ubuntu 安装文档](https://docs.docker.com/engine/installation/linux/docker-ce/ubuntu/) +* [Docker 官方 Ubuntu 安装文档](https://docs.docker.com/install/linux/docker-ce/ubuntu/)