Sebastiaan van Stijn
8cdc29bdf2
Merge pull request #26558 from lixiaobing10051267/masterSymbol2
...
add bash symbol for docker network inspect
Upstream-commit: 0bd281c7cb610baa2b906d7eb42062eeb209b1a9
Component: engine
2016-09-17 03:26:55 +02:00
Sebastiaan van Stijn
a36bf5dcfd
Merge pull request #26557 from schmunk42/patch-1
...
fix typo
Upstream-commit: 258fa6c23fa7b174958a56677fff0737ea954811
Component: engine
2016-09-17 03:26:11 +02:00
Sebastiaan van Stijn
0a2b85a132
Synchronize API docs
...
This synchronizes changes between API versions, and:
- applies e0a552504e64192946c86d3bdd517ae7b3af348f to
older versions of the documentation
- applies a2a0a03e2b801545b2e3fb9e8476c76370da9175 to
API version 1.25
- syncs some minor differences
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 53b1dcb25ca937c61bd47a29ba7be6e68abc25a5
Component: engine
2016-09-17 03:02:12 +02:00
Sebastiaan van Stijn
7bce42c737
Move HostConfig.Mounts to correct API version
...
This was added in fc7b904dced4d18d49c8a6c47ae3f415d16d0c43,
but some parts of the documentation ended up in the
wrong API version, and was overlooked during
review :)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: cd73ceffd84d6d3af695a70485ca0d7899d0475a
Component: engine
2016-09-17 02:36:07 +02:00
Sebastiaan van Stijn
a3575ae5f7
Fix service and tasks API documentation
...
The documentation contained some outdated information
on these endpoints.
This change fixes those parts of the documentation
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: d69409fd43e73829209315de79abf79000c4c720
Component: engine
2016-09-17 02:29:38 +02:00
John Howard
f9fecb6904
Windows: OCI remove first start
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: f7fd408ba78bd1e3a28751578084eaf4e69d6c5a
Component: engine
2016-09-16 16:05:55 -07:00
Drew Erny
0529a1ae57
Added comments to PortConfig for greater clarity
...
I always forget which one is which. Now, I can't forget. This is
probably in the docs somewhere but now it's handy at a glance.
Signed-off-by: Drew Erny <drew.erny@docker.com >
Upstream-commit: 55454752f825a5ec033ca072350a77a928afd6ac
Component: engine
2016-09-16 14:47:35 -07:00
Sebastiaan van Stijn
93e3695b69
Merge pull request #26387 from Microsoft/jjh/securityopts
...
Only output security options if there are any
Upstream-commit: 94bc2b1bc07843087c0096d06fdb56d70aa45a02
Component: engine
2016-09-16 23:05:30 +02:00
Doug Davis
bafcc93bf4
Merge pull request #26647 from jbodah/patch-1
...
Remove extra paren in `run --link` docs
Upstream-commit: 61639bf63ddc40bb310578effc067d6fc4101984
Component: engine
2016-09-16 21:38:17 +02:00
Josh Bodah
3e89d9cc8d
Remove extra paren in run --link docs
...
Signed-off-by: Josh Bodah <jb3689@yahoo.com >
Upstream-commit: 484fbe236dcab9fb5b8d48844a8cdc9d614e32e9
Component: engine
2016-09-16 15:32:12 -04:00
John Howard
7342ae40e2
Windows: stats support
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 340e5233b2fb95981ddea610c1667134ed3b2376
Component: engine
2016-09-16 11:56:15 -07:00
Vincent Demeester
4f3981c6de
Merge pull request #26620 from runcom/fix-docs
...
docs: reference: api: clarify pull all tags
Upstream-commit: 8a7006ff8e74477c4ad85bde2e2094f7b40244da
Component: engine
2016-09-16 20:56:04 +02:00
Michael Crosby
fc3c6766ab
Merge pull request #26207 from splunk/splunk-logging-driver-performance-improvements
...
Splunk Logging Driver performance improvements
Upstream-commit: efe4e914efe5f42a5b5e424ed519fda71343f7de
Component: engine
2016-09-16 10:22:09 -07:00
John Howard
39533df3e9
Only output security options if there are any
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: dd3d223a7ea3fc35eeeb255fc97a7bc46936cae5
Component: engine
2016-09-16 10:05:21 -07:00
Daniel Nephin
e90292dd20
Use apiError in server version middleware.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: bcb0405239e0c820516b05ccc2bb7e8d4a1599f9
Component: engine
2016-09-16 12:27:14 -04:00
Daniel Nephin
d47b1c8a71
Move errors/ to api/errors
...
Using:
gomvpkg -from github.com/docker/docker/errors
-to github.com/docker/docker/api/errors
-vcs_mv_cmd "git mv {{.Src}} {{.Dst}}"
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: c452e1bfe6b19d44bf2ed2a1eb8aef7e23d6bafb
Component: engine
2016-09-16 12:27:13 -04:00
Vincent Demeester
3a3e6ec157
Merge pull request #26637 from thaJeztah/fix-cli-prompt
...
Use "sudo" for dockerd examples
Upstream-commit: d05e34ca9bcfdcf954ea5793721c20133eed9277
Component: engine
2016-09-16 17:44:07 +02:00
Sebastiaan van Stijn
15e6354e7d
Use "sudo" for dockerd examples
...
Because we standardize on using a non-privileged
prompt (`$`) instead of `#`, replacing the
examples to use `sudo` instead to indicate
this has to be run as root.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 87b174080bd8b1b9ea2bbfad8ef35a4c0dfe8ad4
Component: engine
2016-09-16 17:22:58 +02:00
Kenfe-Mickaël Laventure
a7caeb2743
Merge pull request #26618 from AkihiroSuda/fix-apparmor
...
apparmor: prohibit /sys/firmware/** from being accessed
Upstream-commit: 07b5311147c319a003324e8f26ceb829ed5cc240
Component: engine
2016-09-16 07:41:36 -07:00
Antonio Murdaca
db61cfcc59
docs: reference: api: clarify pull all tags
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 03a8b6798d030a952e85f15208aeea1215e3f801
Component: engine
2016-09-16 16:35:15 +02:00
Sebastiaan van Stijn
9566044db8
Merge pull request #26629 from thaJeztah/add-logging-reference-link
...
Add link to logging drivers reference
Upstream-commit: 81ba067a1c5c233265d6bed25c3d3d4f48a78094
Component: engine
2016-09-16 15:46:21 +02:00
Sebastiaan van Stijn
6f7161dac7
Add link to logging drivers reference
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 7ca02f86de2ceef980cad98faefc15cbc628c91a
Component: engine
2016-09-16 15:29:28 +02:00
Vincent Demeester
2571b1712e
Merge pull request #26541 from LK4D4/update_labels
...
project: add area/daemon and area/docs labels
Upstream-commit: 76ee0e8185d4219bd8539ca8f33d387376422ef4
Component: engine
2016-09-16 08:55:04 +02:00
Vincent Demeester
774de454aa
Merge pull request #26613 from Microsoft/jjh/14393
...
Windows: Turn off builds<14393
Upstream-commit: 38d187d3ae28cb9453ee2baba64344f017e84c78
Component: engine
2016-09-16 08:47:00 +02:00
Tõnis Tiigi
17ba48af4f
Merge pull request #26583 from aboch/vnd
...
Vendoring libnetwork @c8ce8c7
Upstream-commit: 4adbd5338d8f76e1a0895583f580993221451b08
Component: engine
2016-09-15 20:28:07 -07:00
Tõnis Tiigi
4fb324e592
Merge pull request #26607 from aboch/vnd2
...
Vendoring boltdb @fff57c100
Upstream-commit: 518e000e70b1db807db20cc9a6c42311ba385d69
Component: engine
2016-09-15 20:24:29 -07:00
Aaron Lehmann
8f9c1794c9
Merge pull request #26512 from AkihiroSuda/fix-pkg-plugins-racy-test
...
[test] fix racy test in pkg/plugins
Upstream-commit: a1fc3852dace4b07996b8189a236938d9e0e21ae
Component: engine
2016-09-15 20:11:03 -07:00
Akihiro Suda
23bac4b64f
apparmor: prohibit /sys/firmware/** from being accessed
...
Some firmware information including SMBIOS and ACPI tables were unexpectedly exposed
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: 693b4ac67ad0638be9defbae771f62d860380f31
Component: engine
2016-09-16 02:21:31 +00:00
Akihiro Suda
6bbb3e807c
fix racy test in pkg/plugins
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: 4bc908ec8910468711960a4bcd4f3ec8dce909fb
Component: engine
2016-09-16 01:43:35 +00:00
Tonis Tiigi
00676d4d53
Generalize content addressable and reference storage
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 805223982ce7469af0fc42fc4a5115055f7b4843
Component: engine
2016-09-15 18:08:19 -07:00
John Howard
18e664bb52
Windows: Turn off builds<14393
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: cc4e17cbbac8196d3ab58e45318612b95bd28994
Component: engine
2016-09-15 15:20:16 -07:00
Victor Vieux
ca8908a3a8
add check plugin is not used before rm
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: b22d07f51573e39069b4e3a6d8b0580958412e72
Component: engine
2016-09-15 13:50:57 -07:00
Vincent Demeester
4efffd499d
Merge pull request #26537 from dnephin/refactor_cli_formatter
...
Refactor cli/command/formatter
Upstream-commit: a7c25f954062de230dea0f1816b553992fa1d967
Component: engine
2016-09-15 21:52:52 +02:00
Alexander Morozov
8e66a0ffda
vendor: update grpc and protobuf
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: afe23cea3d73fc4c5f90ff109edbddd339ea29ed
Component: engine
2016-09-15 11:36:31 -07:00
Alexander Morozov
1a62240ad4
Merge pull request #26511 from AkihiroSuda/fix-pkg-archive-racy-test
...
[test] fix racy tests in pkg/archive
Upstream-commit: b2263c111f1a0e8efc8646655c03fd73ce2d258b
Component: engine
2016-09-15 11:10:34 -07:00
Tõnis Tiigi
3683837466
Merge pull request #26596 from drakenator/26384-healthcheck-race
...
Prevent stdout / stderr race condition in limitedBuffer.
Upstream-commit: 4c82365cdba3e03c6ce400e431719f0bada3e810
Component: engine
2016-09-15 10:59:45 -07:00
Alessandro Boch
a320cdf50c
Vendoring boltdb @fff57c100
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 5cfbdceafe87df8bab85c0561a1483d3191eb775
Component: engine
2016-09-15 10:53:48 -07:00
Aaron Lehmann
328c3988a8
Merge pull request #26589 from allencloud/correct-nits
...
correct some nits in comments and test
Upstream-commit: 2a87856599139ae4e7bfe30a8a4f09f64e06f6be
Component: engine
2016-09-15 10:49:47 -07:00
Sebastiaan van Stijn
1d331c956d
Merge pull request #26605 from thaJeztah/sync-push-docs
...
Synchronize push reference with man page
Upstream-commit: c2ec7454900b62122f97911740b789d73e6a53c7
Component: engine
2016-09-15 19:18:23 +02:00
John Howard
dfe7e29f76
Windows: Move to fstab options as per OCI
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: bb585b9c106e8e81a445b2b864d673bc9f5991cd
Component: engine
2016-09-15 10:12:20 -07:00
John Howard
5a9205e2eb
Windows: Unify OCI user struct
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 93f61b85ebe184506a3d99cee3b4ebaac559c712
Component: engine
2016-09-15 09:59:27 -07:00
Sebastiaan van Stijn
00c4e8a77c
Synchronize push reference with man page
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: dddea689ab45ce146e6ac3a1199235e1f36ffe29
Component: engine
2016-09-15 18:53:46 +02:00
Sebastiaan van Stijn
c86634e4ea
Merge pull request #26581 from yongtang/09142016-docs-getstarted-step-four
...
Fix a couple of issues in Get Started docs
Upstream-commit: 51a981fd5fa01d827854ff5afbb78029e4e94e7b
Component: engine
2016-09-15 16:51:49 +02:00
Sebastiaan van Stijn
4d74e47f75
Merge pull request #26599 from thaJeztah/docs-restore-missing-format-example
...
Restore missing "format" example
Upstream-commit: 69af9b2a92829748168989183cd5eb60c951e6c5
Component: engine
2016-09-15 16:46:00 +02:00
Sebastiaan van Stijn
78d01f16b4
Restore missing "format" example
...
The "format" example got lost during the
rewrite of the documentation for Cobra. This
restores the missing example.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: edbb8fb86d7d0b715adc15415f0cb187433092a5
Component: engine
2016-09-15 16:09:24 +02:00
Stephen Drake
d3c93cc665
Prevent stdout / stderr race condition in limitedBuffer.
...
Signed-off-by: Stephen Drake <stephen@xenolith.net >
Upstream-commit: c3319445aa0d891921f0236ff5bd7a8d879be4f8
Component: engine
2016-09-15 13:31:11 +02:00
Akihiro Suda
e6635a948e
add docker events --format
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: 5af5a1be6209bde3f05b5f9ed4e0db0037dfe0ff
Component: engine
2016-09-15 09:55:29 +00:00
Alexander Morozov
95d0513c00
Merge pull request #26584 from aaronlehmann/rate-limit-progress-bar
...
progress: Rate limit progress bar output
Upstream-commit: b248de7e332b6e67b08a8981f68060e6ae629ccf
Component: engine
2016-09-14 22:15:42 -07:00
allencloud
92f94b6c20
correct some nits in comments
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 9279a93f6d43da4c904eeb0adb249fdfa34f7f92
Component: engine
2016-09-15 12:17:58 +08:00
Aaron Lehmann
4a3b9d42c8
progress: Rate limit progress bar output
...
ProgressReader outputs progress information every 500 KB. This could be
excessive if something is being transfered at a fast rate. Rate-limit
progress output to 10 per second.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: f8eab6fea85f92aaa3c23bd0c87451a0811b5e3a
Component: engine
2016-09-14 17:23:16 -07:00