460 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
zhangbaitong	6066e9cc5a	coreos intro	2015-09-06 08:50:13 +08:00
yeasy	4d60922fa3	Merge pull request #72 from dayiguizhen/patch-4 ... use -d to boot contianer	2015-08-28 17:55:33 +08:00
dayiguizhen	14fddb18be	Update usage.md ... 更改加入集群的参数命令	2015-08-26 13:24:48 +08:00
yeasy	0dfe3ebcce	Merge pull request #71 from dayiguizhen/patch-3 ... Fix swarm starting missing flag	2015-08-25 13:57:10 +08:00
dayiguizhen	99df02f626	Update usage.md ... 修改swarm加入集群的参数	2015-08-25 13:53:02 +08:00
yeasy	0a4bd48a79	Merge pull request #70 from dayiguizhen/patch-2 ... Update the figure url	2015-08-25 10:36:36 +08:00
dayiguizhen	9956994b76	Update intro.md ... 修改图片的地址	2015-08-25 10:32:53 +08:00
yeasy	e564a7d4da	Merge pull request #69 from ChaoMai/master ... Fix issue #68: Add missing -d flag to run container in background	2015-08-18 10:20:46 +08:00
Chao Mai	950dadf54d	Fix issue #68: 在5.2 守护状态运行中，命令错误	2015-08-18 10:07:45 +08:00
yeasy	a7d45c5a16	Merge pull request #67 from dayiguizhen/patch-1 ... Update daemon.md	2015-08-03 10:08:32 +08:00
dayiguizhen	a435453b80	Update daemon.md ... docker run -d 的含义是在后台运行容器并且输出容器的ID(Run container in background and print container ID)，而不是以守护态运行容器。	2015-08-02 15:43:04 +08:00
Baohua Yang	5ba3d7b007	Merge branch 'master' of github.com:yeasy/docker_practice	2015-07-16 15:35:13 +08:00
Baohua Yang	bace19fdc0	Add more details on docker machine	2015-07-16 15:34:54 +08:00
Baohua Yang	76d8382136	reformat	2015-07-16 14:26:47 +08:00
Baohua Yang	17ecc5d33d	Replace compose logo with latest version	2015-07-16 14:26:23 +08:00
yeasy	8043983d75	Merge pull request #66 from dayiguizhen/patch-1 ... fix link with http prefix	2015-07-15 16:14:46 +08:00
dayiguizhen	28c1490fc6	如果是docker.com是打不开的 ... 会转到下面这个链接。 https://github.com/yeasy/docker_practice/blob/master/docker.com	2015-07-15 16:11:46 +08:00
Baohua Yang	f633c14de3	Fix issue#64, duplicated words	2015-07-07 11:08:58 +08:00
yeasy	f026a1bee0	Merge pull request #62 from jzk/cleanup ... add commands to cleanup unused containers and images	2015-07-05 10:37:31 +08:00
yeasy	e0d2d0997f	Merge pull request #61 from jzk/datavolume ... Data volume expression revise.	2015-07-05 10:36:04 +08:00
Zhenkai Jiang	60ec1bf62c	add sections to cleanup unused containers and images	2015-07-03 16:52:47 +08:00
Zhenkai Jiang	977221c5d1	add an example to validate restored data from data volume container	2015-07-03 16:23:46 +08:00
Zhenkai Jiang	72144f1032	fix a few vague descriptions for data volumes containers and backup/restore	2015-07-03 16:19:51 +08:00
Zhenkai Jiang	62aa90a3bf	add/correct lifecycle information for data volumes	2015-07-03 16:17:28 +08:00
Baohua Yang	94c15606b3	Add mesos framework	2015-06-30 17:11:45 +08:00
Baohua Yang	215a5dec0b	Add mesos chapter	2015-06-29 18:20:31 +08:00
Baohua Yang	2a6620036f	Add the architecture design for k8s	2015-06-08 11:19:52 +08:00
Baohua Yang	c5a5656220	Refine the kubernetes chapter's structure	2015-06-08 10:51:42 +08:00
Baohua Yang	0e87b70fbf	Add the section of kubectl, to be filled	2015-06-08 10:32:13 +08:00
Baohua Yang	03b1d1ffc0	Add the kubernetes quickstart	2015-06-08 10:26:08 +08:00
yeasy	eb6683fbd7	Merge pull request #60 from maguowei/master ... format the expression	2015-06-07 22:36:02 +08:00
maguowei	345b0703a3	format text	2015-06-07 21:27:32 +08:00
Baohua Yang	7f4e4145b0	Fix content formatting and typos	2015-05-21 20:23:53 +08:00
Baohua Yang	c814568560	Split out the swarm scheduling and filter sections	2015-05-21 19:57:58 +08:00
yeasy	4cb1252a98	Merge pull request #59 from rio-2607/rio-docker-practice ... Add the content for the docker-swarm project	2015-05-21 19:47:41 +08:00
rio-2607	a2231978ab	Update usage.md	2015-05-21 19:36:59 +08:00
rio-2607	a3ca178621	Update usage.md	2015-05-20 21:56:41 +08:00
rio-2607	0b607e92a2	Update usage.md	2015-05-20 20:48:11 +08:00
rio-2607	29fcb84407	Update usage.md	2015-05-20 20:44:19 +08:00
rio-2607	d457323780	Update usage.md	2015-05-19 21:32:15 +08:00
rio-2607	f9c545dbfc	update usage.md	2015-05-19 19:58:04 +08:00
rio-2607	ed893bea7e	update intro.md	2015-05-18 21:24:13 +08:00
rio-2607	295b7cdb7f	Update install.md	2015-05-18 20:24:14 +08:00
rio-2607	e4e3cca8d3	update install.md	2015-05-18 20:23:38 +08:00
yeasy	34a3c29865	Merge pull request #58 from UncleBarney/patch-1 ... Correct supervisor container name	2015-05-14 19:48:23 +08:00
Hechen Gao	b30d4a2328	Correct supervisor container name ... The name of the container for configured supervisord container is incorrect. It was: test/supervisords, while in the build step, we tagged it as test/supervisor.	2015-05-13 15:38:49 -07:00
Baohua Yang	5f59530d4c	Add compose quick start example	2015-05-11 14:46:51 +08:00
Baohua Yang	52a1755ce7	Add more options for compose yaml file	2015-05-10 14:56:05 +08:00
Baohua Yang	547ebe6053	Start the swarm chapter	2015-05-08 20:10:44 +08:00
Baohua Yang	fdeeaba0b0	Start the machine chapter	2015-05-08 20:10:34 +08:00