From 3e04648a41b7cd51e9afedd7b7de302512efaa62 Mon Sep 17 00:00:00 2001 From: catroll Date: Wed, 25 May 2016 09:08:53 +0800 Subject: [PATCH 1/3] Update kubernets/intro.md, kubernetes_logo.svg => kubernetes_logo.png --- _images/kubernetes_logo.png | Bin 0 -> 14352 bytes kubernetes/intro.md | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 _images/kubernetes_logo.png diff --git a/_images/kubernetes_logo.png b/_images/kubernetes_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..31286301546d335c51d04946e76271aac16baa17 GIT binary patch literal 14352 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 Date: Wed, 25 May 2016 09:32:05 +0800 Subject: [PATCH 2/3] Update compose/usage.md, repository/dockerhub.md, fix three hyperlink --- compose/usage.md | 2 +- repository/dockerhub.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compose/usage.md b/compose/usage.md index c96d261..d8f63a7 100644 --- a/compose/usage.md +++ b/compose/usage.md @@ -9,7 +9,7 @@ 可见,一个项目可以由多个服务(容器)关联而成,Compose 面向项目进行管理。 ### 场景 -下面,我们创建一个经典的 Web 项目:一个 [Haproxy](www.haproxy.org),挂载三个 Web 容器。 +下面,我们创建一个经典的 Web 项目:一个 [Haproxy](http://www.haproxy.org/),挂载三个 Web 容器。 创建一个 `compose-haproxy-web` 目录,作为项目工作目录,并在其中分别创建两个子目录:`haproxy` 和 `web`。 diff --git a/repository/dockerhub.md b/repository/dockerhub.md index 2493f49..350ec18 100644 --- a/repository/dockerhub.md +++ b/repository/dockerhub.md @@ -43,7 +43,7 @@ Pulling repository centos 自动创建(Automated Builds)功能对于需要经常升级镜像内程序来说,十分方便。 有时候,用户创建了镜像,安装了某个软件,如果软件发布新版本则需要手动更新镜像。。 -而自动创建允许用户通过 Docker Hub 指定跟踪一个目标网站(目前支持 [GitHub](github.org) 或 [BitBucket](bitbucket.org))上的项目,一旦项目发生新的提交,则自动执行创建。 +而自动创建允许用户通过 Docker Hub 指定跟踪一个目标网站(目前支持 [GitHub](https://github.org) 或 [BitBucket](https://bitbucket.org))上的项目,一旦项目发生新的提交,则自动执行创建。 要配置自动创建,包括如下的步骤: * 创建并登录 Docker Hub,以及目标网站; From 0cabecc05f8884530adcfe2a7f42147cf61335f0 Mon Sep 17 00:00:00 2001 From: catroll Date: Wed, 25 May 2016 09:53:45 +0800 Subject: [PATCH 3/3] =?UTF-8?q?Update=20install/debian.md=EF=BC=8CMarkdown?= =?UTF-8?q?=20Error?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- install/debian.md | 71 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 49 insertions(+), 22 deletions(-) diff --git a/install/debian.md b/install/debian.md index 7c501f9..4bb1a1c 100644 --- a/install/debian.md +++ b/install/debian.md @@ -1,32 +1,48 @@ # Debian操作系统安装Docker -##支持的版本 + +## 支持的版本 + - Debian testing stretch (64-bit) - Debian 8.0 Jessie (64-bit) - Debian 7.7 Wheezy (64-bit) -##预安装 -Docker支持64位、内核高于3.10的Debian操作系统,内核低于3.10将导致数据丢失和系统不稳定等问题。 + +## 预安装 + +Docker 支持 64 位、内核高于 3.10 的 Debian 操作系统,内核低于 3.10 将导致数据丢失和系统不稳定等问题。 查看内核版本使用以下命令: + ``` $ uname -r ``` -###更新APT仓库 -Docker的APT仓库包含了1.7.1及以上版本的Docker,安装前需要更新APT设置,来使用新的仓库: -1. 清理旧的仓库信息 + +### 更新APT仓库 + +Docker 的 APT 仓库包含了 1.7.1 及以上版本的 Docker,安装前需要更新 APT 设置,来使用新的仓库: + +#### 1. 清理旧的仓库信息 + ```sh $ apt-get purge lxc-docker* $ apt-get purge docker.io* ``` -2. 更新和安装软件包 + +#### 2. 更新和安装软件包 + ```sh $ apt-get update $ apt-get install apt-transport-https ca-certificates ``` -3. 添加GPG键 + +#### 3. 添加 GPG 键 + ``` $ apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D ``` -4. 添加APT源 -编辑文件 ```/etc/apt/sources.list.d/docker.list```,清理已存在的信息,写入APT源地址内容。以下以Debian Jessie为例,非Jessie版本的系统注意修改为自己对应的代号。 + +#### 4. 添加 APT 源 + +编辑文件 `/etc/apt/sources.list.d/docker.list`,清理已存在的信息,写入APT源地址内容。以下以 Debian Jessie 为例,非 Jessie 版本的系统注意修改为自己对应的代号。 + ```sh $ sudo cat < /etc/apt/sources.list.d/docker.list deb https://apt.dockerproject.org/repo debian-jessie main @@ -34,12 +50,17 @@ EOF ``` 其他两个版本内容: + ``` deb https://apt.dockerproject.org/repo debian-wheezy main ``` -```deb https://apt.dockerproject.org/repo debian-stretch main + ``` -5. 校验安装结果 +deb https://apt.dockerproject.org/repo debian-stretch main +``` + +#### 5. 校验安装结果 + ``` $ apt-cache policy docker-engine docker-engine: @@ -51,28 +72,36 @@ docker-engine: 100 /var/lib/dpkg/status ..... ``` -以后,当执行```apt-get upgrade```等命令时,将使用新设置的的APT源。 -##安装Docker +以后,当执行 `apt-get upgrade` 等命令时,将使用新设置的的 APT 源。 + +## 安装 Docker + ``` $ sudo apt-get install docker-engine ``` -##为非root用户授权 + +## 为非 root 用户授权 + ``` -# 如果没有就建立一个Docker组. +# 如果没有就建立一个 Docker 组 $ sudo groupadd docker -# 增加一个用户(用真实的名字替换下面的${USER})到docker组,需重登陆来生效。 +# 增加一个用户(用真实的名字替换下面的 ${USER})到 Docker 组,需重登陆来生效 $ sudo gpasswd -a ${USER} docker -# 重启docker服务 +# 重启 Docker 服务 $ sudo service docker restart ``` -##更新Docker + +## 更新 Docker + ``` $ apt-get upgrade docker-engine ``` -##卸载Docker + +## 卸载 Docker + ```sh # 卸载软件包 $ sudo apt-get purge docker-engine @@ -82,6 +111,4 @@ $ sudo apt-get autoremove --purge docker-engine #如有必要,执行以下命令,删除全部镜像、容器、数据卷和其他docker相关用户信息: $ rm -rf /var/lib/docker - ``` -