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
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
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
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
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
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
John Howard
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
Sven Dowideit
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
Anusha Ragunathan
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
Sebastiaan van Stijn
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
Sebastiaan van Stijn
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
Tõnis Tiigi
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
Tõnis Tiigi
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
Vincent Demeester
86ab4e0241
Merge pull request #26570 from thaJeztah/remove-frugalware-installation-docs
...
Remove Frugalware installation docs
Upstream-commit: 11ce938ba849430039dcc4bb2df2d9a1b49631f1
Component: engine
2016-09-14 22:45:08 +02:00
Yong Tang
273536b8fb
Fix a couple of issues in Get Started docs
...
This fix fixes a couple of issues in Get Started docs' Step Four:
1. `Sending build context to Docker daemon 158.8 MB` should be
`Sending build context to Docker daemon 2.048 kB` as there is only
one Dockerfile for context.
2. There are only 3 steps altogether in stead of 4 steps as
`RUN apt-get -y update && apt-get install -y fortunes` is one step.
So `Step 3 : RUN apt-get install -y fortunes` should be removed and
`Step 4 : CMD /usr/games/fortune -a | cowsay` should be changed to
`Step 3 : CMD /usr/games/fortune -a | cowsay`
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 1cd06fdd1ac5ce1f91291330d9f89679468ce393
Component: engine
2016-09-14 13:40:15 -07:00
Brian Goff
3b6af8e398
Merge pull request #26574 from cpuguy83/fix_improper_use_in_test
...
Fix improper use of `--rm` in test case
Upstream-commit: f8d6dedb6a2476ee336245e874a49b0da2285f25
Component: engine
2016-09-14 15:28:40 -04:00
Darren Stahl
efe814ccf6
Windows: Fix wildcard expansion after slash in filename
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: 309056648c8263aca388e679179464e59a9f52c8
Component: engine
2016-09-14 11:40:57 -07:00
Anusha Ragunathan
5ed47d0d43
Update plugin install docs with registry specifics.
...
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: 81d5abf33460264ad627e506a2563ec335faa131
Component: engine
2016-09-14 10:21:31 -07:00
Brian Goff
23bca39d98
Fix improper use of --rm in test case
...
Test is testing that a user can disconnect from the default network
before it is started (#26220 ).
This test does not need to use `--rm`, which is never aken into account
since the container is never started.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: f05ed0075893bb907b5cc2612d9193d775134e2d
Component: engine
2016-09-14 13:14:30 -04:00
Sebastiaan van Stijn
454d1d388e
Remove Frugalware installation docs
...
These docs were outdated, and not actively
maintained. Also, there are no official packages
available for this distribution, so better to
remove it from the documentation.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 9b8b6aa224d0e88bdd27e322ae1c922e3dfcbe12
Component: engine
2016-09-14 18:10:25 +02:00
Sebastiaan van Stijn
b3b358d207
Merge pull request #26526 from lixiaobing10051267/masterSymble
...
fix some incorrect symbols before executing command
Upstream-commit: 9e9ba1e1c1235c3bdb7a70a0a9d0c5932d5afe9e
Component: engine
2016-09-14 17:48:43 +02:00
Alexander Morozov
cc5042d8d1
Merge pull request #26504 from tonistiigi/frozen-fix
...
Fix already loaded detection for frozen images
Upstream-commit: 397df22963e9190bee494c8562a8c4c1bb1fdb6f
Component: engine
2016-09-14 08:22:48 -07:00
lixiaobing10051267
849847f7b2
fix some incorrect symbols before executing command
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 7b73b5fd6acf7a8fc3e9cee3437221794879b7c6
Component: engine
2016-09-14 22:28:09 +08:00
Sebastiaan van Stijn
422892f89b
Merge pull request #25540 from estesp/ro-plus-userns
...
Remove --read-only restriction when user ns enabled
Upstream-commit: 8ac2000f5065b887753ffe32d2b793bb4bbd84c5
Component: engine
2016-09-14 13:53:58 +02:00
Carl Loa Odin
69938656f3
Add errexit to mkimage-yum.sh
...
Add errexit to mkimage-yum bash script to abort early. This to prevent
disaster when mktemp fails and leave $target variable empty.
Signed-off-by: Carl Loa Odin <carlodin@gmail.com >
Upstream-commit: fa255c92df52f816ec15b60460f02c8e66534e76
Component: engine
2016-09-14 12:04:04 +02:00
Jana Radhakrishnan
e77039e819
Merge pull request #26551 from cpuguy83/26548_fix_tasks
...
Do not look at `Attachment` tasks in /tasks
Upstream-commit: 3ae023cd2286188158f7a7ed356b63df63f00d09
Component: engine
2016-09-13 21:27:15 -07:00
Akihiro Suda
a658a7684d
fix racy tests in pkg/archive
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: 62cbd2589fb92c71711a323953f2713ab529e801
Component: engine
2016-09-14 04:17:23 +00:00
Madhu Venugopal
131853bc0a
Merge pull request #26449 from mrjana/net
...
Fix autostart for swarm scope connected containers
Upstream-commit: 1d76ab4f80e3bc2b6b62e7913b6be01966cb0975
Component: engine
2016-09-13 18:22:16 -07:00
Brian Goff
58f4fbdb5f
Do not look at Attachment tasks in /tasks
...
Fixes #26548
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 15eee038c0b06b4f0ae1bf12bebbb9a1f5deec78
Component: engine
2016-09-13 20:44:06 -04:00
Darren Stahl
b5041bd104
Windows: Enable more build tests
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: e79b0b42f074ced1814010974ffad47d0d3d24d0
Component: engine
2016-09-13 17:43:27 -07:00
Misty Stanley-Jones
1562fecdca
Merge pull request #26547 from londoncalling/fix-links-in-overview
...
fixed on-page links
Upstream-commit: e08b2f7a082de21f62816ccbb42dedad36d47adb
Component: engine
2016-09-13 16:30:17 -07:00
Victoria Bialas
04ccb628a7
fixed on-page links
...
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com >
Upstream-commit: c073404af855b172febf7fbd8cf0cd17968a0b59
Component: engine
2016-09-13 16:20:05 -07:00
Daniel Nephin
dd60049ff5
Fix testcases that expect trailing whitespace
...
and broken integration tests based of nil pointers
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: e16e9775d48b6cd0cc7b4a66114d1b9680aa2f31
Component: engine
2016-09-13 17:58:12 -04:00
Daniel Nephin
d90a93ce88
Refactor formatter.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: c8336743a47216f87956b77449bd21714d3c45f1
Component: engine
2016-09-13 17:58:12 -04:00
Tõnis Tiigi
d3ee804f34
Merge pull request #26543 from dnephin/fix_filter_args
...
Use opts.FilterOpt for filter flags
Upstream-commit: 9b0aaccf5556832994cef2b41f3b20b7ef0be006
Component: engine
2016-09-13 14:36:51 -07:00
Jana Radhakrishnan
293cb24e33
Fix autostart for swarm scope connected containers
...
The swarm scope network connected containers with autostart enabled
there was a dependency problem with the cluster to be initialized before
we can autostart them. With the current container restart code happening
before cluster init, these containers were not getting autostarted
properly. Added a fix to delay the container start of those containers
which has atleast one swarm scope endpoint to until after the cluster is
initialized.
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
Upstream-commit: c9fb551d60584ac4ad01561e2f56b7b7cc9483b9
Component: engine
2016-09-13 14:21:58 -07:00
Anusha Ragunathan
3f481b7c53
Merge pull request #26216 from vieux/plugin_manifest
...
add some plugin manifest reference doc
Upstream-commit: 8aa454dfc8192094221d9ffae5a48d642ea865e4
Component: engine
2016-09-13 14:03:20 -07:00
Daniel Nephin
71b78a5b8d
Use opts.FilterOpt for filter flags.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: a07be9be38a96f43a0a7bac48caf35f9370bb543
Component: engine
2016-09-13 16:20:10 -04:00
Brian Goff
8782511c3a
Merge pull request #22373 from cpuguy83/add_mounts_api_on_create
...
Add new `HostConfig` field, `Mounts`.
Upstream-commit: b4c1645db5d45720665683bbefb053c4e09f73dd
Component: engine
2016-09-13 14:39:50 -04:00
Tõnis Tiigi
393b27a858
Merge pull request #26503 from clnperez/swarm-test-move-err-check
...
swarm: always check err before http status in tests
Upstream-commit: 711455d34eb082ad11de1da2e2952dee017175ab
Component: engine
2016-09-13 10:53:55 -07:00
Alexander Morozov
988b9e5bc2
Merge pull request #26433 from Microsoft/jjh/fix24819
...
Windows: Fix regression pulling linux images
Upstream-commit: 85c3b8c1b15923fb45e59b7fb986012241ece419
Component: engine
2016-09-13 08:35:38 -07:00
Daniel Nephin
38a7f4f62e
Merge pull request #24761 from WeiZhang555/parallel-stop
...
Enhancement: allow parallel stop, pause, unpause
Upstream-commit: c2decbe5ee9bd7677699228257db6bcd12d13b78
Component: engine
2016-09-13 10:46:51 -04:00