50fc6aee46
Fix config cleanup on canceling restartmanager
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 7bf07737b90f087271b5a9a3a1c8d262c154554f
Component: engine
2016-04-21 15:33:09 -07:00
0c742e4666
Merge pull request #22213 from yongtang/22210-docker-http-panics
...
Docker http panics caused by container deletion with empty names.
Upstream-commit: 6f67c13d20b207e5ab9a038b04ccc44d337131ed
Component: engine
2016-04-21 10:37:24 -07:00
4e42d86b8b
Merge pull request #22172 from cpuguy83/fix_nosapce_test
...
Containerize `TestDaemonNoSpaceLeftOnDeviceError`
Upstream-commit: 228759fd42fdb2014b2e16e15f4452bb1d5f8227
Component: engine
2016-04-21 09:41:31 -07:00
6ad54358a5
Merge pull request #22227 from kencochrane/bump_go_1.6.2
...
Bump Go version to 1.6.2 from 1.6.1 where it was used
Upstream-commit: f8945836e1f9124a8ce75820b710e4cb3f26e1e1
Component: engine
2016-04-21 09:40:04 -07:00
dd79541d6f
Merge pull request #21683 from mYmNeo/growFS
...
call growFS when size is a mismatch
Upstream-commit: b006f7f64020c814b2eab2c7d2f59e1539894449
Component: engine
2016-04-21 12:02:44 -04:00
c289b3f431
Merge pull request #22193 from panyufeng920/master
...
optimise docs
Upstream-commit: 01dd64cd107b2a7d4c01be9074da155d65a79c57
Component: engine
2016-04-21 08:38:27 -07:00
bff21245b0
Merge pull request #22219 from leonhartX/zsh-completion-add-disable-content-trust
...
Add zsh completion for 'docker {build,create,run} --disable-content-trust'
Upstream-commit: c931a7c576ff09acb44be7857775dd58f0ad04ab
Component: engine
2016-04-21 17:08:38 +02:00
b0c0884b1f
Docker http panics caused by container deletion with empty names.
...
This fix tries to fix the http panics caused by container deletion
with empty names in #22210 .
The issue was because when an empty string was passed, `GetByName()`
tried to access the first element of the name string without checking
the length. A length check has been added.
A test case for #22210 has been added.
This fix fixes #22210 .
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 9d8071a74db20556d0fc1b6ef3270326b3583de9
Component: engine
2016-04-21 07:53:49 -07:00
0f8b8ed30c
Merge pull request #22220 from dandric-activevideo/fix-storage-opts-doc
...
Fix daemon.json storage-opts settings example
Upstream-commit: 70746f4c38322ca14cb62321ce73b08b18422a14
Component: engine
2016-04-21 09:53:03 -04:00
08e66af0b3
Bump Go version to 1.6.2 from 1.6.1 where it was used
...
Signed-off-by: Ken Cochrane <kencochrane@gmail.com >
Upstream-commit: 09ca4dd32232cdbbe04628e5647922002d9df175
Component: engine
2016-04-21 09:43:32 -04:00
b54ef9a586
Merge pull request #22216 from HackToday/fixolddoc
...
Fix the old exit status example
Upstream-commit: 7bfe5408a1a627f193fec0cfae693232a83efb21
Component: engine
2016-04-21 21:31:09 +10:00
5b79c087d8
The daemon.json storage-opts settings is actually a list.
...
Signed-off-by: Dimitry Andric <d.andric@activevideo.com >
Upstream-commit: e3eb24fc21fa6f6002eef081278333f9e5e16614
Component: engine
2016-04-21 10:56:35 +02:00
ac79d29757
add zsh completion for 'docker {build,create,run} --disable-content-trust'
...
Signed-off-by: Ke Xu <leonhartx.k@gmail.com >
Upstream-commit: da90fe0218411933d53daac7366ce4353cd5b665
Component: engine
2016-04-21 16:06:09 +09:00
a659558dcf
Fix the old exit status example
...
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com >
Upstream-commit: 896ebb1ca2a6ae23d7511678aaab1d4e32c54ff9
Component: engine
2016-04-21 03:24:10 +00:00
8c00bd5332
optimise docs
...
Signed-off-by: 搏通 <yufeng.pyf@alibaba-inc.com >
Upstream-commit: 9abf304c255cb3194b932e92f2b87bfabaab88c9
Component: engine
2016-04-21 09:34:28 +08:00
aeb44b5505
Merge pull request #22171 from mlaventure/always-disable-metrics
...
Always disable containerd metrics when started by docker
Upstream-commit: ccf83c94d18df4b27ca3d46ffbe008df76aa3275
Component: engine
2016-04-21 01:38:07 +02:00
1563e3998f
Merge pull request #22200 from jfrazelle/remove-self
...
Remove Jess from Maintainers
Upstream-commit: 0f14b566d98304e3bd7e24d87bb509e2e18ca7ca
Component: engine
2016-04-21 01:14:56 +02:00
9a6bda4bd8
Merge pull request #22173 from amitkris/uprev_dbus
...
Update godbus/dbus to v4.0.0
Upstream-commit: 24076ed4d9c82d387029b8a65e21873db5676f6a
Component: engine
2016-04-20 15:39:00 -07:00
1542891d6f
Merge pull request #22203 from alimate/name-gen-patch
...
Added Lamport & Agnesi to the list of scientists
Upstream-commit: 483063ad85f7eff587f6dbf99a71f31def8d4c76
Component: engine
2016-04-20 21:03:18 +02:00
6418621ca6
Added Lamport & Agnesi to the list of scientists
...
Leslie B. Lamport is an American computer scientist. Lamport is
best known for his seminal work in distributed systems and as the
initial developer of the document preparation system LaTeX.
Maria Gaetana Agnesi was an Italian mathematician, philosopher,
theologian and humanitarian. She was the first woman to write a
mathematics handbook and the first woman appointed as a Mathematics
Professor at a University.
Signed-off-by: Ali Dehghani <ali.dehghani.g@gmail.com >
Upstream-commit: 85e880205f305aa7b566ac4d7dc6280d5015c2b2
Component: engine
2016-04-20 21:44:22 +04:30
daff11e0d3
Merge pull request #22201 from moxiegirl/update-readme
...
Removing ref to old google group; adding forum
Upstream-commit: 3022a43f420588a5809332f284f27ec6e3ca4611
Component: engine
2016-04-20 18:42:47 +02:00
4d75557ec6
Removing ref to old google group; adding forum
...
Adding email notice
user > dev and an > a
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 344784707918b39f2d23d1117b09e5a0cbbb6eb8
Component: engine
2016-04-20 09:34:49 -07:00
823e3f54b6
Remove Jess from Maintainers
...
Signed-off-by: Jess Frazelle <jess@mesosphere.com >
Upstream-commit: 145fb8de9ee2f57fdec74a1ea27432c68cd5820a
Component: engine
2016-04-20 08:50:42 -07:00
60ca663014
Merge pull request #22191 from mavenugo/jp
...
Initialize activateWait for plugins activated by json spec
Upstream-commit: cf03e17c5cfb7617d91aa4177f4bb4a5112496ad
Component: engine
2016-04-20 08:37:20 -07:00
9ddd4e8416
Merge pull request #22187 from thaJeztah/add-madhu-to-maintainers
...
Add Madhu Venugopal to maintainers
Upstream-commit: afbe2869f02d4891ab1dc3feeadd47fd3be2c340
Component: engine
2016-04-20 17:17:41 +02:00
f7b3af0900
Merge pull request #21389 from chenchun/resize_direct_lvm
...
Resize direct lvm
Upstream-commit: f96d15d3c361a08ad892759d5e885625b0d48302
Component: engine
2016-04-20 06:33:37 -07:00
698cbdd3a4
Merge pull request #22189 from thaJeztah/restructure-plugin-docs
...
docs: use tables for available plugins
Upstream-commit: fc25376762cdbab6e738742586e752478b80171e
Component: engine
2016-04-20 06:32:23 -07:00
ee5a4917fb
Initialize activateWait for plugins activated by json spec
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: de806a672b0810e48facc74e198e6728c1fe2c6d
Component: engine
2016-04-20 05:59:19 -07:00
a1c0412063
docs: use tables for available plugins
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 79351caec1b413c9da1080fceff49eb994323734
Component: engine
2016-04-20 13:45:31 +02:00
e790582111
Merge pull request #22179 from wenchma/fix_asa
...
Fix asa
Upstream-commit: 3cf4cad0821698cefaf852c9d4b7b65df314ab35
Component: engine
2016-04-20 12:44:29 +02:00
300e337d40
Add Madhu Venugopal to maintainers
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 06753c6df666ca77adb4d4d7a2c95425b6d31b0c
Component: engine
2016-04-20 11:17:32 +02:00
a8bb60bfa2
Merge pull request #21380 from sainath14/improve_help_text_test_time
...
Improve the time taken by DockerSuite.TestHelpTextVerify
Upstream-commit: 34cc274a801cd38df3006484b14e4c9671c47b94
Component: engine
2016-04-20 08:03:45 +02:00
605211aab5
Fix asa
...
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com >
Upstream-commit: 6d4e7b67be77e3f290d4048c3da5d0f6540f1704
Component: engine
2016-04-20 11:14:47 +08:00
7c4fbf51d2
Add docs about how to extend devicemapper thin pool
...
Signed-off-by: Chun Chen <ramichen@tencent.com >
Upstream-commit: b21d90c28faaa9f906c4e3b2145ddf661a19e994
Component: engine
2016-04-20 10:49:51 +08:00
2d475a4388
Improve the time taken by DockerSuite.TestHelpTextVerify. This test runs docker <command> --help on all commands supported and also check the output
...
when it is passed with bad arguments and no arguments. This patch would divide the total number of commands into five sets and runs them in parallel.
Test time is improved from around 9 seconds to around 3 seconds
Signed-off-by: Sainath Grandhi <sainath.grandhi@intel.com >
Upstream-commit: 7f33ec750770ea751f64d516c73ce98dae64b536
Component: engine
2016-04-19 16:46:59 -07:00
9247bf6e84
Merge pull request #22043 from WeiZhang555/remove-start-event-failed-start
...
Remove start/die event when fail to start container
Upstream-commit: bb91bd3a89d93f74de99ea5158d68a92e4c6cd6a
Component: engine
2016-04-19 19:45:40 -04:00
2a1aa1222c
Update godbus/dbus to v4.0.0
...
Signed-off-by: Amit Krishnan <krish.amit@gmail.com >
Upstream-commit: 1c967911b979040a6316050b3c00d89e17cb4cb1
Component: engine
2016-04-19 14:51:55 -07:00
87b210ea47
Containerize TestDaemonNoSpaceLeftOnDeviceError
...
Why? Because the `mount` here will sometimes fail when run in
`debian:jessie`, which is what the environrment hosting the test suite
is running if run from the `Makefile`.
Also, why the heck not containerize it, all the things.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 59b83d8aae106cdc4042c29c900069fc804b2b68
Component: engine
2016-04-19 17:16:18 -04:00
a950119eaf
Always disable containerd metrics when started by docker
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 42f9c25b5168e3bc8e19003cd8bfd4eabbad654c
Component: engine
2016-04-19 13:37:18 -07:00
0a813c13d3
Merge pull request #22123 from crosbymichael/restart-canceled
...
Remove restart canceled error
Upstream-commit: ab6b82b85668eaa5be5ee1ba04febfae5fcec433
Component: engine
2016-04-19 16:28:33 -04:00
2f96f680c7
Merge pull request #22153 from vdemeester/update-engine-api-again
...
Update engine api again for CopyToContainer and versions
Upstream-commit: eab65e438ecc406baf935c8df544982164cff72f
Component: engine
2016-04-19 11:05:27 -07:00
ba66548e04
Remove restart canceled error
...
It should not be an error to call a common option to cancel restarts.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: fc2e2234c614379d21c16e32c1b82e7819fc3eac
Component: engine
2016-04-19 10:46:21 -07:00
121a98a71e
Merge pull request #22148 from thaJeztah/remove-old-api-versions
...
Remove API versions 1.17 and older from documentation
Upstream-commit: 4a8519ba29a0b1f1aa2f9e9ac6d991114d8b8253
Component: engine
2016-04-19 10:26:56 -07:00
4ebf703e54
Merge pull request #21495 from HackToday/addnetworkfilter
...
Add network label filter support
Upstream-commit: 75cc2c926b3296ed07af130a91ed2409f823ff70
Component: engine
2016-04-19 19:15:14 +02:00
089a9530bf
Merge pull request #22121 from tonistiigi/fix-exec-cleanup
...
Clean up exec fifos on process exit
Upstream-commit: 2f7df8e5dec7c4ab121d0ea0d337b5cc4c3d5c77
Component: engine
2016-04-19 09:45:54 -07:00
eac0df9a4a
Merge pull request #22156 from jaredhocutt/netappdvp
...
Add the NetApp Docker Volume Plugin to the documentation
Upstream-commit: 60548927b3c7bc102aabdfda0065199bbddfd8b7
Component: engine
2016-04-19 11:43:00 -04:00
f2f56b9e01
Add the NetApp Docker Volume Plugin to the documentation
...
Signed-off-by: Jared Hocutt <jaredh@netapp.com >
Upstream-commit: f310fd14a9a99362635198cd5b1517a053813c92
Component: engine
2016-04-19 11:30:39 -04:00
3fab5dcc0b
Remove pkg/version
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 49f7b4dafb2fc3d702304ae1bfe5834764692e1d
Component: engine
2016-04-19 16:57:02 +02:00
03d17b8c5f
Update code for latest engine-api
...
- Update CopyToContainer uses
- Use engine-api/types/versions instead of pkg/version
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 7534f17261d0bb74557ca2f7cd893d5b7b531d49
Component: engine
2016-04-19 16:56:54 +02:00
f4a20799d2
Vendoring engine-api to a2999dbd3471ffe167f2aec7dccb9fa9b016dcbc
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 04bb3a2f45de32794a031f09dbe03fdbba711906
Component: engine
2016-04-19 15:50:20 +02:00
