19194e282c
Merge pull request #26643 from allencloud/validate-two-service-modes-in-request
...
return err when both two service modes in request
Upstream-commit: 1d8ad2974eb7dfe4f6f48c5fee28efa89cf6821f
Component: engine
2016-09-17 15:50:55 +02:00
508525f5e5
Merge pull request #26649 from dperny/add-comment-to-endpointspec
...
Added comments to PortConfig for greater clarity
Upstream-commit: 6d8598f4bb98b7e3f04bf3a3dd039900414fe465
Component: engine
2016-09-17 08:16:32 -04:00
b82751259c
Merge pull request #26555 from miaoyq/refactor-aufsMount
...
refactor the function 'aufsMount' in 'daemon/graphdriver/aufs/aufs.go'
Upstream-commit: 354835695730c32a3c2374d2453d3cdf73bf4ee0
Component: engine
2016-09-17 08:04:18 -04:00
665d5fc5bb
Merge pull request #26653 from thaJeztah/move-mounts-to-correct-api-version
...
Move HostConfig.Mounts to correct API version
Upstream-commit: 2f5b37919286f272b591ab428fee13cb6b5d0014
Component: engine
2016-09-17 13:53:37 +02:00
a4d4b2606e
return err when both two service mode in request
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: c413d4177b9621d6bcfd24c9b7118887ad378c49
Component: engine
2016-09-17 19:04:46 +08:00
32dd641688
Merge pull request #26266 from YuPengZTE/dev
...
The etc and dot is seprated
Upstream-commit: d93a62e9bef374ff501f155583e707c1ae77926b
Component: engine
2016-09-17 03:37:00 +02:00
6c1fbaf344
Merge pull request #26289 from aboch/doc
...
Fix mtu option in documentation
Upstream-commit: 1c117aa8cccd895645e6fb5245bfb4cd11b93ba8
Component: engine
2016-09-17 03:32:23 +02:00
7c0fb8cd9f
Merge pull request #26540 from sfsmithcha/remove_charles_from_maintainers
...
removes sfsmithcha from maintainers
Upstream-commit: 30839b0688ed4e2aeae2d1390652122d33b1efea
Component: engine
2016-09-17 03:28:23 +02:00
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
a36bf5dcfd
Merge pull request #26557 from schmunk42/patch-1
...
fix typo
Upstream-commit: 258fa6c23fa7b174958a56677fff0737ea954811
Component: engine
2016-09-17 03:26:11 +02:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
17ba48af4f
Merge pull request #26583 from aboch/vnd
...
Vendoring libnetwork @c8ce8c7
Upstream-commit: 4adbd5338d8f76e1a0895583f580993221451b08
Component: engine
2016-09-15 20:28:07 -07:00
4fb324e592
Merge pull request #26607 from aboch/vnd2
...
Vendoring boltdb @fff57c100
Upstream-commit: 518e000e70b1db807db20cc9a6c42311ba385d69
Component: engine
2016-09-15 20:24:29 -07:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
3a18bebe6e
Merge pull request #26553 from darrenstahlmsft/FixWildcard
...
Windows: Fix wildcard expansion after slash in filename
Upstream-commit: 39f5d97cde3f93953be3c9172034b83d61bff710
Component: engine
2016-09-14 16:56:35 -07:00
2a2af20475
Merge pull request #25774 from ddgenome/cmd-entrypoint-table
...
Update ENTRYPOINT/CMD table to agree with docs
Upstream-commit: 37869b237ccd6c8f48132d9372111acdf9533d1b
Component: engine
2016-09-15 09:35:13 +10:00
30accdf3a6
Vendoring libnetwork @c8ce8c7
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 161c12142594d602ed46ef7601a57e3761d52f99
Component: engine
2016-09-14 14:46:05 -07:00
470e277786
Merge pull request #26575 from anusha-ragunathan/update_plugin_docs
...
Update plugin install docs with registry specifics.
Upstream-commit: e482d4ee71b00bb3ea1a71381cef9771b14eff6c
Component: engine
2016-09-14 14:43:41 -07:00
33227c1a20
Merge pull request #26582 from thaJeztah/add-full-image-link
...
Add direct link to event chart image
Upstream-commit: cfa868f098ae7725373bd28f5e5c7ea166a8cbf5
Component: engine
2016-09-14 23:24:34 +02:00
69bead6193
Add direct link to event chart image
...
This adds a direct link to the event chart image
so that the full-resolution image can be "zoomed"
in to.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 86de72fef244b3fe209e5793deb40fb26f5b318e
Component: engine
2016-09-14 23:16:32 +02:00
89894cc565
Merge pull request #26552 from darrenstahlmsft/EnableBuildTests
...
Windows: Enable more build tests
Upstream-commit: 1573ea597433051fc8e5e6962ab2de5918d49c7c
Component: engine
2016-09-14 14:07:19 -07:00
4f4fc15889
Merge pull request #26562 from loa/master
...
Add errexit to mkimage-yum.sh
Upstream-commit: 094c029207e26e352fad64c62e8fa32eb44b9a40
Component: engine
2016-09-14 14:05:52 -07:00
