Commit Graph

97 Commits

Author SHA1 Message Date
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 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
Dave Tucker 44a527d877 Add required ports for Overlay to docs
Fixes #17709

Signed-off-by: Dave Tucker <dt@docker.com>
2015-11-11 18:04:07 +00:00
Anthony Dahanne 4efe0def0a Implicitly use swarm:latest so that master and agent use the same version of swarm
Signed-off-by: Anthony Dahanne <anthony.dahanne@gmail.com>
2015-11-09 15:05:17 -08:00
moxiegirl 8aa8d51610 Merge pull request #17713 from nathanleclaire/mhs_nits_2_the_sequel_electric_overloo
Revise commands in Compose section of multi-host quickstart
2015-11-06 13:04:43 -08:00
Anton Polonskiy 3f331eaa40 fix typo
Signed-off-by: Anton Polonskiy <anton.polonskiy@gmail.com>
2015-11-05 18:33:16 +02:00
Jeroen Jacobs 75602d4930 Fixes typo in docs/userguide/dockervolumes.md
Signed-off-by: Jeroen Jacobs <git@jeroenj.be>
2015-11-05 16:08:11 +01:00
Nathan LeClaire 6326e6732d Revise commands in Compose section of multi-host quickstart
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-11-04 17:44:01 -08:00
Alex Chan 40dc0c4861 Fix typo in dockervolumes.md
Signed-off-by: Alex Chan <alex@alexwlchan.net>
2015-11-04 22:13:35 +00:00
Mary Anthony 90e16ab8f9 Fixing BTRFS > Btrfs
Signed-off-by: Mary Anthony <mary@docker.com>
2015-11-04 11:23:16 -08:00
Madhu Venugopal 39dfc536d4 Updating networking docs with technical information
- the /etc/hosts read caveat due to dynamic update
- information about docker_gwbridge
- Carries and closes #17654
- Updating with last change by Madhu
- Updating with the IPAM api 1.22

Signed-off-by: Mary Anthony <mary@docker.com>
2015-11-03 08:42:40 -08:00
Sebastiaan van Stijn d3b2e7dcf4 Merge pull request #17652 from moxiegirl/nigel-credits
Nigel acknowledgement
2015-11-03 15:35:53 +01:00
Mary Anthony 7b978cc378 Nigel acknowledgement
Signed-off-by: Mary Anthony <mary@docker.com>
2015-11-03 05:52:33 -08:00
Mary Anthony 0f1083c8da Fixing ZooKeeper and some other nits Nathan found
Signed-off-by: Mary Anthony <mary@docker.com>
2015-11-03 05:34:54 -08:00
Mary Anthony 950fbf99b1 Add special memory management file
updating after assignment for Nigel
Adding in some notes from Nigel work
Updating with the storage driver content Nigel added
Updating with Nigel's polishing tech
Adding in Nigel graphics
First pass of aufs material
Capturing Nigel's latest
Comments back to Nigel on devicemapper
Incorporating Nigel's comments v3
Converting images for dm
Entering comments into aufs page
Adding the btfs storage driver
Moving to userguide
Adding in two new driver articles from Nigel
Optimized images
Updating with comments

Signed-off-by: Mary Anthony <mary@docker.com>
2015-11-02 21:40:18 -08:00
Mary Anthony 9ef855f9e5 First pass at consolidating
Removing old networking.md
Updating dockernetworks.md with images
Adding information on network plugins
Adding blurb about links to docker networking
Updating the working documentation
Adding Overlay Getting Started
Downplaying links by removing refs/examples, adding refs/examples for network.
Updating getting started to reflect networks not links
Pulling out old network material
Updating per discussion with Madhu to add Default docs section
Updating with bridge default
Fix bad merge
Updating with new cluster-advertise behavior
Update working and NetworkSettings examples
Correcting example for default bridge discovery behavior
Entering comments
Fixing broken Markdown Syntax
Updating with comments
Updating all the links

Signed-off-by: Mary Anthony <mary@docker.com>
2015-11-02 21:14:55 -08:00
Sven Dowideit 9ed6cec8ff Fix some errant links
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-10-22 20:33:24 +10:00
David Calavera 475be776b8 Merge pull request #17051 from thaJeztah/fix-volume-readonly-doc
remove incorrect "readonly" example
2015-10-16 15:11:48 -07:00
Sebastiaan van Stijn 244d9c3370 remove incorrect "readonly" example
The :ro option can only be used for named and bind-mounted
volumes, not on "regular" (unnamed) volumes as explained in
https://github.com/docker/docker/pull/16013#issuecomment-146647216

The example in the documentation actually resulted in a
bind-mounted volume, mounted at "ro" inside the container.

This removes the incorrect example from the documentation.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-10-14 17:56:38 -07:00
Victor Vieux 17b0017cd0 use Server Version
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-10-14 17:46:59 -07:00
Mary Anthony 8fee1c2020 Enabled GitHub Flavored Markdown
GitHub flavored markdown is now supported for links and images. Also, ran LinkChecker and FileResolver. Yay!
Fixes from Spider check
Output for docker/docker now goes into engine directory

Signed-off-by: Mary Anthony <mary@docker.com>
2015-10-11 07:49:54 -07:00
moxiegirl 26ee5fea02 Merge pull request #16287 from mikebrow/16055-man-update-for-docker-run-with-host-volumes
man update for docker run with host volumes
2015-10-09 09:24:11 -07:00
moxiegirl b7083cf08b Merge pull request #15903 from charleswhchan/patch-1
Revise documentation for Docker LABEL.
2015-10-09 06:11:50 -07:00
Charles Chan c7e0531c3a Revise documentation for Docker LABEL, including review comments by @SvenDowideit and @thaJeztah in PR #15903.
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
2015-10-08 20:47:09 -07:00
Mary Anthony 5a94d2b5b9 Removing the tests. We have training site now.
Ugh...actually adding the files to delete

Signed-off-by: Mary Anthony <mary@docker.com>
2015-10-08 15:22:59 -07:00
Deng Guangxing 54f98f40a4 update dockernetwork.md and network api
Signed-off-by: Deng Guangxing <dengguangxing@huawei.com>
2015-10-08 15:34:24 +08:00
Madhu Venugopal dd28ded711 Networking API and UX documentation
More doc updates will follow

Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-10-07 03:54:27 -07:00
Brian Goff 40e8560412 Merge pull request #16415 from HuKeping/dockerinfo
Format output of docker info
2015-09-23 21:15:23 -04:00
Carol Fager-Higgins 3e6991f35c fixed jira DTR-1173 typo in link and additional edits
Signed-off-by: Carol Fager-Higgins <carol.fager-higgins@docker.com>
2015-09-23 12:33:45 -07:00