clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-05-20 13:43:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,500 Commits 9 Branches 112 Tags
d1423d28b59dcf1bb3e634033cdccb39afe366af
Commit Graph

3365 Commits

Author SHA1 Message Date
moxiegirl
65ca20e6f1 Merge pull request #12156 from moxiegirl/pr-12008-carry 
Carry PR 12008 for contributor
 2015-04-07 14:54:02 -07:00
Mary Anthony
87e70b6831 Carry PR 12008 for contributor 
Closes #8040
Remove a tic for the hawk

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-04-07 14:09:53 -07:00
Tibor Vass
9dd23be563 Merge pull request #11947 from TonnyXu/master 
Updated the explanation of ONBUILD in best-practices doc
 2015-04-07 16:53:43 -04:00
moxiegirl
4d4f201a4d Merge pull request #12089 from nerdalert/doc-fix-netw-nerdalert 
Replaced level with layer for OSI model references
 2015-04-07 13:29:40 -07:00
Yan Feng
805f34bb5b Fix 2 typos in /doc/sources/reference/run.md 
Signed-off-by: Yan Feng <yanfeng2@huawei.com>
 2015-04-07 14:15:05 -04:00
Brent Salisbury
7165089f34 Replaced level with layer for OSI model references 
- ty to @moxiegirl for the info workflow for patching images.

-link to the v6 svg (grey L2 switch in the top /level/layer/)
http://docs.master.dockerproject.com/article-img/ipv6_switched_network_example.svg

Signed-off-by: Brent Salisbury <brent.salisbury@docker.com>
 2015-04-06 22:23:40 -04:00
Tibor Vass
d2992c78dc Revert "Since COPY has been deprecated in the recent release of Docker I updated the best practices section to inform users that ADD is the way forward and to not use COPY." 
COPY was not deprecated.

This reverts commit 3148063af1.

Signed-off-by: Tibor Vass <tibor@docker.com>
 2015-04-06 15:34:10 -04:00
moxiegirl
2c44556ff9 Merge pull request #12093 from malnick/malnick_dockerfile_best_practice_update 
Updated the dockerfile best practice section on ADD and COPY
 2015-04-06 11:43:50 -07:00
moxiegirl
ce18734c2c Merge pull request #12055 from l0kix2/patch-1 
Improved "start a container" section 1.16 & 1.17 API docs
 2015-04-06 11:41:38 -07:00
Arnaud Porterie
ed8d402851 Merge pull request #11978 from x1022as/info-show-loggingdriver 
docker info show logging driver info
 2015-04-06 11:11:31 -07:00
malnick
3148063af1 Since COPY has been deprecated in the recent release of Docker I updated the best practices section to inform users that ADD is the way forward and to not use COPY. 
Signed-off-by: malnick <malnick@gmail.com>
 2015-04-06 10:04:42 -07:00
moxiegirl
3e077bb3f7 Merge pull request #12100 from draghuram/docker_update 
Add the missing option to the wget command for updating Docker.
 2015-04-06 10:03:23 -07:00
moxiegirl
96c3141fa5 Merge pull request #12020 from chenhanxiao/docker-import-commit 
docs: keep the style of docker-commit consistent with docker-import
 2015-04-06 09:47:47 -07:00
moxiegirl
d489b91aa9 Merge pull request #11915 from ZJU-SEL/fix_issue_11676_11754 
clarify RLIMIT_AS is disabled, explain how to edit DOCKER_OPTS
 2015-04-06 09:23:53 -07:00
Deng Guangxing
71de711189 fix typo in cli.md 
Signed-off-by: Deng Guangxing <dengguangxing@huawei.com>
 2015-04-06 16:11:40 +08:00
Raghuram Devarakonda
9287e70c12 Add the missing option to the wget command for updating Docker. 
Signed-off-by: Raghuram Devarakonda <draghuram@gmail.com>
 2015-04-05 23:00:21 -04:00
Simei He
5057d7da13 fix the space thing. 
Signed-off-by: Simei He <hesimei@zju.edu.cn>
 2015-04-06 09:00:59 +08:00
Kirill SIbirev
ac12c80537 Improved "start a container" section in 1.16 & 1.17 docs 
It seems it was lost or something

Signed-off-by: Kirill Sibirev <l0kix2@gmail.com>
 2015-04-04 11:23:49 +03:00
Tonny Xu
e50636617f Updated the explanation of ONBUILD in best-practices doc 
Signed-off-by: Tonny Xu <tonny.xu@gmail.com>
 2015-04-04 12:46:25 +09:00
Jessie Frazelle
4d571257ed Merge pull request #12039 from ahmetalpbalkan/windows-install-docs-update 
docs: Add new windows installation tutorials
 2015-04-03 20:39:21 +00:00
moxiegirl
fb1e10284b Merge pull request #11968 from thaJeztah/docs-fix-bullets-and-labels-filter 
docs: fix bullet list and missing label filter
 2015-04-03 12:33:22 -07:00
moxiegirl
a6c04f33e1 Merge pull request #12003 from sleinen/patch-1 
Make explanation consistent with command
 2015-04-03 12:19:37 -07:00
moxiegirl
6d5a0ac11e Merge pull request #12057 from icecrime/11925_carry 
Specify running `boot2docker ip` on host
 2015-04-03 12:11:53 -07:00
Jessie Frazelle
3985dc299a Merge pull request #12054 from eluck/master 
Update userguide/dockervolumes - fixes issue #12052
 2015-04-03 18:58:52 +00:00
Ahmet Alp Balkan
2b320a2309 docs: Add new windows installation tutorials 
Updated Windows installation documentation with newest
screencasts and Chocolatey instructions to install windows
client CLI.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
 2015-04-03 11:33:34 -07:00
moxiegirl
12e7787540 Merge pull request #12017 from moxiegirl/distribution-man-pages 
Updating with man pages for distribution
 2015-04-03 09:55:08 -07:00
Arnaud Porterie
bcbdf77ddb Specify running boot2docker ip on host 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-04-03 08:53:44 -07:00
moxiegirl
05753288c4 Merge pull request #11997 from tiborvass/carry-11926 
Carry 11926: Added information about accessing host directory on Windows.
 2015-04-03 06:43:38 -07:00
moxiegirl
da61228501 Merge pull request #11775 from maximkulkin/explain-advanced-contribution-workflow 
Explain advanced contribution workflow more
 2015-04-03 06:41:49 -07:00
eluck
57b09068ef Update userguide/dockervolumes - fixes issue #12052 
Signed-off-by: Evgeny Lukianchikov <mail@eluck.me>
 2015-04-03 14:07:51 +03:00
Simei He
8c578b8190 minor edits. 
Signed-off-by: Simei He <hesimei@zju.edu.cn>
 2015-04-03 14:43:21 +08:00
Tibor Vass
9707286a5c Merge pull request #11149 from duglin/8667-AdvancedVars 
Add support for advanced ${} uses
 2015-04-02 08:25:49 -04:00
Chen Hanxiao
8fa03df885 docs: keep the style of docker-commit consistent with docker-import 
add a pair of accent mark around dockerfile commands
in docker-commit, as the same thing in docker-import.

Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
 2015-04-02 05:01:14 -04:00
Mary Anthony
b6d55ebcbc Updating with man pages for distribution 
Went through the man pages to update for the
v2 instance. Checked against the commands.

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-04-01 21:02:19 -07:00
Sebastiaan van Stijn
37c7f3a204 docs: fix bullet list and missing label filter 
Some bullet lists didn't render as bullet-lists because
of a missing newline.

Also added missing "label" filter for `docker ps` and
slightly re-worded the header above the supported filters.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2015-04-02 01:48:28 +02:00
Alexander Morozov
81f9b72c64 Bump API version and docs to v1.19 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-04-01 13:40:56 -07:00
Simon Leinen
b58c4b8e68 Make explanation consistent with command 
To reduce confusion of the reader.  Fixes a likely cut & paste error.

Signed-off-by: Simon Leinen <simon.leinen@gmail.com>
 2015-04-01 21:54:21 +02:00
Jay
6e46204ab8 Added information about accessing host directory on Windows. 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2015-04-01 13:36:43 -04:00
Doug Davis
39908fc6d9 Add support for more advanced ${xxx:...} syntax 
Just ${xxx:+...} and ${xxx:-...} for now

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-04-01 08:11:15 -07:00
moxiegirl
39711c8b26 Merge pull request #11969 from powo/patch-1 
Update networking.md (IPv6 wrong prefix)
 2015-04-01 07:45:31 -07:00
moxiegirl
dc564d8cf8 Merge pull request #11972 from thaJeztah/docs-fix-heading-level 
docs: fix heading level of logging drivers
 2015-04-01 07:34:45 -07:00
moxiegirl
f73109b883 Merge pull request #11982 from sunyuan3/docker-run 
Fix typoes in docker-run.1.md
 2015-04-01 07:32:06 -07:00
Yuan Sun
a44451d40e Fix typoes in docker-run.1.md 
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
 2015-04-01 17:09:01 +08:00
Deng Guangxing
f5a401d3fe docker info show logging driver info 
Signed-off-by: Deng Guangxing <dengguangxing@huawei.com>
 2015-04-01 16:05:14 +08:00
Sebastiaan van Stijn
f855d5dde7 Fix heading level of logging drivers 
Syslog was a heading-2, but should be heading-3;
changed the headings to heading-4 to match the
"network settings" section.

Also changed "Log driver" to "logging driver" for JSON.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2015-04-01 01:07:22 +02:00
Wolfgang Powisch
6a47c70d60 Update networking.md 
Signed-off-by: Wolfgang Powisch <powo@powo.priv.at>
 2015-04-01 00:44:41 +02:00
Ankush Agarwal
8caf8f0a79 Use different host and container port for clarity 
Fixes #11953

Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
 2015-03-31 11:59:58 -07:00
Phil Estes
97f621bcd8 Merge pull request #11861 from ZJU-SEL/11752-add-cap-list-table 
Fix-11752 add capabilities list information table.
 2015-03-30 23:18:30 -04:00
Harry Zhang
bf15f675b9 Revison the some columns to make table clearer 
Signed-off-by: Harry Zhang <harryzhang@zju.edu.cn>
 2015-03-31 02:41:49 +00:00
dalanlan
8d3d34d5e3 fix issue #11676 #11754, disable RLIMIT_AS,edit DOCKER_OPTS 
Signed-off-by: Simei He <hesimei@zju.edu.cn>
 2015-03-31 10:13:37 +08:00