a9c73b1a7e
Merge pull request #20425 from HackToday/fixindex
...
Fix wrong index marking
2016-02-18 14:49:15 +01:00
0b4e0ce7cd
Fix wrong index marking
...
The index was wrong set in docs, so let's fix it
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
2016-02-18 03:08:21 +00:00
f7fe2f0992
Add sudo for related command
...
The du need sudo to perform to get correct results.
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
2016-02-18 02:58:26 +00:00
7da5784b10
Fix documentation typos
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-02-15 15:46:56 +01:00
b734d0e8cc
Merge pull request #20285 from moxiegirl/fix-user-guide
...
Update the userguide to fix user feedback
2016-02-12 11:07:03 -08:00
bf76b1d686
Update the userguide to fix user feedback
...
Signed-off-by: Mary Anthony <mary@docker.com>
2016-02-12 10:08:59 -08:00
3a3c953806
Merge pull request #20266 from npcode/fix-docs-dockernetworks-three-options
...
Fix an erratum; s/two/three/
2016-02-12 09:58:48 -08:00
8c93958fcb
Fix an erratum; s/two/three/
...
There are three options because the new one was added at 6f863cf
2016-02-13 00:14:35 +09:00
03b25e024e
Fix some formatting
...
* Codified example container names
* Emphasised 'link' vs 'legacy link' (instead of using code markup)
* Add a missing ``` for a code example
Signed-off-by: Roland Huß <roland@jolokia.org>
2016-02-12 10:34:55 +01:00
d736a9d2c3
Add docs for --ipv6 option, also add --internal as appropriate
...
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
2016-02-12 01:42:15 +00:00
99a396902f
fix common misspell
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-02-11 15:49:36 -08:00
3024604054
Overlay Network needs Unique Hostname
...
Resolves : #19301
Signed-off-by: Aditi Rajagopal <arajagopal@us.ibm.com>
2016-02-08 15:14:38 -06:00
a3c290536a
Tweak VM volume mapping paragraph
...
The wording looked like there was maybe a copy-paste error there, I tried to make it a bit more clear.
Signed-off-by: Ilkka Laukkanen <ilkka@ilkka.io>
2016-02-06 13:35:02 +02:00
feab8b179e
Add support details for storage driver
...
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
2016-02-04 00:51:02 +00:00
2fd35de274
Fix typo
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2016-02-02 19:07:58 -08:00
0e14754766
Update networkingcontainers.md
...
updated line on how to exit the container after the ping test - in my environment (Ubuntu 14.04.1, bash) ctrl-c does not work to exit the shell, and `exit` must be used instead.
Signed-off-by: Troy Denton <Troy.Denton@younessleeptechnologies.com>
2016-02-02 19:05:55 -08:00
ef52a53c34
Merge pull request #19865 from mavenugo/ndocs
...
Docs cleanup for networking features added in 1.10
2016-02-02 17:36:46 +01:00
6f863cfa18
Docs cleanup for networking features added in v1.10
...
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-02-02 06:10:41 -08:00
1ab7d76f30
Correct old virtual size
...
In new content addressable model, image no longer
have virtual size column, it is now 'size'. So we
need to update related docs about them.
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
2016-02-02 12:28:33 +00:00
89923c1f32
Updating for CAS changes and new select a driver section
...
Adding changes requested by @jamtur01 and wrapping to 80 chars
Adding typo fixes and replacing tabs with 4xspaces
Closes and fixes #19240
Updating with content addressable storage model changes
Signed-off-by: Nigel <nigelpoulton@hotmail.com>
2016-01-30 18:03:04 -08:00
ebd1f70165
docs: document options for default network driver
...
Fixes issue #18410
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
2016-01-28 11:49:07 +08:00
e310d070f4
Creating Engine specific menu
...
Fixing the links
Updating with Seb's comments
Adding weight
Fixing the engine aliases
Updating after Arun pushed
Removing empty file
Signed-off-by: Mary Anthony <mary@docker.com>
2016-01-26 15:58:53 -08:00
e5e90347d2
Add missing words in selectadriver.md
...
Signed-off-by: Victor Costan <costan@gmail.com>
2016-01-26 01:06:59 -05:00
ac1eac21c9
Update aufs-driver.md
...
fix typo in file path for image layers
Signed-off-by: bjcheny <companycy@gmail.com>
2016-01-24 10:03:29 +08:00
f50d0d7fdb
Fix minor doc grammar issues
...
Signed-off-by: Dave Barboza <dxbarboza@gmail.com>
2016-01-20 10:52:21 -05:00
5cc672b006
Add Subnets info for user-defined network
...
* If user doesn't specify the subnets to create a network, it will pick
subnets from inside preferred pool. This PR aims to inspect these subnets info
* Add integration tests for docker inspect the subnets.
* docker-py project is already synchronized.
* jenkins checks depend on https://github.com/docker/docker-py/pull/888
Fixes issue #18626
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
2016-01-15 10:03:29 +08:00
73a5393bf3
Merge pull request #19242 from mavenugo/nsalias
...
Network scoped alias support
2016-01-14 10:58:51 -08:00
dda513ef65
Network scoped alias support
...
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-01-14 08:44:41 -08:00
9f676ade0a
Add network ID to container inspect
...
Fixes issue #19089
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
2016-01-14 22:33:41 +08:00
0ed2e26f51
Merge pull request #19157 from wenchma/update_build_bridges
...
Update the doc of build-bridges.md
2016-01-14 11:10:37 +01:00
63525a6dc5
Merge pull request #19252 from HackToday/fix-vol-resp-doc
...
Update response content for volume mounts
2016-01-14 09:15:13 +01:00
e47112d3e8
daemon option (--storage-opt dm.basesize) for increasing the base device size on daemon restart
...
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
2016-01-13 13:57:31 -05:00
a79f96828f
Merge pull request #19249 from calavera/carry_17414
...
[Carry 17414] Added additional container information to "docker info".
2016-01-13 10:42:22 +01:00
6a04ecf813
Update response content for volume mounts
...
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
2016-01-13 03:48:14 +00:00
2aa5f33b20
Docs update for link functionality in user-defined networks
...
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-01-12 13:38:48 -08:00
301627c677
Merge pull request #18906 from coolljt0725/connect_to_created
...
Support network connect/disconnect to stopped container
2016-01-12 07:06:31 -08:00
0ba6a128ee
Update the doc of build-bridges.md
...
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
2016-01-12 15:52:33 +08:00
79d4f0f56e
Add docker network connect/disconnect to non-running container
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2016-01-11 20:13:39 -05:00
e732f4e649
Added additional container information to "docker info".
...
Instead of just showing the number of containers this patch will
show the number of running, paused and stopped containers as well.
Signed-off-by: Kim Eik <kim@heldig.org>
(cherry picked from commit a9804ab1cb117a132cbf460067d55f5146d50956)
2016-01-11 19:14:44 -05:00
64a6dc3558
Docker changes for libnetwork vendoring..
...
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
2016-01-08 14:13:55 -08:00
2bb3fc1bc5
Allow user to choose the IP address for the container
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-01-08 10:09:16 -08:00
b12ef0fe00
Merge pull request #18378 from tonistiigi/content-addressability-storage-docs
...
Update storage docs for content-addressability
2016-01-07 16:44:29 -08:00
ca7b69016a
Remove the old reference link
...
Fixes : #19152
As issue #14214 closed, so this old link is not needed.
We can remove it now.
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
2016-01-07 10:23:36 +00:00
289faeac11
Fix a typo error
...
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
2016-01-05 17:42:13 +08:00
dcbd5e04b7
Merge pull request #18891 from HackToday/18872-fix-volume-cmd
...
Fix the restore data example
2016-01-02 00:43:46 +01:00
b4d4a805ea
fix typo
...
Signed-off-by: Anthon van der Neut <a.van.der.neut@ruamel.eu>
2016-01-01 20:39:04 +01:00
83c705c00d
Fix the restore data example
...
Fixes : #18872
For backup, restore case, we usually restore in same directory, so
when we untar it, we not need go to /dbdata directory, wich could
result in /dbdata/dbdata, this fix make it untar directly. The directory
/dbdata would be same as old container /dbdata.
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
2015-12-31 00:56:01 +00:00
3b605b5926
Merge pull request #18764 from donovan/fix-networkingcontainers-ip-addresses
...
fix incorrect ip addresses in networkingcontainers
2015-12-30 17:49:08 +01:00
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
d4270c1764
Merge pull request #18775 from mrjana/mh
...
libnetwork vendoring
2015-12-26 11:42:55 +01:00
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
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
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
6d04d9cda8
Merge pull request #18804 from mqliang/patch-6
...
Update selectadriver.md
2015-12-21 09:56:05 +01:00
41c2dab459
update document
...
Signed-off-by: mqliang <mqliang.zju@gmail.com>
2015-12-21 11:53:38 +08:00
e9f72410ae
Merge pull request #18798 from mqliang/patch-1
...
Update dockervolumes.md
2015-12-21 01:09:52 +01:00
83f28cb374
Merge pull request #18801 from mqliang/patch-3
...
Update index.md
2015-12-21 01:08:58 +01:00
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
8737896e42
Update btrfs-driver.md
...
Signed-off-by: lmq <mqliang@lmqs-MacBook-Pro.local>
2015-12-20 23:08:01 +08:00
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
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
3d43ebebfa
Merge pull request #18720 from kytrinyx/unspecific-ubuntu
...
docs: remove ubuntu version in dockerizing userguide
2015-12-19 21:17:38 -08:00
55a65e18c0
Fixing typo reported by @projectvalis
...
Signed-off-by: Mary Anthony <mary@docker.com>
2015-12-19 12:47:24 -08:00
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
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
2bd8322dba
fix incorrect ip addresses in networkingcontainers
...
Signed-off-by: Donovan Jones <git@gamma.net.nz>
2015-12-18 16:21:24 +13:00
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
6f930a2ffa
Merge pull request #18700 from mqliang/patch-2
...
Update dockernetworks.md
2015-12-16 16:58:25 +01:00
f480b7c1f5
Update dockernetworks.md
...
fix typo
Signed-off-by: mqliang <mqliang.zju@gmail.com>
2015-12-16 15:25:06 +08:00
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
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
4c1243dc76
fixed typo
...
Signed-off-by: mqliang <mqliang.zju@gmail.com>
2015-12-15 23:00:47 +08:00
927b334ebf
Fix typos found across repository
...
Signed-off-by: Justas Brazauskas <brazauskasjustas@gmail.com>
2015-12-13 18:04:12 +02:00
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
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
d8d38f2345
Add the actual command in this example.
...
Signed-off-by: Jeff Anderson <jeff@docker.com>
2015-12-09 10:17:39 -07:00
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
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
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
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
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
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
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
909821f514
Update storage docs for content-addressability
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2015-12-02 13:06:02 -08:00
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
9bd5fd8926
Merge pull request #18223 from thaJeztah/fix-table-markup
...
Fix markup for markdown table
2015-11-25 16:26:53 +01:00
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
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
4d66f18be0
Correct some typos for docs
...
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
2015-11-24 15:14:32 +08:00
043f447e2e
Fixes found by docs validation tool
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-11-23 11:19:38 +10:00
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
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
0780ad4857
Merge pull request #17973 from moxiegirl/fix-networking-issue
...
Fixing issue noted by user
2015-11-18 12:49:11 +01:00
ea04764059
Fix Markdown syntax error in aufs-driver
...
Signed-off-by: dm4 <dm4@skymizer.com>
2015-11-17 17:38:36 +08:00
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
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
0a31647780
Fixing issue noted by user
...
Signed-off-by: Mary Anthony <mary@docker.com>
2015-11-13 10:28:51 -08:00
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
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
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
Sebastiaan van Stijn
Kai Qiang Wu(Kennan)
Sebastiaan van Stijn
David Calavera
Mary Anthony
Yi EungJun
Roland Huß
Aidan Hobson Sayers
Victor Vieux
Aditi Rajagopal
Ilkka Laukkanen
Arnaud Porterie
Troy Denton
Vincent Demeester
Madhu Venugopal
Nigel
Wen Cheng Ma
Victor Costan
companycy
Dave Barboza
Shishir Mahajan
Antonio Murdaca
Lei Jitang
Kim Eik
Santhosh Manohar
Alessandro Boch
Anthon van der Neut
J Bruni
Samuel Dion-Girardeau
Doug Davis
Jana Radhakrishnan
mqliang
Antonio Murdaca
Donovan Jones
Katrina Owen
Candid Dauth
Justas Brazauskas
Devvyn Murphy
Jeff Anderson
Patrick Hemmer
Ilya Gusev
Kristian Haugene
Tonis Tiigi
Sven Dowideit
Lee, Meng-Han
Victor I. Wood
Andre Granovsky
David Currie