Commit Graph
100 Commits
Author SHA1 Message Date
yeasy 280432204f Merge pull request #84 from ytgs/master
Minor fix terms and add more installation steps.
2016-04-18 11:52:43 +08:00
yeasy c50cfe14e0 Add new qq group number 2016-04-08 17:14:24 +08:00
yeasy 34fc4eee76 Merge pull request #81 from duSupport/master
fix typo
2016-03-01 09:59:44 +08:00
yeasy a6acd08bd0 Update the Centos installation 2016-02-04 15:08:44 +08:00
yeasy 6274d552d6 Update the ubuntu os installation 2016-02-04 14:29:05 +08:00
Baohua Yang e2544bcb28 release 0.6 2015-12-24 09:44:47 +08:00
yeasy 121f498011 Merge pull request #80 from LcpMarvel/image_create_text
fix image building description on installing the json application
2015-12-21 09:27:45 +08:00
yeasy 3ca35d9638 Merge pull request #79 from GameXG/master
fix path error in compose example
2015-12-16 11:31:38 +08:00
yeasy 062f008435 Merge pull request #77 from rhinoceros/master
Resolve apache2 install dependency error
2015-10-14 13:19:43 +08:00
yeasy 692db8b6a2 Merge pull request #76 from zhangbaitong/master
Add coreos cluster quickstart section
2015-09-28 17:41:00 +08:00
yeasy bfecf409ea Merge pull request #75 from zhangbaitong/master
Add coreos tools intro section
2015-09-28 15:15:02 +08:00
yeasy cd59aaf167 Merge pull request #73 from zhangbaitong/master
Add coreos intro section
2015-09-06 08:58:22 +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
yeasy 0dfe3ebcce Merge pull request #71 from dayiguizhen/patch-3
Fix swarm starting missing flag
2015-08-25 13:57:10 +08:00
yeasy 0a4bd48a79 Merge pull request #70 from dayiguizhen/patch-2
Update the figure url
2015-08-25 10:36:36 +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
yeasy a7d45c5a16 Merge pull request #67 from dayiguizhen/patch-1
Update daemon.md
2015-08-03 10:08:32 +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
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
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
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
yeasy 34a3c29865 Merge pull request #58 from UncleBarney/patch-1
Correct supervisor container name
2015-05-14 19:48:23 +08: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
Baohua Yang 8626d13738 Add the compose chapter 2015-05-08 20:10:01 +08:00
yeasy 36127abed9 Merge pull request #57 from milhu/patch-1
Update .bashrc_docker for CentOS usage
2015-05-08 13:12:28 +08:00
Baohua Yang 1d864385af Change version number to 0.4 2015-05-08 10:47:47 +08:00
yeasy 068e2e948b Merge pull request #56 from tekkamanninja/tekkaman_fix
Fix typo in container/import_export.md:
2015-05-04 11:21:25 +08:00
yeasy da6bb5f174 Merge pull request #51 from custa/master
Fix typos and expression format.
2015-03-15 19:17:40 +08:00
Baohua Yang 72f6c252be Remove useless files 2015-03-12 13:41:02 +08:00
Baohua Yang 1b576a7e2a Add the kubernetes chapter into summary 2015-03-12 13:32:39 +08:00
yeasy dee055b261 Merge pull request #50 from custa/master
修改错别字:容器卷->数据卷
2015-03-12 13:22:58 +08:00
yeasy d43fefff44 Merge pull request #48 from weilaihui/master
kubernetes写到第二节
2015-02-26 20:54:38 +08:00
yeasy d4b2e6bee8 Merge pull request #47 from you-n-g/master
Fix simple typo
2015-02-26 20:53:41 +08:00
yeasy 939af1884a Merge pull request #46 from you-n-g/master
just a simple type error
2015-02-21 13:21:04 +08:00
yeasy 6fb92461c4 Merge pull request #45 from zhangbaitong/master
fix url format
2015-02-12 14:01:32 +08:00
yeasy cba7c8017e Merge pull request #44 from zhangbaitong/master
fix url format
2015-02-12 12:04:46 +08:00
yeasy 7a87084d71 Update README.md
v0.3.4
2015-02-03 13:48:47 +08:00
yeasy 6375778e23 Merge pull request #41 from zhangbaitong/master
add CoreOS section
2015-01-31 12:56:18 +08:00
yeasy b445841df7 Merge pull request #40 from copuzzle/master
Fix expression words.
2015-01-22 10:30:32 +08:00
yeasy 340af53f10 Merge pull request #39 from stamhe/master
Fix typos.
2015-01-20 19:34:33 +08:00
yeasy 842a81eb1c Merge pull request #38 from zhangbaitong/master
finished fig env ref
2015-01-15 10:25:48 +08:00
yeasy 92925d2cb3 Merge pull request #37 from zhangbaitong/master
finished fig.yml ref
2015-01-15 08:37:59 +08:00
yeasy 285d69275a Merge pull request #35 from zhangbaitong/master
fix url address
2015-01-14 23:08:27 +08:00
Baohua Yang dd02308d91 Update summary to add recent content 2015-01-14 22:45:23 +08:00
yeasy 2da8779e68 Merge pull request #36 from copuzzle/master
Finish django rails wordpress chapters
2015-01-14 22:38:43 +08:00
yeasy 63264c623c Merge pull request #34 from zhangbaitong/master
update summary for fig cli chapter
2015-01-13 16:20:00 +08:00
yeasy 9a6bc4a1aa Merge pull request #33 from zhangbaitong/master
补充句子中遗留的命令
2015-01-13 16:10:22 +08:00
yeasy 69e0cc2c26 Merge pull request #30 from zhangbaitong/master
修改fig章节表述内容
2015-01-11 19:40:07 +08:00
Baohua Yang a93f3b4d2a Add the fig chapter into summary 2015-01-04 18:19:38 +08:00
yeasy c5fd5f025c Merge pull request #29 from copuzzle/master
Fig 文档翻译, 简介,首页,安装章节
2015-01-04 17:57:06 +08:00
Baohua Yang 971023ddca Minor change words 2014-12-31 18:32:46 +08:00
Baohua Yang a977601251 Update version info in the preface content 2014-12-31 17:20:26 +08:00
Baohua Yang 589148450f Add etcd chapter 2014-12-31 17:11:09 +08:00
Baohua Yang 29b7568853 Start v0.4 writing, minor fix preface content 2014-12-31 10:08:27 +08:00
Baohua Yang 2392ba87ea Add links to china-pub 2014-12-22 09:47:00 +08:00
Baohua Yang d4d430a99e Fix issue #28: maintainer information 2014-12-21 19:27:46 +08:00
Baohua Yang 201a2180a3 Merge branch 'master' of github.com:yeasy/docker_practice 2014-12-21 19:24:45 +08:00
Baohua Yang 070359c511 Refine the preface content 2014-12-21 19:24:20 +08:00
yeasy 7876ec1485 Merge pull request #27 from gaojice/master
试试如何贡献
2014-12-14 11:41:05 +08:00
Baohua Yang 9215e4b88e Publish v0.3 version 2014-11-25 13:38:43 +08:00
Baohua Yang e5a297a7be Update ignore type list 2014-11-07 15:42:25 +08:00
Baohua Yang 34dc895942 Merge branch 'master' of github.com:yeasy/docker_practice 2014-11-07 15:27:30 +08:00
yeasy d858b810be Merge pull request #22 from yougg/patch-1
修改部分错别字及描述信息
2014-11-06 20:34:49 +08:00
Baohua Yang fda6a07a1e Minor update ignore file; Add pull_all and push_all scripts 2014-10-30 15:30:51 +08:00
yeasy f936efebd9 Update push_images.sh 2014-10-26 15:36:52 +08:00
Baohua Yang 16527880fb minor fix space; delete useless file 2014-10-21 13:59:03 +08:00
Baohua Yang cb903202ba Fix issue#20, format following the guidelines 2014-10-14 13:25:01 +08:00
Baohua Yang 9d26f96ba2 Merge branch 'master' of github.com:yeasy/docker_practice 2014-10-12 10:32:14 +08:00
Baohua Yang ed7c2a3ee7 User new dockerpool repo server address 2014-10-12 10:32:04 +08:00
Baohua Yang 894d8ebc62 Merge pull request #19 from luashiping/master
fix expose
2014-10-11 16:35:58 +08:00
Baohua Yang d732713b06 Add dockerfile chapter 2014-10-10 17:30:53 +08:00
Baohua Yang 4e70438202 Rename the network chapter 2014-10-10 09:37:52 +08:00
Baohua Yang 5a642809d9 Minor changes on content 2014-10-10 09:37:15 +08:00
Baohua Yang 06b9651af9 Add more details to help understand repo and registry 2014-10-03 11:41:22 +08:00
Baohua Yang 8117a15804 Add comparison summary with vm 2014-10-03 11:34:57 +08:00
Baohua Yang c48aa47432 minor change, add dockerpool link 2014-09-30 13:39:19 +08:00
Baohua Yang d897954e8a Merge pull request #18 from patriot7/master
fix typo
2014-09-30 12:51:49 +08:00
Baohua Yang 6fa5159bb9 Add new chapters to introduce the popular repositories 2014-09-27 16:06:08 +08:00
Baohua Yang 1faf0eeba6 rename the appendix chapter's directories 2014-09-27 13:26:40 +08:00
Baohua Yang 24191c2ebe Modify the import of bash file 2014-09-26 20:33:00 +08:00
Baohua Yang e94bb1d13b Modify the usage of the bashrc file 2014-09-26 17:52:04 +08:00
Baohua Yang 7896cb5d7b Add more useful command 2014-09-26 17:46:05 +08:00
Baohua Yang d4b8630bca Rewrite the introduction and minor fix 2014-09-26 17:45:51 +08:00