ehlxr/docker_practice
1
0
Fork 0
mirror of https://github.com/yeasy/docker_practice.git synced 2024-11-16 19:43:41 +00:00
Code Issues Projects Releases Wiki Activity
1,141 Commits 5 Branches 16 Tags 12 MiB
aa3d56fce9
Commit Graph

1141 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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