e2544bcb28
release 0.6
2015-12-24 09:44:47 +08:00
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
7d9625ec25
修正镜像创建中json应用描述
2015-12-19 12:13:18 +08:00
3ca35d9638
Merge pull request #79 from GameXG/master
...
fix path error in compose example
2015-12-16 11:31:38 +08:00
c71cf6a731
修正 compose 例子错误
...
数据卷相对路径必须以 . 或 .. 开头，否则会被认为是卷名称，由于存在 “/” 会提示：ERROR: haproxy/haproxy.cfg includes invalid characters for a local volume name, only [a-zA-Z0-9][a-zA-Z0-9_.-] are allowed
参考来源：https://docs.docker.com/compose/compose-file/
You can mount a relative path on the host, which will expand relative to the directory of the Compose configuration file being used. Relative paths should always begin with . or ...
2015-11-26 22:41:28 +08:00
062f008435
Merge pull request #77 from rhinoceros/master
...
Resolve apache2 install dependency error
2015-10-14 13:19:43 +08:00
6158dda40e
Update case/supervisor.md : Resolve apache2 install error
...
Resolve error below:
Step 5 : RUN apt-get install -y openssh-server apache2 supervisor
---> Running in 816b405cf0d1
Reading package lists...
Building dependency tree...
Some packages could not be installed. This may mean that you have
requested an impossible situation or if you are using the unstable
distribution that some required packages have not yet been created
or been moved out of Incoming.
The following information may help to resolve the situation:
The following packages have unmet dependencies:
apache2 : Depends: apache2-mpm-worker (= 2.2.22-1ubuntu1) but it is not going to be installed or
apache2-mpm-prefork (= 2.2.22-1ubuntu1) but it is not going to be installed or
apache2-mpm-event (= 2.2.22-1ubuntu1) but it is not going to be installed or
apache2-mpm-itk (= 2.2.22-1ubuntu1) but it is not going to be installed
Depends: apache2.2-common (= 2.2.22-1ubuntu1) but it is not going to be installed
E: Unable to correct problems, you have held broken packages.
The command '/bin/sh -c apt-get install -y openssh-server apache2 supervisor' returned a non-zero code: 100
2015-10-13 13:53:05 +08:00
692db8b6a2
Merge pull request #76 from zhangbaitong/master
...
Add coreos cluster quickstart section
2015-09-28 17:41:00 +08:00
3291d4795f
coreos cluster quickstart section
2015-09-28 17:33:45 +08:00
bfecf409ea
Merge pull request #75 from zhangbaitong/master
...
Add coreos tools intro section
2015-09-28 15:15:02 +08:00
eb32546e3c
coreos tools intro section
2015-09-28 11:43:40 +08:00
cd59aaf167
Merge pull request #73 from zhangbaitong/master
...
Add coreos intro section
2015-09-06 08:58:22 +08:00
6066e9cc5a
coreos intro
2015-09-06 08:50:13 +08:00
4d60922fa3
Merge pull request #72 from dayiguizhen/patch-4
...
use -d to boot contianer
2015-08-28 17:55:33 +08:00
14fddb18be
Update usage.md
...
更改加入集群的参数命令
2015-08-26 13:24:48 +08:00
0dfe3ebcce
Merge pull request #71 from dayiguizhen/patch-3
...
Fix swarm starting missing flag
2015-08-25 13:57:10 +08:00
99df02f626
Update usage.md
...
修改swarm加入集群的参数
2015-08-25 13:53:02 +08:00
0a4bd48a79
Merge pull request #70 from dayiguizhen/patch-2
...
Update the figure url
2015-08-25 10:36:36 +08:00
9956994b76
Update intro.md
...
修改图片的地址
2015-08-25 10:32:53 +08:00
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
950dadf54d
Fix issue #68 : 在5.2 守护状态运行中，命令错误
2015-08-18 10:07:45 +08:00
a7d45c5a16
Merge pull request #67 from dayiguizhen/patch-1
...
Update daemon.md
2015-08-03 10:08:32 +08:00
a435453b80
Update daemon.md
...
docker run -d 的含义是在后台运行容器并且输出容器的ID(Run container in background and print container ID)，而不是以守护态运行容器。
2015-08-02 15:43:04 +08:00
5ba3d7b007
Merge branch 'master' of github.com:yeasy/docker_practice
2015-07-16 15:35:13 +08:00
bace19fdc0
Add more details on docker machine
2015-07-16 15:34:54 +08:00
76d8382136
reformat
2015-07-16 14:26:47 +08:00
17ecc5d33d
Replace compose logo with latest version
2015-07-16 14:26:23 +08:00
8043983d75
Merge pull request #66 from dayiguizhen/patch-1
...
fix link with http prefix
2015-07-15 16:14:46 +08:00
28c1490fc6
如果是docker.com是打不开的
...
会转到下面这个链接。
https://github.com/yeasy/docker_practice/blob/master/docker.com
2015-07-15 16:11:46 +08:00
f633c14de3
Fix issue#64, duplicated words
2015-07-07 11:08:58 +08:00
f026a1bee0
Merge pull request #62 from jzk/cleanup
...
add commands to cleanup unused containers and images
2015-07-05 10:37:31 +08:00
e0d2d0997f
Merge pull request #61 from jzk/datavolume
...
Data volume expression revise.
2015-07-05 10:36:04 +08:00
60ec1bf62c
add sections to cleanup unused containers and images
2015-07-03 16:52:47 +08:00
977221c5d1
add an example to validate restored data from data volume container
2015-07-03 16:23:46 +08:00
72144f1032
fix a few vague descriptions for data volumes containers and backup/restore
2015-07-03 16:19:51 +08:00
62aa90a3bf
add/correct lifecycle information for data volumes
2015-07-03 16:17:28 +08:00
94c15606b3
Add mesos framework
2015-06-30 17:11:45 +08:00
215a5dec0b
Add mesos chapter
2015-06-29 18:20:31 +08:00
2a6620036f
Add the architecture design for k8s
2015-06-08 11:19:52 +08:00
c5a5656220
Refine the kubernetes chapter's structure
2015-06-08 10:51:42 +08:00
0e87b70fbf
Add the section of kubectl, to be filled
2015-06-08 10:32:13 +08:00
03b1d1ffc0
Add the kubernetes quickstart
2015-06-08 10:26:08 +08:00
eb6683fbd7
Merge pull request #60 from maguowei/master
...
format the expression
2015-06-07 22:36:02 +08:00
345b0703a3
format text
2015-06-07 21:27:32 +08:00
7f4e4145b0
Fix content formatting and typos
2015-05-21 20:23:53 +08:00
c814568560
Split out the swarm scheduling and filter sections
2015-05-21 19:57:58 +08:00
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
a2231978ab
Update usage.md
2015-05-21 19:36:59 +08:00
a3ca178621
Update usage.md
2015-05-20 21:56:41 +08:00
0b607e92a2
Update usage.md
2015-05-20 20:48:11 +08:00
Baohua Yang
lcp
GameXG
rhinoceros.xn
zhangbaitong
dayiguizhen
Chao Mai
Zhenkai Jiang
maguowei
rio-2607