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
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
milhu
8e976258b5
Update .bashrc_docker for CentOS usage
...
resolve invalid option error and able to find nsenter automatically if it has been installed with path notified
2015-05-08 11:21:02 +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
Fu Wei
d61a0b7677
Fix typo in container/import_export.md:
...
test/buntu:v1.0 to test/ubuntu:v1.0
2015-04-27 15:46:37 +08:00
yeasy
da6bb5f174
Merge pull request #51 from custa/master
...
Fix typos and expression format.
2015-03-15 19:17:40 +08:00
custa
fd92e6e343
Update tomcat.md
...
排版错误
2015-03-12 16:36:11 +08:00
custa
39cb5ffa88
放到
...
错别字: 方到 -> 放到
2015-03-12 16:18:35 +08:00
custa
b66e84fb84
Update supervisor.md
...
### 安装 ssh、apache 和 supervisor
2015-03-12 16:17:18 +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
custa
9df06628d2
Update linking.md
2015-03-11 09:52:45 +08:00
custa
c1844c1345
Update container.md
2015-03-11 09:48:35 +08:00
waitfish
53b75686d7
Change QQ
2015-02-28 16:11:54 +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
xiaolinzi
2fc168142c
复制控制器
2015-02-26 18:16:08 +08:00
xiaolinzi
c06250ee20
kubernetes写到第二节
2015-02-26 18:16:08 +08:00
xiaolinzi
815aca0279
readme done
2015-02-26 18:16:08 +08:00
xiaolin
1c194b4738
test
2015-02-26 18:16:08 +08:00
Young Yang
6b1a7e5028
simple typo
2015-02-23 10:25:27 +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
Young Yang
76fcc36ac9
just a simple type error
2015-02-12 22:48:10 +08:00
yeasy
6fb92461c4
Merge pull request #45 from zhangbaitong/master
...
fix url format
2015-02-12 14:01:32 +08:00
zhangbaitong
86a4b061b0
fix url format
2015-02-12 13:42:06 +08:00
yeasy
cba7c8017e
Merge pull request #44 from zhangbaitong/master
...
fix url format
2015-02-12 12:04:46 +08:00
zhangbaitong
b7ed0ab7a4
fix url format
2015-02-12 11:56:29 +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
zhangbaitong
bf63c11c05
add coreos section
2015-01-31 12:47:27 +08:00
zhangbaitong
7cd6a94dc4
add coreos section
2015-01-31 12:43:20 +08:00