3a2fac0632
Merge pull request #17649 from rsmoorthy/rsmoorthy-patch-1
...
volume plugin doc update
Upstream-commit: 67630bef478dd6818e6e02f0c67b60ab935025c0
Component: engine
2015-11-03 23:33:20 +01: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
471dae2a92
Merge pull request #17650 from thaJeztah/fix-api-network-output
...
docs: update remote API responses and minor fixes
Upstream-commit: 43ae13742d88cdbe9f512f83347533e0ae143c0c
Component: engine
2015-11-03 16:09:01 +01: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
6f36892ab1
docs: update remote API responses and minor fixes
...
Add back the "old" networksettings fields that were removed,
but added back to maintain backward compatibility, in
https://github.com/docker/docker/pull/17538
Update network endpoint responses, with updated response
introduced in;
https://github.com/docker/docker/pull/17536
Added changes to v1.22 that were applied to the v1.21 / v1.20 docs
after the API bump(s);
https://github.com/docker/docker/pull/17085
https://github.com/docker/docker/pull/17127
https://github.com/docker/docker/pull/13707
Also fixed some mixed tab/spaces indentation
and Markdown formatting issues (causing code-blocks to
be rendered incorrectly)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 286fe69d5376add77dc31833dc3c2fcc9639dd17
Component: engine
2015-11-03 15:24:31 +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
b5c85683eb
multiple mount/unmount req with same volume name
...
Updating docs to handle mount/unmount requests with same volume name. Issue #17585
Signed-off-by: Moorthy RS <rsmoorthy@gmail.com >
Upstream-commit: 4d9b8bae25a89e3def7166d260b45f9c9e78ba9a
Component: engine
2015-11-03 16:33:20 +05:30
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
38f4e52734
Moving project to docker/opensource
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: e400125b662e6ea8605e05772ed79ea2781f6d17
Component: engine
2015-11-01 18:39:10 -08:00
1714a2463b
Merge pull request #17591 from moxiegirl/remove-old-api
...
Remove old api docs that are no-longer appearing on docs-docker.com
Upstream-commit: e2e2ea401a6e1095064bd8f5731f012cee45797b
Component: engine
2015-11-01 12:30:58 -08:00
136be8ed66
Remove old api docs that are no-longer appearing on docs-docker.com
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: d2382f7b96a58f141a83928f53930e9d946d6d04
Component: engine
2015-11-01 08:22:10 -08:00
7e41e50c2b
Update to hide the 1.10 material
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: e4d86c2c38f4c99660da8ed65a8103e283e07e23
Component: engine
2015-11-01 08:03:08 -08:00
f3f473fc03
Fixing broken links
...
Fixing the weight
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 5ce093e94565a5f32df9adf78dcdb6deeda75f79
Component: engine
2015-10-31 19:45:56 -07:00
e7fcbd2f49
Merge pull request #17523 from Evalle/17326-fix-ubuntu-installation-instructions
...
Fix ubuntu installation instructions page
Upstream-commit: aa832d019725160481b90204c317dd50f13e16c4
Component: engine
2015-10-30 10:10:04 -07:00
7e19db1fbc
Merge pull request #17447 from ehaydenr/master
...
Update kill.md
Upstream-commit: f714118439394a8e2af8121bb3538e007549843b
Component: engine
2015-10-30 10:07:44 -07:00
9514b66cfb
Merge pull request #16640 from samuelkarp/awslogs-logging-driver
...
[awslogs] Auto-detect region and set user-agent
Upstream-commit: c545dce004a4b833994478a2fc993ee8e2b3b2cd
Component: engine
2015-10-30 12:38:40 -04:00
16b4f94a28
Fix ubuntu installation instructions page
...
Signed-off-by: evalle <shmarnev@gmail.com >
Upstream-commit: eb0a208f4bad5623e360fa936bfd230cd72414c4
Component: engine
2015-10-30 15:46:34 +01:00
55e3716df6
Update kill.md
...
Added Note to show users that signals will not propagate to the container if the preferred exec form isn't used.
Signed-off-by: Eric Rosenberg <ehaydenr@gmail.com >
Upstream-commit: c1a5ee53c19d62918f5ef245b5d2268fb9c89ca8
Component: engine
2015-10-29 18:40:16 -05:00
28eb09ab06
Update inspect api examples with new network settings.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 9a7e632cf097b71aab6e46ef010d038f602e03d3
Component: engine
2015-10-27 19:56:29 -04:00
069f98c935
[awslogs] Auto-detect region on EC2 instances
...
Signed-off-by: Samuel Karp <skarp@amazon.com >
Upstream-commit: 8a6dfb26f30331231839c420f8cf8889c9ef35a8
Component: engine
2015-10-27 23:47:28 +00:00
3babd01129
Merge pull request #16017 from flowlo/master
...
docs: Explain volume_name in POST /container Binds
Upstream-commit: b96e076af9478f37c5efd3f56e5f0aa42c846b66
Component: engine
2015-10-27 23:28:47 +01:00
d0602d1990
Merge pull request #17401 from hugomarisco/patch-1
...
update gpg add key command, without sudo it fails
Upstream-commit: 1156b7ff66c749814535008e66149a6027dc9a36
Component: engine
2015-10-27 15:16:27 -07:00
00621ae8e2
Updating network commands: adding man pages
...
Adding Related information blocks
Final first draft pass: ready for review
Review comments
Entering comments from the gang
Updating connect to include paused
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: d5364c71140208e1b861625e6394a5623e878e34
Component: engine
2015-10-27 08:29:07 -07:00
232998cce7
update gpg add key command, without sudo it fails
...
Signed-off-by: Hugo Marisco <0x6875676f@gmail.com >
Upstream-commit: 7f7953dcc27206acc31bfdef56f7471017640b70
Component: engine
2015-10-27 13:49:52 +00:00
a589faa95d
command missing 'daemon'
...
Signed-off-by: Kun Zhang <zkazure@gmail.com >
Upstream-commit: 9b0d0a64fa92afc94617dbf38db980e415871d33
Component: engine
2015-10-27 16:22:09 +08:00
0fee88ca54
Tweaking some things
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 5560e8a61cd1920f915274e6cd6618d31c698247
Component: engine
2015-10-24 18:07:08 -07:00
f937755755
Merge pull request #16488 from splunk/splunk_log_driver
...
Add Splunk logging driver #16207
Upstream-commit: 8d4888df90c30a189821699e444bd6587c035a20
Component: engine
2015-10-23 18:22:14 -07:00
1489d6cd3f
Merge pull request #15780 from mountkin/build-multi-tags
...
Add ability to add multiple tags with docker build
Upstream-commit: 448398c2a8a41b6589dd7deb59fdc889e78db223
Component: engine
2015-10-23 13:50:35 -07:00
7a1aba432f
Add Splunk logging driver #16207
...
Allow to send Splunk logs using Http Event Collector
Signed-off-by: Denis Gladkikh <denis@gladkikh.email >
Upstream-commit: 1f1dbf312ddc299bdad408ce3d6b71f4f5993652
Component: engine
2015-10-23 13:37:53 -07:00
a4eeeb73b3
Add ability to add multiple tags with docker build
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com >
Upstream-commit: c2eb37f9aeb6215293483e02613514e49011cf2c
Component: engine
2015-10-24 00:59:56 +08:00
751dcfeab7
Two more links to fix
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 1f9332cd1684841d8b9ad9b3dcaee4d641ae1689
Component: engine
2015-10-23 14:10:43 +10:00
b4d3175bf2
Merge pull request #17275 from vdemeester/17246-tags-to-repotags
...
Use RepoTags & RepoDigest in inspect
Upstream-commit: 4c253ddf204f0c8ebc58c1aa5796c689d623e16b
Component: engine
2015-10-22 17:14:49 -04:00
e1f1cd631a
Use RepoTags & RepoDigest in inspect
...
To be coherent with /images/json (images command)
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: f664f6e4b19d4e155d78af2eacddcd941dae4fce
Component: engine
2015-10-22 23:00:59 +02:00
d91b6a5ec6
Merge pull request #17259 from SvenDowideit/fix-some-errant-links
...
Fix some errant links
Upstream-commit: bb19575d40b3ec679acd2aadeea37e7bba12179c
Component: engine
2015-10-22 07:26:15 -07: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
5c1cc8ba8e
Merge pull request #17241 from gondor/docs-extend-plugins
...
docs: Add Netshare volume plugin to extend/plugins
Upstream-commit: c6ec33ea8f8a2691c9a43f02cc69fcd204e04b18
Component: engine
2015-10-21 19:24:32 -07:00
ce2218086c
changes from review - which -> that
...
Signed-off-by: Jeremy Unruh <jeremybunruh@gmail.com >
Upstream-commit: a263709a9bce010082399fc539c385de3a059dda
Component: engine
2015-10-21 18:42:17 -07:00
bfa5462401
changes from review - move up to conform to alphabetical order
...
Signed-off-by: Jeremy Unruh <jeremybunruh@gmail.com >
Upstream-commit: f8c0d4d0550836eaba0b41df560464f048c5fdfd
Component: engine
2015-10-21 18:07:55 -07:00
6672204b41
Merge pull request #17136 from gesellix/change-route-volume-create
...
rename `POST /volumes` to `POST /volumes/create`
Upstream-commit: 492945235b6be7f2f7ff8721de0c01a93d0b0f6f
Component: engine
2015-10-21 10:21:27 -07:00
4f80c1b7df
docs: Add Netshare volume plugin to extend/plugins
...
Signed-off-by: Jeremy Unruh <jeremybunruh@gmail.com >
Upstream-commit: 95c053c56b8f8afffd7b2dac494b3cc2e71c4f6a
Component: engine
2015-10-21 08:28:37 -07:00
0c4bb86354
Merge pull request #17192 from HuKeping/docs-update
...
Docs: update docs for API stats
Upstream-commit: e92a735d7016ec79d0b0a91c0f003b2de2dabf9f
Component: engine
2015-10-20 06:15:58 -07:00
57a4cfdd46
Docs: update docs for API stats
...
Signed-off-by: Hu Keping <hukeping@huawei.com >
Upstream-commit: 969f1d9773509940666a87f8342168bd2a8cf06d
Component: engine
2015-10-20 16:31:20 +08:00
57010d523d
Merge pull request #16801 from aidanhs/aphs-add-socat-t
...
Update ambassador image, use the socat -t option
Upstream-commit: b826215c575e320f0cad7c07f8bfdf85437c1be9
Component: engine
2015-10-20 14:24:25 +10:00
cd8273e40c
Merge pull request #17127 from gesellix/docs-filters-query
...
docs: fix description of `filters` param for /volumes and /networks.
Upstream-commit: 8005dbd748103357949e6ece5cad35fcb3f15018
Component: engine
2015-10-19 09:49:37 -04:00
94c05d87ae
Update fedora doc
...
`service` is deprecated from Fedora v21.
It's important to enable and start the `docker` daemon using `systemctl`.
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com >
Upstream-commit: 6a648659915ad2be4b1e5841594279020821bec1
Component: engine
2015-10-18 23:00:23 +03:00
650f9b7712
docs: fix storage driver options list
...
This fixes the indentation of the storage driver
options list.
Also wraps/reformats some examples to prevent
horizontal scrollbars on the rendered HTML
Fixes #17140
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 8f36ded5b13b896d493645b845a24f4129b3a5de
Component: engine
2015-10-17 19:17:07 -07:00
4a78d859fe
rename POST /volumes to POST /volumes/create to be consistent with the other POST /.../create endpoints
...
see #17132
Signed-off-by: Tobias Gesellchen <tobias@gesellix.de >
Upstream-commit: 0c95eeb584f5033e1f1cc8eb383306b87d3f133f
Component: engine
2015-10-17 14:13:40 +02:00
efafa4e0c7
Merge pull request #17119 from vdemeester/17117-deprecate-c-cli-opts
...
Deprecate -c cli short variant flag in docker cli build & create
Upstream-commit: ab1f03397ed48440454332598fa707afa9187b42
Component: engine
2015-10-17 10:22:46 +02:00
