Commit Graph

224 Commits

Author SHA1 Message Date
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
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
Mary Anthony d550d729e1 Initial work
Removing references to regsitry 1.0, pointing to distribution
Updating links and title
Adding in comments

Signed-off-by: Mary Anthony <mary@docker.com>
2015-08-10 17:43:41 -07:00
bin liu b0a65f93a5 change port number through example context
Signed-off-by: bin liu <liubin0329@gmail.com>
2015-08-10 23:12:03 +08:00
Charles Chan 316eb2979e Improve/fix "Dockerizing Applications" page.
* Try to update the wording for the notes.

Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
2015-08-08 16:13:23 -07:00
Sven Dowideit 818190b1ff Merge pull request #15351 from SvenDowideit/remove-hub-v1-documentation
Removing Hub v1 documentation, Hub v2 documentation will come from th…
2015-08-07 10:33:15 +10:00
Sven Dowideit 9f530aba7f remove unused images
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-08-06 23:34:29 +00:00
Sven Dowideit 70092b3ee0 Removing Hub v1 documentation, Hub v2 documentation will come from that repository
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-08-06 23:00:49 +00:00
Mary Anthony cc375a1e48 - Remove references to sudo in basics.md; see sudo instructions top of file
- Removing references to Boot2Docker replacing with Docker Machine
- Removing sudo warnings in instances where appropriate (no sudo in file)
- Updating with comments

Signed-off-by: Mary Anthony <mary@docker.com>
2015-08-05 19:45:43 -07:00
Vincent Demeester 5d57f56362 Fix "Getting started" link in userguide
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-08-03 11:48:59 +02:00
Mary Anthony 1825e06944 Remove references to boot2docker replace with docker-machine
- boot2docker is deprecated in the 1.8.0
- docker-machine replaces it
- this fixes #14563
- Updating with thaJetzah comments

Signed-off-by: Mary Anthony <mary@docker.com>
2015-07-27 18:25:50 -07:00
moxiegirl 2b847df8c2 Merge pull request #14939 from rtrauntvein/docs-autobuild
Fix broken link in automated build doc
2015-07-24 13:48:14 -07:00
Ryan Trauntvein 8e66e627d7 Fix broken link in automated build doc
Signed-off-by: Ryan Trauntvein <rtrauntvein@novacoast.com>
2015-07-23 23:12:06 -07:00
Tibor Vass e246f1e4ee Update docs to use the new `docker daemon` command
Signed-off-by: Tibor Vass <tibor@docker.com>
2015-07-23 20:31:43 -04:00
Vincent Demeester dc8b765930 Update documentation according to opts updates
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-07-21 14:08:19 +02:00
Nate Brennand 6827782bef update reference to config file
`docker login` in 1.7 produces a config file in `~/docker/config.json`
instead of a `~/.dockercfg`.

Signed-off-by: Nate Brennand <nate.brennand@clever.com>
2015-07-10 18:55:47 +00:00
Sebastiaan van Stijn 57286aad25 Merge pull request #14235 from mlarcher/mlarcher-patch-2
Add workaround in docs for git bash usage issue
2015-07-04 21:00:53 +02:00
mlarcher 33be2c5d2e Add workaround in docs for git bash usage issue
When using boot2docker through git bash, there is a nasty issue when trying to share a folder, due to how git bash parses the URIs. The issue is explained in [issue #12751](https://github.com/docker/docker/issues/12751) but needs more visibility in the docs.

Signed-off-by: Matthieu Larcher <github@ringabell.org>
2015-07-03 09:07:44 +02:00
ayoshitake 0ed7fd46b6 Edit "Working with Containers" page for readability
Signed-off-by: ayoshitake <airandfingers@gmail.com>
2015-07-02 23:10:36 -07:00
Mary Anthony 328dbd0aa2 Fixing seds, deleting old stuff
Signed-off-by: Mary Anthony <mary@docker.com>

Upding sed, adding script to avoid redirects, remove mkdos

Signed-off-by: Mary Anthony <mary@docker.com>

Ignoring graphics with sed

Signed-off-by: Mary Anthony <mary@docker.com>

Fixing kitematic image

Signed-off-by: Mary Anthony <mary@docker.com>

Removing draft

Signed-off-by: Mary Anthony <mary@docker.com>

Fixing link

Signed-off-by: Mary Anthony <mary@docker.com>

removing from the menu

Signed-off-by: Mary Anthony <mary@docker.com>

Updatiing order of project material

Signed-off-by: Mary Anthony <mary@docker.com>

Removing from Regsitry v2 content per Olivier

Signed-off-by: Mary Anthony <mary@docker.com>

tweaking the touchup

Signed-off-by: Mary Anthony <mary@docker.com>

Removing include; only used four places; hugo global var replace

Signed-off-by: Mary Anthony <mary@docker.com>

Entering fixes from page-by-page

Signed-off-by: Mary Anthony <mary@docker.com>
2015-06-17 21:05:37 -07:00
Mary Anthony f93fee5f48 retooling for hugo
Tweaking for Hugo
Updating the Dockerfile with new sed; fix broken link on Kitematic
Fixing image pull for Dockerfile
Removing docs targets

Signed-off-by: Mary Anthony <mary@docker.com>
2015-06-15 13:19:38 -07:00