0e3b79cb4d
Merge pull request #18707 from runcom/update-labels-doc-for-emtpy-lables
...
update syntax for empty value labels
Upstream-commit: 18925f37ed5cfb9dd54ee10ee99bc5f990f156b0
Component: engine
2015-12-19 21:53:21 -08:00
27d8c0709b
Merge pull request #18720 from kytrinyx/unspecific-ubuntu
...
docs: remove ubuntu version in dockerizing userguide
Upstream-commit: 3d43ebebfae82b4c5cf5ce0987d087e7059829aa
Component: engine
2015-12-19 21:17:38 -08:00
ba3901d719
Fixing typo reported by @projectvalis
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 55a65e18c08e2612b5cc7384119e6ec44e476da7
Component: engine
2015-12-19 12:47:24 -08:00
8acdb0b4d5
Merge pull request #18684 from cdauth/volume-docs
...
Add note to volume docs that data is not copied to mounted volumes
Upstream-commit: 69fbdf4294b9c062bc711b978efcde82e40a293f
Component: engine
2015-12-19 15:29:44 +01:00
295cafe7dd
docs: userguide: labels-custom-metadsata.md: update syntax for emtpy value labels
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: aada8d81177de793db38845ff3a26949436e1ed6
Component: engine
2015-12-19 09:04:29 +01:00
e457303049
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 >
Upstream-commit: 68b07c0af947956581b1c3c1692ab5d8f96af73d
Component: engine
2015-12-16 11:25:15 -07:00
a99a73ad6e
Merge pull request #18700 from mqliang/patch-2
...
Update dockernetworks.md
Upstream-commit: 6f930a2ffa57b022947743d6f16751a27b93fbed
Component: engine
2015-12-16 16:58:25 +01:00
b6343dc716
Update dockernetworks.md
...
fix typo
Signed-off-by: mqliang <mqliang.zju@gmail.com >
Upstream-commit: f480b7c1f576f033ee276a026a790de415b9bf9c
Component: engine
2015-12-16 15:25:06 +08:00
86c606852c
fix typo in dockerlinks.md
...
fix typo in dockerlinks.md
Signed-off-by: mqliang <mqliang.zju@gmail.com >
Upstream-commit: e1f012cf397f170e12443e4993c09171791d37db
Component: engine
2015-12-16 11:21:39 +08:00
0515ab43ec
Add note to volume docs that data is not copied to mounted volumes
...
Signed-off-by: Candid Dauth <cdauth@cdauth.eu >
Upstream-commit: efb763aa10187e049fc6854e5a97efc410fcd214
Component: engine
2015-12-15 20:27:35 +01:00
34e0c13d67
fixed typo
...
Signed-off-by: mqliang <mqliang.zju@gmail.com >
Upstream-commit: 4c1243dc76ad4afa6cfa6eec3070073ba0cb0c6a
Component: engine
2015-12-15 23:00:47 +08:00
3c4fcf6b7a
Fix typos found across repository
...
Signed-off-by: Justas Brazauskas <brazauskasjustas@gmail.com >
Upstream-commit: 927b334ebfc786276a039e45ec097e71bf9a104c
Component: engine
2015-12-13 18:04:12 +02:00
22a82ca57b
Merge pull request #18389 from wenchma/doc_update_for_container-basics
...
docs: delete draft container-basics.md
Upstream-commit: 94026969b43fddee3fbf35e5888dee006a14e098
Component: engine
2015-12-12 21:39:34 -08:00
443714c6b5
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 >
Upstream-commit: 76de01c13833e42c89afa7e46d97bb4864a9be9b
Component: engine
2015-12-10 13:24:02 -06:00
04396c69aa
Add the actual command in this example.
...
Signed-off-by: Jeff Anderson <jeff@docker.com >
Upstream-commit: d8d38f234563a3be0b23cc94df3a9453eacfdee8
Component: engine
2015-12-09 10:17:39 -07:00
1085599321
Merge pull request #18478 from programmerq/novirt
...
Call it "containerization" instead of "virtualization" in the docs
Upstream-commit: 8ed14c207256836f86308f76d88fc800bb34e5f1
Component: engine
2015-12-08 16:45:29 -08:00
e1e5d41283
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 >
Upstream-commit: 0d1c5193b389052f11d77ca576f7dbb49b601135
Component: engine
2015-12-08 15:08:27 -07:00
f20b52f333
don't try to use default route MTU as bridge MTU
...
Signed-off-by: Patrick Hemmer <patrick.hemmer@gmail.com >
Upstream-commit: fd9d7c02fcc8edd73d056f56f17e5cfe1760495b
Component: engine
2015-12-07 17:32:51 -05:00
2079ca7585
Update dockervolumes.md
...
added rm flag to backup/restore commands in examples
Signed-off-by: Ilya Gusev <mail@igusev.ru >
Upstream-commit: 8923c30b4ad304b8ff285afae77bc70b1a2036cc
Component: engine
2015-12-07 15:20:10 +03:00
fde8f24281
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 >
Upstream-commit: f27572312fd363bcfe43a1ce71c7d225620302ac
Component: engine
2015-12-07 00:58:46 +01:00
d0e41cba7f
docs: fix typo in bash_history mount example
...
Signed-off-by: Kristian Haugene <kristian.haugene@capgemini.com >
Upstream-commit: 655766ed955477299fac95a0fcd60af58f2b5be8
Component: engine
2015-12-04 16:09:25 +01:00
cb3375532e
Update the "Manually network" section with detailed info in container-basics
...
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com >
Upstream-commit: a9473772972aefca9b88754c8e4dc98fdee71e92
Component: engine
2015-12-03 22:32:02 +08:00
f2ea55aeff
Add NETWORK_NAME_or_ID value for --net= option
...
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com >
Upstream-commit: 08328cb703c51ed4a2dfe985f618925fe3234080
Component: engine
2015-12-02 22:49:35 +08:00
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
