yeasy
/
docker_practice
mirror of https://github.com/yeasy/docker_practice.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
456 Commits
5 Branches
16 Tags
12 MiB
Commit Graph

456 Commits (f2d6f998abfe804745bc700713a7fc20588dfbd3)
 

Author SHA1 Message Date
Yunfeng Wang c0d6cc88d7 在句尾增加句号 2016-07-30 10:50:00 +08:00
Baohua Yang 69d34f7607 Merge pull request #90 from vra/master 
Fix expression
 2016-07-29 17:43:01 +08:00
Yunfeng Wang 904fb90f5b 修改句式错误 
根据上下文，将`写着`改成了`写成`
 2016-07-29 15:09:35 +08:00
Baohua Yang 308f8c6f5a Merge pull request #88 from dangzhiqiang/master 
Fix listed elements
 2016-07-18 14:58:26 +08:00
Baohua Yang 18bd64b147 Merge pull request #89 from airacle/master 
Fix typo: 084 => 124
 2016-07-18 14:57:34 +08:00
airacle 7b68db9dc6 084 => 124 2016-07-14 22:15:53 +08:00
dangzhiqiang 7c9ceaa4dc 更改列表显示格式 
修复列表显示格式，之前版本会导致生成的PDF会多出一行，并且增加不必要的缩进。
.md格式显示也会多出一个短横线“-”。
 2016-07-14 11:33:00 +08:00
Baohua Yang 2ccf861503 Merge pull request #87 from Novtopro/master 
Update term
 2016-06-17 20:28:22 +08:00
Novtopro He 1c4d30c374 名字空间 -> 命名空间 2016-06-17 11:07:18 +08:00
Baohua Yang 1af242e154 Add new group number 2016-06-15 16:03:47 +08:00
yeasy 9fa5ff18a7 Update content with latest docker cmd 2016-06-12 18:22:47 +08:00
yeasy 2044998a27 Update README.md 2016-06-12 18:03:38 +08:00
yeasy a8e690e5f3 Merge pull request #85 from catroll/master 
Fix link and figure.
 2016-05-25 10:38:08 +08:00
catroll 0cabecc05f Update install/debian.md，Markdown Error 2016-05-25 09:53:45 +08:00
catroll 51c1f16947 Update compose/usage.md, repository/dockerhub.md, fix three hyperlink 2016-05-25 09:32:05 +08:00
catroll 3e04648a41 Update kubernets/intro.md, kubernetes_logo.svg => kubernetes_logo.png 2016-05-25 09:08:53 +08:00
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
ytgs 6e5aeba187 Update install/debian.md 2016-04-17 22:01:33 +08:00
ytgs 1089796d49 Update install/debian.md 2016-04-17 21:42:43 +08:00
ytgs 7d4df6e369 Update install/README.md 2016-04-17 21:29:12 +08:00
ytgs 45b0402226 Update SUMMARY.md 2016-04-17 21:28:48 +08:00
ytgs bebc4f646c Create install/debian.md 2016-04-17 21:28:47 +08:00
ytgs c9555eb0f5 Update SUMMARY.md 2016-04-17 21:28:41 +08:00
ytgs 33bfa4c9dc Update install/ubuntu.md 2016-04-17 21:08:21 +08:00
ytgs a6368a8091 Update install/ubuntu.md 2016-04-17 20:10:47 +08:00
ytgs 55712f7bdf Update basic_concept/repository.md 2016-04-17 19:34:35 +08:00
ytgs 316b45f11a Update basic_concept/repository.md 2016-04-17 19:12:49 +08:00
ytgs 2fceed22ac Update basic_concept/container.md 2016-04-17 19:08:31 +08:00
ytgs 5fa1b6024a Update basic_concept/image.md 2016-04-17 19:08:10 +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
ds 3bd6083e68 更正 安装 -> Ubuntu -> 系统要求 中的错别字 2016-02-29 13:09:30 +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
lcp 7d9625ec25 修正镜像创建中json应用描述 2015-12-19 12:13:18 +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
GameXG 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
yeasy 062f008435 Merge pull request #77 from rhinoceros/master 
Resolve apache2 install dependency error
 2015-10-14 13:19:43 +08:00
rhinoceros.xn 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
yeasy 692db8b6a2 Merge pull request #76 from zhangbaitong/master 
Add coreos cluster quickstart section
 2015-09-28 17:41:00 +08:00
zhangbaitong 3291d4795f coreos cluster quickstart section 2015-09-28 17:33:45 +08:00
yeasy bfecf409ea Merge pull request #75 from zhangbaitong/master 
Add coreos tools intro section
 2015-09-28 15:15:02 +08:00
zhangbaitong eb32546e3c coreos tools intro section 2015-09-28 11:43:40 +08:00
yeasy cd59aaf167 Merge pull request #73 from zhangbaitong/master 
Add coreos intro section
 2015-09-06 08:58:22 +08:00
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