Commit Graph

89 Commits

Author SHA1 Message Date
265697d24d Merge pull request #18223 from thaJeztah/fix-table-markup
Fix markup for markdown table
Upstream-commit: 9bd5fd892617c589606efda5e209e2400c6946d7
Component: engine
2015-11-25 16:26:53 +01:00
7073afc49a 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>
Upstream-commit: bfdd94b0a8f0641f7bced9d3089a78e9550a7b04
Component: engine
2015-11-25 12:38:15 +01:00
51a4df16fb Fixing the volume options doc
Fixes #15896
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
Upstream-commit: 41a36529a71d96a9ed9d334a6efa72b4616c2abd
Component: engine
2015-11-25 03:56:55 -06:00
d1c20a52eb Correct some typos for docs
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Upstream-commit: 4d66f18be07b13cf41c48190d813fc045bb46678
Component: engine
2015-11-24 15:14:32 +08:00
6df421c14f Fixes found by docs validation tool
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 043f447e2e9ecb9d6f34bcee6c11f20f263baf66
Component: engine
2015-11-23 11:19:38 +10:00
4cd1a52462 Merge pull request #18026 from woodvi/doc-network-tutorial
change "Web" to "web" to match case-sensitive name used for creation;…
Upstream-commit: d8ea32caa8b312d5b3b01b4e72b8e0e56d958653
Component: engine
2015-11-20 10:46:00 +01:00
7c1d3da9d9 Small changes to storage driver/commands ref
Entering V's comments

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 9941d5bc33bc50c9e4e1fcba05c0f011bc0ae082
Component: engine
2015-11-19 17:13:23 -08:00
550ebeac8f Merge pull request #17973 from moxiegirl/fix-networking-issue
Fixing issue noted by user
Upstream-commit: 0780ad4857bb7db1caaf6c4c1d60970d5695c464
Component: engine
2015-11-18 12:49:11 +01:00
844d964e9e Fix Markdown syntax error in aufs-driver
Signed-off-by: dm4 <dm4@skymizer.com>
Upstream-commit: ea047640597929436f13099fb3dc1e52f98f685b
Component: engine
2015-11-17 17:38:36 +08:00
0cbb4862c1 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>
Upstream-commit: ac526193afca9cb529d6c61f88bbdde11e2382aa
Component: engine
2015-11-16 12:41:06 -08:00
e0d2996208 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>
Upstream-commit: be2152116cd719b65d4b58c3b8fb7f63d7655f4b
Component: engine
2015-11-16 08:24:26 -08:00
914d3208ce Fixing issue noted by user
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 0a316477802466c50a66d165f3f9c2e4c827675e
Component: engine
2015-11-13 10:28:51 -08:00
6b208d3136 Fix find and replace typo in dockerimages
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: a4b2de674c7030e70f671d5d6dcedb0c7ca5b0cd
Component: engine
2015-11-12 00:52:31 +01:00
60cb2034d2 Merge pull request #17883 from dave-tucker/bug/17709
Add required ports for Overlay to docs
Upstream-commit: 6c5395360fd9687fcd5962eb2b1c4fe0a7a2cabe
Component: engine
2015-11-11 13:10:22 -08:00
5521134e65 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>
Upstream-commit: f16dceb63233bd2c1fd327b92d7112e8012347ac
Component: engine
2015-11-11 20:31:18 +00:00
f5f4be1acc Add required ports for Overlay to docs
Fixes #17709

Signed-off-by: Dave Tucker <dt@docker.com>
Upstream-commit: 44a527d877faf0ef62bc9b0221f656041833ae66
Component: engine
2015-11-11 18:04:07 +00:00
04e53e786a Implicitly use swarm:latest so that master and agent use the same version of swarm
Signed-off-by: Anthony Dahanne <anthony.dahanne@gmail.com>
Upstream-commit: 4efe0def0ac2a8b6b74a818d23864f62abfaa521
Component: engine
2015-11-09 15:05:17 -08:00
193b8e63c7 Merge pull request #17713 from nathanleclaire/mhs_nits_2_the_sequel_electric_overloo
Revise commands in Compose section of multi-host quickstart
Upstream-commit: 8aa8d51610f509bbdbbe8409523da575d4907d28
Component: engine
2015-11-06 13:04:43 -08:00
d7b81a07c8 fix typo
Signed-off-by: Anton Polonskiy <anton.polonskiy@gmail.com>
Upstream-commit: 3f331eaa4092ff3a612a275351b82b44c778d9fa
Component: engine
2015-11-05 18:33:16 +02:00
dcbc728ac9 Fixes typo in docs/userguide/dockervolumes.md
Signed-off-by: Jeroen Jacobs <git@jeroenj.be>
Upstream-commit: 75602d4930e7b7fa7c958329b544401756991d88
Component: engine
2015-11-05 16:08:11 +01:00
51204c03cd Revise commands in Compose section of multi-host quickstart
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
Upstream-commit: 6326e6732dd217ba6c53ba80ba917d72ad0d1ce5
Component: engine
2015-11-04 17:44:01 -08:00
d20f80e318 Fix typo in dockervolumes.md
Signed-off-by: Alex Chan <alex@alexwlchan.net>
Upstream-commit: 40dc0c4861df0e087ffe43c416176a58f574e641
Component: engine
2015-11-04 22:13:35 +00:00
61a7faaa73 Fixing BTRFS > Btrfs
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 90e16ab8f97fc5146aab2e77a0fa6ec2d225ba32
Component: engine
2015-11-04 11:23:16 -08:00
b768870c71 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>
Upstream-commit: 39dfc536d444df8745124ffa38504241a0a985f7
Component: engine
2015-11-03 08:42:40 -08:00
342156922a Merge pull request #17652 from moxiegirl/nigel-credits
Nigel acknowledgement
Upstream-commit: d3b2e7dcf4991bf812cb329119420f03356aaa1a
Component: engine
2015-11-03 15:35:53 +01:00
f345c4165c Nigel acknowledgement
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 7b978cc3781758cfc12259a5259665ba5e822a84
Component: engine
2015-11-03 05:52:33 -08:00
f259c60206 Fixing ZooKeeper and some other nits Nathan found
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 0f1083c8dacb2ad189ccc4e4779c7e2dd054cb6b
Component: engine
2015-11-03 05:34:54 -08:00
6dcf9b9560 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>
Upstream-commit: 950fbf99b1214e77c0dcc27e8f9a16e01b2c630a
Component: engine
2015-11-02 21:40:18 -08:00
ecd671294f 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>
Upstream-commit: 9ef855f9e5fa8077468bda5ce43155318c58e60e
Component: engine
2015-11-02 21:14:55 -08:00
976823bb04 Fix some errant links
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 9ed6cec8ff91ff100c268fa21817fdc111e77e43
Component: engine
2015-10-22 20:33:24 +10:00
b8701b18c6 Merge pull request #17051 from thaJeztah/fix-volume-readonly-doc
remove incorrect "readonly" example
Upstream-commit: 475be776b877c787c7e679cfb0a60b888823ed86
Component: engine
2015-10-16 15:11:48 -07:00
453cdc0662 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>
Upstream-commit: 244d9c337034b0db030c05189ca8eb2323d92c61
Component: engine
2015-10-14 17:56:38 -07:00
fbe671eb09 use Server Version
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 17b0017cd0949f0772a849e6e5d0ee6084ff5340
Component: engine
2015-10-14 17:46:59 -07:00
6b6c7cc2b6 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>
Upstream-commit: 8fee1c2020186ac100b45e64864b94ae3a169ad5
Component: engine
2015-10-11 07:49:54 -07:00
1863ad7ae9 Merge pull request #16287 from mikebrow/16055-man-update-for-docker-run-with-host-volumes
man update for docker run with host volumes
Upstream-commit: 26ee5fea02c7e7d09addc13275a0a44d2f608a4c
Component: engine
2015-10-09 09:24:11 -07:00
0de3aef69d Merge pull request #15903 from charleswhchan/patch-1
Revise documentation for Docker LABEL.
Upstream-commit: b7083cf08bc37e52cf7c49ce4f7d42f30576dbd0
Component: engine
2015-10-09 06:11:50 -07:00
774ab0f6af 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>
Upstream-commit: c7e0531c3ab1844423e64ef49619faa24471f2e3
Component: engine
2015-10-08 20:47:09 -07:00
f583b724cf Removing the tests. We have training site now.
Ugh...actually adding the files to delete

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 5a94d2b5b9dc0d09d8113396f26d1757142c0661
Component: engine
2015-10-08 15:22:59 -07:00
0012e76955 update dockernetwork.md and network api
Signed-off-by: Deng Guangxing <dengguangxing@huawei.com>
Upstream-commit: 54f98f40a478903345400656268202b69b50d46d
Component: engine
2015-10-08 15:34:24 +08:00
af07841b68 Networking API and UX documentation
More doc updates will follow

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: dd28ded711417c72d2e228d1ace129ac5fd05f19
Component: engine
2015-10-07 03:54:27 -07:00
4422b77499 Merge pull request #16415 from HuKeping/dockerinfo
Format output of docker info
Upstream-commit: 40e856041265d6030768286f1b228f042c0f768b
Component: engine
2015-09-23 21:15:23 -04:00
e2a6738cd5 fixed jira DTR-1173 typo in link and additional edits
Signed-off-by: Carol Fager-Higgins <carol.fager-higgins@docker.com>
Upstream-commit: 3e6991f35c6b98f3503cc81f166420645e7d3c9e
Component: engine
2015-09-23 12:33:45 -07:00
75633de557 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>
Upstream-commit: 141e91c4803124bdf55dd45a06998748b0ef5fb2
Component: engine
2015-09-23 14:35:13 +08:00
361e22d91a docs: userguide: add container labels section
Signed-off-by: Antonio Murdaca <runcom@linux.com>
Upstream-commit: 124540c08603f1eda956f16e2eef2f42d3b3e80f
Component: engine
2015-09-21 14:41:22 +02:00
6495902bb6 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>
Upstream-commit: 2b6b9a8018e517af859ae45749bff1c654a4ab95
Component: engine
2015-09-17 12:15:18 -05:00
f294888a6f Merge pull request #16100 from ZJU-SEL/fix-document-about-vol
fix doc about vol
Upstream-commit: 9d0954a83d6c7b52287a62f8ab7ad42d544322a0
Component: engine
2015-09-12 02:50:49 +02:00
f85db4289c fix doc about vol
Signed-off-by: xlgao-zju <xlgao@zju.edu.cn>
Upstream-commit: af14c6e7aa369ebca640ccb0197f9afbfd2e749a
Component: engine
2015-09-11 10:49:39 +08:00
762165daa3 Minor formating changes
- Changed ";" to "." at the end of bullet points for consistency

Signed-off-by: Artur Meyster <arthurfbi@yahoo.com>
Upstream-commit: f8308a496565a85eb01100e5645e54f80ba76c83
Component: engine
2015-09-09 00:21:22 -07:00
787635e646 Added periods at the end of bullet points for consistency
Signed-off-by: Artur Meyster <arthurfbi@yahoo.com>
Upstream-commit: 2022fa81fff0d9dc49045743e82a5838f82f8bb8
Component: engine
2015-09-08 23:17:10 -07:00
c29130b3da updating again.
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 7271dca8cc4570a28feba5a45153497dd452d899
Component: engine
2015-08-31 09:56:35 -07:00