3e0c0c6ef6
Merge pull request #121 from twang2218/install-merge
...
Merge installation steps on Ubuntu and Debian
2016-11-13 23:03:15 +08:00
20d632465b
Merge pull request #122 from twang2218/install-mirror
...
Add more refs to registry mirror
2016-11-13 23:02:15 +08:00
f1b622ebfd
Update pull.md
2016-11-13 23:01:49 +08:00
28cfc39b9c
Update repository.md
2016-11-13 23:01:25 +08:00
fc5d514ec1
添加关于加速器配置章节的引用。
2016-11-13 18:39:24 +11:00
8889a6c8c3
修复笔误
...
Signed-off-by: Tao Wang <twang2218@gmail.com>
2016-11-13 18:29:14 +11:00
45cdd756eb
合并 Ubuntu、Debian 安装文档
...
Ubuntu 和 Debian 系统的安装文档很相似，大部分可以共享，因此合并两个安装文档。
2016-11-13 18:24:59 +11:00
a119a30fa5
Merge pull request #118 from twang2218/image-pull
...
Refine image pull chapter
2016-11-13 09:01:29 +08:00
157923420f
Merge branch 'twang2218-install-mirror'
2016-11-13 09:00:08 +08:00
48badeb0a0
Merge branch 'install-mirror' of https://github.com/twang2218/docker_practice into twang2218-install-mirror
2016-11-13 08:59:52 +08:00
3f0b68c21d
Update mirror.md
2016-11-13 08:55:29 +08:00
6c60ad459c
Merge pull request #119 from twang2218/install-mac
...
Add installation on MacOS
2016-11-13 08:54:10 +08:00
f4e95e1215
添加配置加速器章节
...
由于伟大的墙，国内使用 Docker 需要配置加速器才可以访问 Docker Hub，这里添加配置加速器的章节。
2016-11-13 06:48:40 +11:00
aee6aa8fe6
添加 "macOS 安装文档"
2016-11-13 04:08:44 +11:00
3f41302794
改进'获取镜像'章节
...
修正一些表达，以及扩展更多信息。
关于下载缓慢的问题，改为推荐使用加速器，这样可以始终保持官方维护的新版本。因此在前面的安装章节将来需要补充一些安装配置的内容，包括加速器的设置。
2016-11-11 17:22:30 +11:00
6fd3097bd9
Merge pull request #117 from twang2218/sh-to-bash
...
Use bash in grammar marker instead of sh for better compatibility.
2016-11-11 10:23:39 +08:00
df94a6e1fb
将所有的 "```sh" 替换为 "```bash"
...
这样更兼容 prism 避免报错。
2016-11-10 22:48:32 +11:00
d8be8f15a9
Merge pull request #116 from twang2218/install-centos
...
Refine Docker installation on CentOS
2016-11-10 17:39:23 +08:00
c5ac987475
Merge pull request #115 from twang2218/install-debian
...
Refine the installation on Debian
2016-11-10 17:38:54 +08:00
d8858e5e3d
重写 CentOS 安装章节
...
按照 Ubuntu 结构重写 CentOS 安装章节。
去除 CentOS 6，因为已经不再被支持。
2016-11-10 08:55:43 +11:00
c7c5731104
重写 'Debian 安装文档' 并改进 'Ubuntu 安装文档'
...
参照 Ubuntu 文档结构重写 Debian 的文档，很多内容很相似，或许将来有可能将二者合并。
2016-11-10 05:32:55 +11:00
65a1e69462
Merge pull request #114 from WALL-E/fix/nsenter
...
Update new version nsenter cmd
2016-11-09 22:02:16 +08:00
e2158ef4fd
update nsenter comment and download link
2016-11-09 16:16:46 +08:00
5b03c5d974
Merge pull request #112 from twang2218/install-ubuntu
...
Refine installation on Ubuntu
2016-11-09 11:23:37 +08:00
442f829ef5
改进 Ubuntu 安装文档
...
去除 Ubuntu 15.10 的信息，Ubuntu 15.10 的软件生存周期已经结束；
用表格替代命令获取Ubuntu codename 的方式；
以及扩展更多的信息。
2016-11-09 06:18:30 +11:00
c4028b0016
Merge pull request #110 from twang2218/basic_concept
...
Refine the basic concept part
2016-11-08 11:17:02 +08:00
01ff5ca004
修改一些笔误
2016-11-08 08:57:30 +11:00
bdab0474c4
重写基础概念章节
2016-11-08 07:10:11 +11:00
46be5458ef
Merge pull request #109 from twang2218/introduction-why
...
Add more content on why adopt Docker
2016-11-07 10:51:17 +08:00
97d8e43b49
扩展 "为什么要使用 Docker" 文档
...
让文档更结构化，并且调整补充更多的信息
2016-11-07 07:00:17 +11:00
bf3100e68f
Merge pull request #108 from twang2218/introduction-what
...
Add more info on Docker startup
2016-11-06 18:43:24 +08:00
57e97c6375
Fix ref link to wiki
2016-11-06 18:42:34 +08:00
5c66e377f8
补充"什么是Docker"的信息，并且调整文字叙述顺序。
2016-11-06 06:52:43 +11:00
a63448d447
Add new group number
2016-10-29 11:30:26 +08:00
4fdbb1ee33
Merge pull request #107 from WALL-E/fix/swarm
...
Fix typo
2016-10-27 15:02:04 +08:00
9fd3717645
fix the spelling mistakes
2016-10-27 10:34:02 +08:00
8437b4fd1f
Merge pull request #106 from WALL-E/fix/compose
...
Fix haproxy config in compose usage example
2016-10-25 17:26:48 +08:00
3d9982357b
fix compose usage, about haproxy config
2016-10-25 16:10:36 +08:00
b0626d8de8
Add new qq group
2016-09-28 16:50:48 +08:00
e7fffbae3a
Merge pull request #104 from muicoder/master
...
Prettify cmd_logic.png
2016-09-21 14:26:01 +08:00
8a68bf2108
prettify cmd_logic.png
2016-09-21 13:28:35 +08:00
7052c162e3
Merge pull request #103 from muicoder/master
...
Add color to cmd_logic figure
2016-09-20 22:06:30 +08:00
73161f3758
cmd_logic
2016-09-20 17:57:15 +08:00
549d13b717
Merge pull request #102 from likang/patch-1
...
Use better terminologies
2016-09-14 14:23:42 +08:00
dcb2cfe246
better translations
...
Sorry I don't know much about the word 'save-out', but here are some common translations of docker commands in Chinese:
save: 保存
load: 加载
export: 导出
import: 导入
It seems that there is a big difference between 'save' and 'export' in Docker, it will be great if you make a detail explanation :P
2016-09-14 13:37:21 +08:00
e4e10ead0f
fix typo
2016-09-13 16:37:59 +08:00
4e70ce8578
Add new discuss group number
2016-09-02 14:39:25 +08:00
8a2846741b
Merge pull request #100 from vra/master
...
Add missing period
2016-08-24 10:05:07 +08:00
18f3c52ba8
在句尾增加句号
2016-08-23 22:41:26 +08:00
d894237ab5
Merge pull request #99 from muicoder/master
...
Update container event states
2016-08-20 12:27:07 +08:00
Baohua Yang
Tao Wang
Baohua Yang
zhangzheng
muicoder
Kang Li
Yunfeng Wang