Commit Graph
69 Commits
Author SHA1 Message Date
Dave Tucker 6702fac9af Add required ports for Overlay to docs
Fixes #17709

Signed-off-by: Dave Tucker <dt@docker.com>
(cherry picked from commit 44a527d877faf0ef62bc9b0221f656041833ae66)
2015-11-12 15:13:00 -05:00
David Currie 5b0ca7c58a 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>
(cherry picked from commit f16dceb63233bd2c1fd327b92d7112e8012347ac)
2015-11-12 15:12:59 -05:00
Anthony Dahanne fe7768f54d Implicitly use swarm:latest so that master and agent use the same version of swarm
Signed-off-by: Anthony Dahanne <anthony.dahanne@gmail.com>
(cherry picked from commit 4efe0def0ac2a8b6b74a818d23864f62abfaa521)
2015-11-09 19:12:38 -05:00
Nathan LeClaire 6aa14d58ff Revise commands in Compose section of multi-host quickstart
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
(cherry picked from commit 6326e6732dd217ba6c53ba80ba917d72ad0d1ce5)
2015-11-09 18:36:29 -05:00
Anton Polonskiy 56cc398564 fix typo
Signed-off-by: Anton Polonskiy <anton.polonskiy@gmail.com>
(cherry picked from commit 3f331eaa4092ff3a612a275351b82b44c778d9fa)
2015-11-09 18:36:28 -05:00
Mary Anthony 2c20ae1fef Fixing BTRFS > Btrfs
Signed-off-by: Mary Anthony <mary@docker.com>
(cherry picked from commit 90e16ab8f97fc5146aab2e77a0fa6ec2d225ba32)
2015-11-09 18:36:27 -05:00
Madhu Venugopal 17fb8c3c5a 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>
(cherry picked from commit 39dfc536d444df8745124ffa38504241a0a985f7)

Conflicts:
	docs/reference/api/docker_remote_api_v1.22.md
2015-11-03 12:01:52 -05:00
Mary Anthony 0849a71036 Nigel acknowledgement
Signed-off-by: Mary Anthony <mary@docker.com>
(cherry picked from commit 7b978cc3781758cfc12259a5259665ba5e822a84)
2015-11-03 12:01:52 -05:00
Mary Anthony b53c39f606 Fixing ZooKeeper and some other nits Nathan found
Signed-off-by: Mary Anthony <mary@docker.com>
(cherry picked from commit 0f1083c8dacb2ad189ccc4e4779c7e2dd054cb6b)
2015-11-03 12:01:52 -05:00
Mary Anthony c50bd847a7 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>
(cherry picked from commit 950fbf99b1214e77c0dcc27e8f9a16e01b2c630a)
2015-11-03 12:01:51 -05:00
Mary Anthony fa2a6b3522 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>
(cherry picked from commit 9ef855f9e5fa8077468bda5ce43155318c58e60e)
2015-11-03 12:01:51 -05:00
Sven Dowideit f2671e07b3 Fix some errant links
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-10-22 16:14:13 -04:00
Victor Vieux ac4349bd30 use Server Version
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-10-22 15:06:59 -04: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
Hu Keping 141e91c480 Format output of docker info
Format those info which will only be displayed when daemon is
in debug mode.

Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-09-23 14:35:13 +08:00
Antonio Murdaca 124540c086 docs: userguide: add container labels section
Signed-off-by: Antonio Murdaca <runcom@linux.com>
2015-09-21 14:41:22 +02:00
Mike Brown 2b6b9a8018 man update for docker run with host volumes
Signed-off-by: Mike Brown <brownwm@us.ibm.com>

cleaning up docker run -v documentation for man and web reference guide

Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2015-09-17 12:15:18 -05:00
Sebastiaan van Stijn 9d0954a83d Merge pull request #16100 from ZJU-SEL/fix-document-about-vol
fix doc about vol
2015-09-12 02:50:49 +02:00
xlgao-zju af14c6e7aa fix doc about vol
Signed-off-by: xlgao-zju <xlgao@zju.edu.cn>
2015-09-11 10:49:39 +08:00
devmeyster f8308a4965 Minor formating changes
- Changed ";" to "." at the end of bullet points for consistency

Signed-off-by: Artur Meyster <arthurfbi@yahoo.com>
2015-09-09 00:21:22 -07:00
Artur Meyster 2022fa81ff Added periods at the end of bullet points for consistency
Signed-off-by: Artur Meyster <arthurfbi@yahoo.com>
2015-09-08 23:17:10 -07:00
Mary Anthony 7271dca8cc updating again.
Signed-off-by: Mary Anthony <mary@docker.com>
2015-08-31 09:56:35 -07:00
Mary Anthony 95495d20be Updating with SEb's comments
Signed-off-by: Mary Anthony <mary@docker.com>
2015-08-31 09:54:15 -07:00
LIZAO LI b0fd4f882f add: best practice for security when sharing host directories.
Closes and carries PR #15210
Updating with Seb's comment

Signed-off-by: Mary Anthony <mary@docker.com>
2015-08-31 09:32:42 -07:00
Mary Anthony 2920550211 Closes #14234 and updates text
Updating with Seb's comments
Entering Sven's comment

Signed-off-by: Mary Anthony <mary@docker.com>
2015-08-29 13:15:36 -07:00
Sebastiaan van Stijn 44ea7e91fb Merge pull request #15760 from mikebrow/9235-improve-documentation
Improvement to userguide/dockerrepos/ documentation
2015-08-27 01:21:12 +02:00
Mike Brown 5caccd27cd improvement to documentation
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2015-08-26 16:49:31 -05:00
Alexander Morozov 7a74422724 Merge pull request #15826 from Microsoft/start-from-one
Builder counts from 1
2015-08-26 13:59:38 -07:00
John Howard 17d6c6c7e5 Builder counts from 1
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-08-26 10:05:04 -07:00
Spencer Smith 9a71dd2b90 Resolves link to introduction to Docker
Signed-off-by: Spencer Smith <robertspencersmith@gmail.com>
2015-08-25 13:54:39 -07:00
Sebastiaan van Stijn 59e49e1db0 Merge pull request #12927 from lindenlab/custom-host-port-ranges
Proposal: Change --publish=SPEC to allow binding to custom host port ranges
2015-08-19 17:04:23 +02:00
moxiegirl aacb47d628 Merge pull request #15671 from tonistiigi/fix-volume-userguide
Update volumes userguide
2015-08-18 18:57:24 -07:00
Mary Anthony 85c2c77188 Updating hashcode links to commands
Signed-off-by: Mary Anthony <mary@docker.com>
2015-08-18 12:25:59 -07:00
Tonis Tiigi cc2aab7816 Update volumes userguide
Fixes #15644

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2015-08-18 12:17:45 -07:00
Sven Dowideit 30cde97e5c use the Docker Hub as the product name
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-08-18 21:13:57 +10:00
moxiegirl 5ab6883b92 Merge pull request #15430 from charleswhchan/patch-2
Cleanup "Working with containers" page.
2015-08-17 17:46:05 -07:00
Charles Chan 2fcae333e8 Cleanup "Working with containers" page.
* Cleanup introduction
* Update output of `docker version`
* Cleanup explaination of `docker inspect`
* Change 'deleting' to 'removing' for consistency

Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
2015-08-15 08:44:56 -07:00
Don Kjer 47272f9cc5 Adding support to publish on custom host port ranges
Signed-off-by: Don Kjer <don.kjer@gmail.com>

Changing vendor/src/github.com/docker/libnetwork to match lindenlab/libnetwork custom-host-port-ranges-1.7 branch
2015-08-15 02:41:29 +00:00
moxiegirl aedd45346a Merge pull request #15428 from charleswhchan/patch-1
Improve/fix "Dockerizing Applications" page.
2015-08-14 14:03:11 -07:00
Sebastiaan van Stijn 6b1b1ad31c Merge pull request #15451 from liubin/liubin/fix-broken-link
fix broken link to wiki
2015-08-13 17:03:41 +02:00
bin liu f6753cd963 fix broken link to glossary page.
Signed-off-by: bin liu <liubin0329@gmail.com>
2015-08-13 22:40:20 +08:00
moxiegirl 8a0efadee1 Merge pull request #15450 from liubin/liubin/change-port-number-through-example
change port number through example context
2015-08-12 09:49:50 -07:00