Commit Graph

202 Commits

Author SHA1 Message Date
2250308978 Fix typo
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: ca64269165fb30765d7ea0b0b231674df8da157b
Component: engine
2016-03-17 16:13:51 +08:00
352972d26e Merge pull request #20962 from lyndaoleary/docs-engine-edits
Edited content in the Hello World section
Upstream-commit: f3acca2fc8c84afd41b05c8bc9b3dba00036e6ac
Component: engine
2016-03-16 23:48:59 +00:00
2093c7b7f9 Update docs: A more accurate size for debian image
Fixes: #21195

The current size of the debian image is 125.1 MB so I have updated the Markdown to say "under 150". Also removed "extremely" (minimal) as requested.  Documentation built and tested using `make docs`.

Signed-off-by: Lucas Chan <lucas-github@lucaschan.com>
Upstream-commit: 2f634e4691d13616cf8c714ec7653616ec3b121a
Component: engine
2016-03-15 18:29:06 +11:00
ed5dba754a Merge pull request #21158 from thaJeztah/add-alias-for-removed-docs
Add redirects for old Docker Cloud tutorial
Upstream-commit: 7ae199052678c08cceec069a6014edfc4034c0f8
Component: engine
2016-03-14 10:24:12 -07:00
b92020dc4b Merge pull request #21120 from lirantal/feature/21119-docker-config-for-windows
closes #21119 updating documentation for Windows and OSx users
Upstream-commit: f3485bc125afbb0930674e9f5a4f02cdd9989aea
Component: engine
2016-03-14 01:38:26 +01:00
3d62a1d04d Merge pull request #21122 from mavenugo/mviv
Vendor libnetwork v0.7.0-dev.7 : Experimental MacVlan and IPVlan network drivers
Upstream-commit: 2d74f78ab59c4e24c5f328f3d85671359b8ed828
Component: engine
2016-03-13 11:32:58 -07:00
60406a0aa6 closes #21119 - updating documentation for Windows and OSx users
Updating Docker's documentation file docker configuration file on Windows hosts.
This is of importance for Windows users whom are utilizing the Docker Toolbox.

Signed-off-by: Liran Tal <liran.talh@gmail.com>
Upstream-commit: d2aa521822135009168fe5a13d372fbc6969dc91
Component: engine
2016-03-13 17:55:34 +02:00
87bb152f6d Add redirects for old Docker Cloud tutorial
This page has been deleted from the Docker Cloud tutorials,
so adding redirects for the old locations.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 94336cb5dd7bce9f34901a86000a124a6d6c68ef
Component: engine
2016-03-12 13:51:26 +01:00
32fe9a153d docs for experimental vlan net drivers
Signed-off-by: Brent Salisbury <brent@docker.com>
Upstream-commit: 9cb6b51fa24b95789693fa65aa58fe3ad1f36014
Component: engine
2016-03-11 16:01:01 -08:00
54863887b3 Document Volume Removal in User Guide
Resolves: #20113
Signed-off-by: Aditi Rajagopal <arajagopal@us.ibm.com>

Carry #20160
Tighten language
Updating with comments
Removing articles which is empty
Adding Brian's comments
Putting back what I took out

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: ae66d536a5928c9134a4a70761ebc93de0320197
Component: engine
2016-03-11 12:29:47 -08:00
2109e80f1b Merge pull request #20930 from cloojure/patch-3
Update dockernetworks.md
Upstream-commit: faacbcf53e8c702c211d9be549d06c1aff6fb100
Component: engine
2016-03-09 15:58:38 +01:00
fa5fd5c52c Update dockervolumes.md
Fix JSON highlighting

Signed-off-by: Rasmus Abrahamsen <spam@rasmusa.net>
Upstream-commit: 086d06dce1056521d3980e07373fad2070daffb1
Component: engine
2016-03-07 18:47:45 +01:00
fee1b26200 Edited content in the Hello World section
Signed-off-by: Lynda O'Leary <lyndaoleary29@gmail.com>
Upstream-commit: 3b74be8ab7d93a70af3e0ac6418627c1de72228b
Component: engine
2016-03-04 18:50:48 +00:00
3276f20bd0 Update links to Docker Hub
Updates links to Docker Hub with their new
URLs to prevent redirects.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 69004ff67eed6525d56a92fdc69466c41606151a
Component: engine
2016-03-04 15:48:52 +01:00
6a82bd334a Update dockernetworks.md
Make command line prompts consistent for both host and container shells.

Signed-off-by: Alan Thompson <cloojure@gmail.com>
Upstream-commit: 65a381ae32d86c4cfe3ae5157e53d16b97b4d64f
Component: engine
2016-03-03 16:32:24 -08:00
afc4d63ffe Merge pull request #20565 from kencochrane/remove_email_on_login
Remove email address field from login
Upstream-commit: 2453262e7ba131fede74dbf31df41da9d2f36c34
Component: engine
2016-03-01 08:02:16 -08:00
ede5a6202a Remove the duplication
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Upstream-commit: 9f8f28684f196ff3790ff1c738e81743821fc860
Component: engine
2016-03-01 17:53:36 +08:00
2919d69a0c Remove email address field from login
This removes the email prompt when you use docker login, and also removes the ability to register via the docker cli. Docker login, will strictly be used for logging into a registry server.

Signed-off-by: Ken Cochrane <kencochrane@gmail.com>
Upstream-commit: aee260d4eb3aa0fc86ee5038010b7bbc24512ae5
Component: engine
2016-02-29 17:53:27 -08:00
cee58ed27a Merge pull request #20629 from wallnerryan/intro-volumes
Intro volume drivers in dockervolumes.md
Upstream-commit: 6c01d2a0cf4feb24bddf6830fd1683060c0ff309
Component: engine
2016-02-29 16:59:43 +01:00
47e8179868 intro volume plugins in userguide volumes
NOTE should be lowercase

Signed-off-by: Ryan Wallner <ryan.wallner@clusterhq.com>

add link to list of plugins

Signed-off-by: Ryan Wallner <ryan.wallner@clusterhq.com>

address changres

Signed-off-by: Ryan Wallner <ryan.wallner@clusterhq.com>
Upstream-commit: b6fdcd3a342dc882955253e0a39711ed4ac078fc
Component: engine
2016-02-29 10:56:32 -05:00
bd7351183c fixed formatting; added handy -y to apt-get install
Signed-off-by: Pavel Sutyrin <pavel.sutyrin@gmail.com>
Upstream-commit: 30c2770a736e6c731f4046431f0f4275dadbd536
Component: engine
2016-02-28 20:37:04 +03:00
8bd4c1506d docs: simplify some steps of the overlay network guide
Instead of using a process expansion to feed the right arguments to
docker to run on "mh-keystore", just moves up the next step which makes
"mh-keystore" the default target. This makes the guide a bit shorter and
easier to understand.

Signed-off-by: Vincent Bernat <vincent@bernat.im>
Upstream-commit: db5ded0dfc28c71276acf8500fabe3c64c15fbe1
Component: engine
2016-02-25 13:17:26 +01:00
ce26dfb6b0 Fix typo
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 2264bd95b681d1336b167c8ecd9b2ce65b963071
Component: engine
2016-02-23 10:25:24 +08:00
6da923628b Merge pull request #20528 from cloojure/patch-3
Update dockernetworks.md
Upstream-commit: 3646b14ecd9c07d9d4113b5a36958d3f92484806
Component: engine
2016-02-20 23:25:51 +01:00
d560df1e09 Update configure-dns.md
Modify word error
Signed-off-by: hsinko <21551195@zju.edu.cn>
Upstream-commit: 0b64280195d59643ddf529235e646d741db26455
Component: engine
2016-02-20 11:51:59 +08:00
a4f9e19fdf Update dockernetworks.md
Fix truncated sentence

Signed-off-by: Alan Thompson <cloojure@gmail.com>
Upstream-commit: 549fa67dae346e8f9fe5590f914a97b1a18e46d6
Component: engine
2016-02-19 16:57:13 -08:00
59be9aceed Fix typo error of dockernetworks.md
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Upstream-commit: f03050cc4c4512f28b74ec2e8fc4bee81b72b4e0
Component: engine
2016-02-19 17:18:52 +08:00
7d665cca4e Merge pull request #17513 from aidanhs/aphs-expose-ipv6-default-bridge
Expose bridge IPv6 setting to `docker network inspect`
Upstream-commit: 2e6c841b826cc73332c44d5a04a5996fc65af724
Component: engine
2016-02-18 10:35:04 -08:00
2884a8cafd Merge pull request #20425 from HackToday/fixindex
Fix wrong index marking
Upstream-commit: a9c73b1a7ebe4ccd6893f37d2515be94000d081a
Component: engine
2016-02-18 14:49:15 +01:00
59522de764 Fix wrong index marking
The index was wrong set in docs, so let's fix it

Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
Upstream-commit: 0b4e0ce7cda357904342d41ea139519b8bbf755b
Component: engine
2016-02-18 03:08:21 +00:00
00d55504d4 Add sudo for related command
The du need sudo to perform to get correct results.

Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
Upstream-commit: f7fe2f0992126d45802a376b6da760d4e2b8607c
Component: engine
2016-02-18 02:58:26 +00:00
e1a8ad7624 Fix documentation typos
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 7da5784b10a9f085af98984e6e69e733e55ddbf5
Component: engine
2016-02-15 15:46:56 +01:00
949eabdb95 Merge pull request #20285 from moxiegirl/fix-user-guide
Update the userguide to fix user feedback
Upstream-commit: b734d0e8cc69eadaff86884c200d1ce21b37cdb3
Component: engine
2016-02-12 11:07:03 -08:00
5ceee3f64c Update the userguide to fix user feedback
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: bf76b1d686018cebd043aa99152d68fbbe6bb977
Component: engine
2016-02-12 10:08:59 -08:00
ee0d6d6dac Merge pull request #20266 from npcode/fix-docs-dockernetworks-three-options
Fix an erratum; s/two/three/
Upstream-commit: 3a3c9538060ebe300cc2272ad28178450b5fdd53
Component: engine
2016-02-12 09:58:48 -08:00
0f9dad85b1 Fix an erratum; s/two/three/
There are three options because the new one was added at 6f863cf.

Signed-off-by: Yi EungJun <eungjun.yi@navercorp.com>
Upstream-commit: 8c93958fcb1b1fc838c76b08cc4dde4ce37691bb
Component: engine
2016-02-13 00:14:35 +09:00
c48f1ccfa7 Fix some formatting
* Codified example container names
* Emphasised 'link' vs 'legacy link' (instead of using code markup)
* Add a missing ``` for a code example

Signed-off-by: Roland Huß <roland@jolokia.org>
Upstream-commit: 03b25e024e46a3254012268cda8919a8702b4cbc
Component: engine
2016-02-12 10:34:55 +01:00
7f66344ec0 Add docs for --ipv6 option, also add --internal as appropriate
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
Upstream-commit: d736a9d2c3758fcc4eac0b62e9c7b128388021c1
Component: engine
2016-02-12 01:42:15 +00:00
697a990701 fix common misspell
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 99a396902f0ea9d81ef87a683489b2435408f415
Component: engine
2016-02-11 15:49:36 -08:00
342ff0d65d Overlay Network needs Unique Hostname
Resolves: #19301
Signed-off-by: Aditi Rajagopal <arajagopal@us.ibm.com>
Upstream-commit: 3024604054a588f213b671c7f1ec5eed2c99b78a
Component: engine
2016-02-08 15:14:38 -06:00
1297aa4525 Tweak VM volume mapping paragraph
The wording looked like there was maybe a copy-paste error there, I tried to make it a bit more clear.

Signed-off-by: Ilkka Laukkanen <ilkka@ilkka.io>
Upstream-commit: a3c290536a844fd57326a2c2776adbfdc84cc984
Component: engine
2016-02-06 13:35:02 +02:00
bace12bd53 Add support details for storage driver
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
Upstream-commit: feab8b179e20833dd0a65e58934cf24938da6d84
Component: engine
2016-02-04 00:51:02 +00:00
856f16871a Fix typo
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 2fd35de274fa25d5031756eb5fdf3f3240bc4d9d
Component: engine
2016-02-02 19:07:58 -08:00
51e3bc5e37 Update networkingcontainers.md
updated line on how to exit the container after the ping test - in my environment (Ubuntu 14.04.1, bash) ctrl-c does not work to exit the shell, and `exit` must be used instead.

Signed-off-by: Troy Denton <Troy.Denton@younessleeptechnologies.com>
Upstream-commit: 0e147547660c830e5ea33a0b9a0281e64256efab
Component: engine
2016-02-02 19:05:55 -08:00
53c800043a Merge pull request #19865 from mavenugo/ndocs
Docs cleanup for networking features added in 1.10
Upstream-commit: ef52a53c34d9f128d9435d031442509837c25c02
Component: engine
2016-02-02 17:36:46 +01:00
01f2954590 Docs cleanup for networking features added in v1.10
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 6f863cfa18f30d1df2f1f81b2b4f456dee2a73b8
Component: engine
2016-02-02 06:10:41 -08:00
642e9a30eb Correct old virtual size
In new content addressable model, image no longer
have virtual size column, it is now 'size'. So we
need to update related docs about them.

Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
Upstream-commit: 1ab7d76f30f3cf693c986eb827ad49a6554d806d
Component: engine
2016-02-02 12:28:33 +00:00
486d68813e Updating for CAS changes and new select a driver section
Adding changes requested by @jamtur01 and wrapping to 80 chars
Adding typo fixes and replacing tabs with 4xspaces
Closes and fixes #19240
Updating with content addressable storage model changes

Signed-off-by: Nigel <nigelpoulton@hotmail.com>
Upstream-commit: 89923c1f32aeff5bf11fbb04723dd0e154559545
Component: engine
2016-01-30 18:03:04 -08:00
9cc23f26d7 docs: document options for default network driver
Fixes issue #18410

Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Upstream-commit: ebd1f70165faf1c19325f930b866365cab8e765b
Component: engine
2016-01-28 11:49:07 +08:00
e734434f58 Creating Engine specific menu
Fixing the links
Updating with Seb's comments
Adding weight
Fixing the engine aliases
Updating after Arun pushed
Removing empty file

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: e310d070f498a2ac494c6d3fde0ec5d6e4479e14
Component: engine
2016-01-26 15:58:53 -08:00