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
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
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
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
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
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
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
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
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
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
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
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
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
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
ce075943c3
docs: fix description of filters param for /volumes and /networks.
...
fixes #17091
Signed-off-by: Tobias Gesellchen <tobias@gesellix.de >
Upstream-commit: 3e064371e7ddec0de4dd2af75d5ac227b1080d53
Component: engine
2015-10-17 00:24:40 +02:00
943431b7fa
Deprecate -c cli short variant flag in docker cli
...
- build
- create
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: d1064bd441612244d7a560c6ceb3704ad12b23a6
Component: engine
2015-10-17 00:05:34 +02:00
a120d9f127
Merge pull request #17085 from dnephin/add_digest_to_api_docs
...
Correct API docs for /images/create
Upstream-commit: e2870bda43aef2e7649bf811b451d765ed16b4c4
Component: engine
2015-10-16 10:10:41 -07:00
aa3a6d8798
bad d
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: ee30af5ffb9b4db808c7e1e6db69c0c600e525c7
Component: engine
2015-10-16 06:09:03 -07:00
8cbac2fa0e
Removing extra tic
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: e44876bf1fdb114a4730ef72f00e88c057abfb45
Component: engine
2015-10-16 06:07:52 -07:00
494b1b71ae
Correct API docs for /images/create
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 2ec4404ba039c6e6c40358cecd7d7ca16ee5b3e7
Component: engine
2015-10-15 16:00:05 -04:00
2a30cdb717
Merge pull request #17057 from mavenugo/nls
...
Added `network` to docker --help and help cleanup
Upstream-commit: f255155f6b2e2205b9d644c663f2c8fb1570d4fe
Component: engine
2015-10-15 11:00:43 -07:00
46bdc83696
Merge pull request #16998 from vieux/engine_version
...
only display 'Engine Version' when it's not empty
Upstream-commit: 9216b085363f4551ffe3b6cdba983eba3b945205
Component: engine
2015-10-15 08:43:32 -07:00
7b66bab8fb
Added network to docker --help and help cleanup
...
Fixes https://github.com/docker/docker/issues/16909
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 46f7ab35854151ac054bf04f2bb7b344374b6d02
Component: engine
2015-10-15 03:10:39 -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
f672c8b33c
Merge pull request #16617 from zhangjianfnst/15869-improve-commandline-doc
...
Improve the way we deliver Examples in command line.
Upstream-commit: 2b4128e904cf5ffc288e45dbc049de73a905e4e6
Component: engine
2015-10-14 11:05:27 -07:00
556b9df83a
Improve the way we deliver Examples in command line. (Add descriptive titles)
...
Signed-off-by: Jian Zhang <zhangjian.fnst@cn.fujitsu.com >
Upstream-commit: cc653b5d616ee8823c13b1b35ecf5f00e15463a8
Component: engine
2015-10-14 11:04:51 +08:00
98858eadeb
Bump API Version to v1.22
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 22a0ea555069c47a132ac1579324e70d2bcde39d
Component: engine
2015-10-13 17:27:33 -07:00
019ffb819f
Merge pull request #15796 from azurezk/add-size-to-inspect
...
add container size info to inspect
Upstream-commit: ce607916e9b4e294e66188bbaf50acaa86e3909f
Component: engine
2015-10-13 23:16:10 +02:00
517874fd19
Merge pull request #16965 from mikebrow/docs-improvement-for-expose-16634
...
updating docs for EXPOSE option on run command
Upstream-commit: 9be87c9a96ba902214609bf486951a7dc171b82f
Component: engine
2015-10-13 11:33:28 -07:00
21b8dc752f
Merge pull request #16946 from pwnall/cpu_quota_docs
...
Document CFS CPU period / quota support in the API
Upstream-commit: 9ead1663c3c4e9841cd4fb9f8517e5a88cd3f0b6
Component: engine
2015-10-13 10:51:48 -07:00
ba16a5cc21
Centralize discussion of behavior label and env.
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 39a71acf7e18c2d00d32b01db3daaebc7392d92a
Component: engine
2015-10-13 09:44:17 -07:00
d174ec9645
Merge pull request #16961 from vdemeester/pr-15975-carry-for-docs
...
Carry #15975 - Add extra fields based on label and env for gelf/fluentd/json-file/journald log drivers
Upstream-commit: 3856c5efa685013b5e82347d5812de4c7788d4ff
Component: engine
2015-10-13 09:30:32 -07:00
