0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
20898 commits 14 branches 412 tags 338 MiB
Commit graph

124 commits

Author SHA1 Message Date
J Bruni
153948ac46 Fixed /etc/defaults/docker to /etc/default/docker 
/etc/default/docker is the correct file location in my system, and also according Docker's own documentation at https://github.com/docker/docker/blob/master/docs/articles/configuring.md#configuring-docker

Signed-off-by: J Bruni <contato@jbruni.com.br>
 2015-12-28 20:57:36 -02:00
Sebastiaan van Stijn
d4270c1764 Merge pull request #18775 from mrjana/mh 
libnetwork vendoring
 2015-12-26 11:42:55 +01:00
Samuel Dion-Girardeau
63f9f2c05b Fix typo in btrfs userguide doc 
Signed-off-by: Samuel Dion-Girardeau <samuel.diongirardeau@gmail.com>
 2015-12-23 15:10:01 -05:00
Doug Davis
e6115a6c1c remove =false from options that default to false in the docs 
This re-aligns the docs with what the cmd line now does.

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-12-23 07:11:35 -08:00
Jana Radhakrishnan
f0904affd1 libnetwork vendoring 
Vendoring libnetwork @ 9f0563ea8f430d8828553aac97161cbff4056436

Brings in:
    * Support for overlay network driver in 3.10+ kernels
    * Freebsd compilation fixes
    * Remove .dockerinit dependency
    * IPAM driver capability support
    * Network internal mode support
    * Misc. fixes

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
 2015-12-22 13:32:17 -08:00
Sebastiaan van Stijn
6d04d9cda8 Merge pull request #18804 from mqliang/patch-6 
Update selectadriver.md
 2015-12-21 09:56:05 +01:00
mqliang
41c2dab459 update document 
Signed-off-by: mqliang <mqliang.zju@gmail.com>
 2015-12-21 11:53:38 +08:00
Sebastiaan van Stijn
e9f72410ae Merge pull request #18798 from mqliang/patch-1 
Update dockervolumes.md
 2015-12-21 01:09:52 +01:00
Sebastiaan van Stijn
83f28cb374 Merge pull request #18801 from mqliang/patch-3 
Update index.md
 2015-12-21 01:08:58 +01:00
Liang Mingqiang
3dd90e564c Update dockervolumes.md 
Signed-off-by: mqliang mqliang.zju@gmail.com
Signed-off-by: lmq <mqliang@lmqs-MacBook-Pro.local>
 2015-12-20 23:41:00 +08:00
Liang Mingqiang
8737896e42 Update btrfs-driver.md 
Signed-off-by: lmq <mqliang@lmqs-MacBook-Pro.local>
 2015-12-20 23:08:01 +08:00
Liang Mingqiang
38ee016966 Update index.md 
fix typo in document

Signed-off-by: mqliang mqliang.zju@gmail.com
Signed-off-by: lmq <mqliang@lmqs-MacBook-Pro.local>
 2015-12-20 23:00:38 +08:00
moxiegirl
18925f37ed Merge pull request #18707 from runcom/update-labels-doc-for-emtpy-lables 
update syntax for empty value labels
 2015-12-19 21:53:21 -08:00
moxiegirl
3d43ebebfa Merge pull request #18720 from kytrinyx/unspecific-ubuntu 
docs: remove ubuntu version in dockerizing userguide
 2015-12-19 21:17:38 -08:00
Mary Anthony
55a65e18c0 Fixing typo reported by @projectvalis 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-12-19 12:47:24 -08:00
Sebastiaan van Stijn
69fbdf4294 Merge pull request #18684 from cdauth/volume-docs 
Add note to volume docs that data is not copied to mounted volumes
 2015-12-19 15:29:44 +01:00
Antonio Murdaca
aada8d8117 docs: userguide: labels-custom-metadsata.md: update syntax for emtpy value labels 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2015-12-19 09:04:29 +01:00
Katrina Owen
68b07c0af9 docs: remove ubuntu version in dockerizing userguide 
The docs/installation/mac guide causes a user to download the
`ubuntu` image, which defaults to `ubuntu:latest`.

After installing the next logical step is to work through
the userguide. If the userguide specifies ubuntu:14.04, then
a second ubuntu image will be downloaded.

On slow internet connections this takes a long time.
The cost of specificity in this case seems higher than the value.

Since this might be the first or second interaction a user has
with docker, they might not realize that they can remove the ":14.04"
bit to use the image that was previously downloaded.

Signed-off-by: Katrina Owen <katrina.owen@gmail.com>
 2015-12-16 11:25:15 -07:00
Sebastiaan van Stijn
6f930a2ffa Merge pull request #18700 from mqliang/patch-2 
Update dockernetworks.md
 2015-12-16 16:58:25 +01:00
Liang Mingqiang
f480b7c1f5 Update dockernetworks.md 
fix typo

Signed-off-by: mqliang <mqliang.zju@gmail.com>
 2015-12-16 15:25:06 +08:00
Liang Mingqiang
e1f012cf39 fix typo in dockerlinks.md 
fix typo in dockerlinks.md

Signed-off-by: mqliang <mqliang.zju@gmail.com>
 2015-12-16 11:21:39 +08:00
Candid Dauth
efb763aa10 Add note to volume docs that data is not copied to mounted volumes 
Signed-off-by: Candid Dauth <cdauth@cdauth.eu>
 2015-12-15 20:27:35 +01:00
Liang Mingqiang
4c1243dc76 fixed typo 
Signed-off-by: mqliang <mqliang.zju@gmail.com>
 2015-12-15 23:00:47 +08:00
Justas Brazauskas
927b334ebf Fix typos found across repository 
Signed-off-by: Justas Brazauskas <brazauskasjustas@gmail.com>
 2015-12-13 18:04:12 +02:00
moxiegirl
94026969b4 Merge pull request #18389 from wenchma/doc_update_for_container-basics 
docs: delete draft container-basics.md
 2015-12-12 21:39:34 -08:00
Devvyn Murphy
76de01c138 Update custom-docker0.md (corrections) 
Corrected outdated internal link (regarding ```ip_forward``` system setting) . Corrected missing newline before bulleted list (for options configurable at server startup).

Signed-off-by: Devvyn Murphy <devvyn@devvyn.com>
 2015-12-10 13:24:02 -06:00
Jeff Anderson
d8d38f2345 Add the actual command in this example. 
Signed-off-by: Jeff Anderson <jeff@docker.com>
 2015-12-09 10:17:39 -07:00
moxiegirl
8ed14c2072 Merge pull request #18478 from programmerq/novirt 
Call it "containerization" instead of "virtualization" in the docs
 2015-12-08 16:45:29 -08:00
Jeff Anderson
0d1c5193b3 Change "virtualization" to "containerization" 
* Wording around what docker-machine does since the phrase "Docker virtual machine" can cause some confusion.
* Docker Machine isn't a distro in and of itself. It still uses boot2docker as the distro.
* Remove "virtualization" keywords.

Signed-off-by: Jeff Anderson <jeff@docker.com>
 2015-12-08 15:08:27 -07:00
Patrick Hemmer
fd9d7c02fc don't try to use default route MTU as bridge MTU 
Signed-off-by: Patrick Hemmer <patrick.hemmer@gmail.com>
 2015-12-07 17:32:51 -05:00
Ilya Gusev
8923c30b4a Update dockervolumes.md 
added rm flag to backup/restore commands in examples

Signed-off-by: Ilya Gusev <mail@igusev.ru>
 2015-12-07 15:20:10 +03:00
Sebastiaan van Stijn
f27572312f Fix pull by digest example 
Also reduced the column spacing in the output, so
that more output is visible in the documentation.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2015-12-07 00:58:46 +01:00
Kristian Haugene
655766ed95 docs: fix typo in bash_history mount example 
Signed-off-by: Kristian Haugene <kristian.haugene@capgemini.com>
 2015-12-04 16:09:25 +01:00
Wen Cheng Ma
a947377297 Update the "Manually network" section with detailed info in container-basics 
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
 2015-12-03 22:32:02 +08:00
Wen Cheng Ma
08328cb703 Add NETWORK_NAME_or_ID value for --net= option 
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
 2015-12-02 22:49:35 +08:00
Sebastiaan van Stijn
9bd5fd8926 Merge pull request #18223 from thaJeztah/fix-table-markup 
Fix markup for markdown table
 2015-11-25 16:26:53 +01:00
Sebastiaan van Stijn
bfdd94b0a8 Fix markup for markdown table 
Our tooling used to convert Markdown to HTML doesn't
properly handle '|' symbols embeded in code blocks
inside a table.

Changed the table to a plain HTML table as a workaround.

Also fixed indentation levels of two code examples.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2015-11-25 12:38:15 +01:00
Kai Qiang Wu(Kennan)
41a36529a7 Fixing the volume options doc 
Fixes #15896
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
 2015-11-25 03:56:55 -06:00
Wen Cheng Ma
4d66f18be0 Correct some typos for docs 
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
 2015-11-24 15:14:32 +08:00
Sven Dowideit
043f447e2e Fixes found by docs validation tool 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-11-23 11:19:38 +10:00
Sebastiaan van Stijn
d8ea32caa8 Merge pull request #18026 from woodvi/doc-network-tutorial 
change "Web" to "web" to match case-sensitive name used for creation;…
 2015-11-20 10:46:00 +01:00
Mary Anthony
9941d5bc33 Small changes to storage driver/commands ref 
Entering V's comments

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-11-19 17:13:23 -08:00
David Calavera
0780ad4857 Merge pull request #17973 from moxiegirl/fix-networking-issue 
Fixing issue noted by user
 2015-11-18 12:49:11 +01:00
Lee, Meng-Han
ea04764059 Fix Markdown syntax error in aufs-driver 
Signed-off-by: dm4 <dm4@skymizer.com>
 2015-11-17 17:38:36 +08:00
Victor I. Wood
ac526193af change "Web" to "web" to match case-sensitive name used for creation; enquoted bash cd command for un-tar example 
Signed-off-by: Victor I. Wood <viw@t2am.com>
 2015-11-16 12:41:06 -08:00
Andre Granovsky
be2152116c docs: modifying volumes guide to remove ambiguity. Signed-off-by: Andre Granovsky <robotciti@live.com> 
Adjusted as per comment.
Rebase and squash by moxigirl

Signed-off-by: Andre Granovsky <robotciti@live.com>
 2015-11-16 08:24:26 -08:00
Mary Anthony
0a31647780 Fixing issue noted by user 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-11-13 10:28:51 -08:00
Sebastiaan van Stijn
a4b2de674c Fix find and replace typo in dockerimages 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2015-11-12 00:52:31 +01:00
moxiegirl
6c5395360f Merge pull request #17883 from dave-tucker/bug/17709 
Add required ports for Overlay to docs
 2015-11-11 13:10:22 -08:00
David Currie
f16dceb632 Updates to Get started with multi-host networking 
Updates primarily to expand usage of Swarm cluster and make Compose
section more verbose plus other minor corrections.

Signed-off-by: David Currie <david_currie@uk.ibm.com>
 2015-11-11 20:31:18 +00:00