e783ada3bb
Adding back in Glossary
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 08da08f3f993bbe379e5b71e78108702aca3daa8
Component: engine
2015-05-25 07:39:27 -07:00
2bceb2cab8
Merge pull request #13452 from WeiZhang555/cleanup
...
Cleanup: change test func name
Upstream-commit: fd28f15288e0e98c3635289b15239f4e6cb7921c
Component: engine
2015-05-25 13:11:31 +02:00
733d4876c2
Cleanup: change test func name
...
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: ab121345ee2b5db35c13706a2bb8dff3de8d5300
Component: engine
2015-05-25 14:51:10 +08:00
710f67f354
Merge pull request #13424 from mavenugo/vendorin
...
Vendoring in libnetwork 67438080724b17b641b411322822c00d0d3c3201
Upstream-commit: f83073d3eb23a3f3c22bef9401090df5da53cc2f
Component: engine
2015-05-23 21:08:58 -07:00
0d8ca6abd9
Merge pull request #13161 from calavera/plugin_discovery
...
Proposal: Volume refactor and external volume plugins
Upstream-commit: bce3e761c0a78ca55cefa9c6d040c1bc9138c1fb
Component: engine
2015-05-23 18:44:18 -07:00
2f63354a90
Vendoring in libnetwork 67438080724b17b641b411322822c00d0d3c3201
...
This version brings in upto-date important bug-fixes from libnetwork
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: a3d22c764cfc3e175cdfb992f3b2314f23540236
Component: engine
2015-05-23 18:42:34 -07:00
6dc0e5e5ad
Merge pull request #13427 from moxiegirl/event-state-12164
...
Finally, finally, close #12164
Upstream-commit: 2e2e36e476defa4f6fe45c49d32fafa8e0386930
Component: engine
2015-05-23 15:37:57 -07:00
95ae7ce2aa
Finally, finally, close #12164
...
Updating with typo Seb found
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 6de4138465f089687b2c860f986616f6cb9f059b
Component: engine
2015-05-23 14:27:50 -07:00
98c6584c01
Merge pull request #13403 from hqhq/hq_fix_ipcmode_check
...
Don't check running container at create time
Upstream-commit: 89582f978189e68a87b01574c4f0f09b61c8c0f6
Component: engine
2015-05-23 08:32:51 -07:00
cfff66c7bb
Document in the experimental section
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
(cherry picked from commit a31633c2707c78c2ffd684a5a3e576f310af0fb5)
Upstream-commit: 8d0486832dafb775e93dafd1229fcf7e81ee4a28
Component: engine
2015-05-22 17:00:04 -07:00
f23ada12c4
Move Documentation changes out or this PR.
...
The will come in a follow up PR inside the experimental section.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: ab8a5bcf04243577516207257c7fe5ec8257a9f4
Component: engine
2015-05-22 16:58:48 -07:00
fd9e9a6b5b
Propagate unmount events to the external volume drivers.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: d592778f4a75d36745aaffaf73c0775ecd420545
Component: engine
2015-05-22 16:43:34 -07:00
4bdf86ad9b
Don't check running container at create time
...
We should let user create container even if the container he wants
join is not running, that check should be done at start time.
In this case, the running check is done by getIpcContainer() when
we start container.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: 84aae5a22605f8849e7335157afeca471b563a29
Component: engine
2015-05-23 07:15:14 +08:00
e579879a51
Merge pull request #13414 from tiborvass/no-distrib-in-dockerfile
...
Remove distribution source code from /go/src
Upstream-commit: 4bcfa47362c4c168d12745676df50b5160b05f1a
Component: engine
2015-05-22 15:11:36 -07:00
8db570e797
Remove distribution source code from /go/src
...
We already vendor distribution under ./vendor, but
because the GOPATH is /go:/go/src/github.com/.../vendor
Go will always compile the source code at /go not in ./vendor.
Apart from the fact that it is very inconvenient during
development, it was also a time-bomb: someone vendors a fix
from upstream distribution, but forgets to update
REGISTRY_COMMIT in the Dockerfile, and the binary doesn't get
the fix.
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 2b0b0c4b97596314b4b1d3960158cc4bcad4067b
Component: engine
2015-05-22 16:50:56 -04:00
612ba0246f
Merge pull request #13408 from jfrazelle/13407-fix-experimental-build
...
lol 108 chars ETOOMANY
Upstream-commit: f2c0b5431576fb2c35b73ca855334bf2196061d0
Component: engine
2015-05-22 10:42:57 -07:00
ee469d3fb9
Merge pull request #13391 from jfrazelle/add-security-maintainers
...
Add diogo and nathan as security maintainers.
Upstream-commit: ed9ad0be6d511c70686b7793cb5e6f6eefcf3969
Component: engine
2015-05-22 10:12:04 -07:00
d2b122f94a
lol 108 chars ETOOMANY
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: a1ea562b20b36345be2048ea24130b48cf4ec734
Component: engine
2015-05-22 10:10:17 -07:00
79dd7c9a98
Merge pull request #13372 from calavera/move_socket_creation_to_package
...
Extract sockets initialization to a package.
Upstream-commit: d71ba0cc832d3e94aab21e50e3ef7a710874ab79
Component: engine
2015-05-22 08:46:31 -07:00
3f5d7444b3
Merge pull request #13303 from moxiegirl/experimental-work
...
Experimental features placeholder
Upstream-commit: 8e76c0d1d8b77b86d1131ca82a7034b985a26526
Component: engine
2015-05-22 08:42:57 -07:00
699a45f6f2
Merge pull request #13401 from WeiZhang555/cleanup
...
Delete "defer deleteAllContainers()" from integration-cli
Upstream-commit: 0775456b469323a36db0fb96421ef3092bf7eba1
Component: engine
2015-05-22 09:17:23 -04:00
5f3b2bdd4c
Delete "defer deleteAllContainers()" from integration-cli
...
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: 6809fa68614c6a22f61fc61ad63d80d573b07df6
Component: engine
2015-05-22 17:01:52 +08:00
801e8947c6
Mark volume drivers and plugins as experimental in the documentation.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: a867c1b70a0ee3db2793ab1a8f56d24beaa41388
Component: engine
2015-05-21 20:34:17 -07:00
39e76a661b
Allow named volumes for external drivers.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 3bf0ca31cf61e445554326ba405cc32c7ef64189
Component: engine
2015-05-21 20:34:17 -07:00
778241cd3a
Make API volume-driver dependent on 'experimental'
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 2653c7c16cf87029c7e2e35427fbd1c83a0c96ba
Component: engine
2015-05-21 20:34:17 -07:00
e89556546b
Mark --volume-driver as experimental
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 4fc37a1ede58153bfa6aa5c9aa0f2903f18d572f
Component: engine
2015-05-21 20:34:17 -07:00
3dacf0ed87
Disable -v overloading
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
(cherry picked from commit ec5a362fb93358244305067419589f602fd33807)
Upstream-commit: 7da5a7eb6637222a313e9d6e7fbcd5dd472154e3
Component: engine
2015-05-21 20:34:17 -07:00
89782c55eb
Volumes refactor and external plugin implementation.
...
Signed by all authors:
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Signed-off-by: David Calavera <david.calavera@gmail.com >
Signed-off-by: Jeff Lindsay <progrium@gmail.com >
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Signed-off-by: Luke Marsden <luke@clusterhq.com >
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 81fa9feb0cdc0773eff99d7393c16271e84aac08
Component: engine
2015-05-21 20:34:17 -07:00
0b16a9b9c3
Merge pull request #13399 from hqhq/hq_fix_run_test
...
Fix test failure when --net none build
Upstream-commit: 23e8dff9e7d06de09a17dd3174f8cf26d2067eb4
Component: engine
2015-05-21 21:50:44 -04:00
ab1e39f7d4
Merge pull request #12766 from Microsoft/10662-graphdriverrefactor
...
Windows: graphdriver refactor
Upstream-commit: 88275e94d62896383b54209b5a8691ed3cffe122
Component: engine
2015-05-21 21:28:24 -04:00
adfc87193d
Add diogo and nathan as security maintainers.
...
Updated my email.
Also retabbed the whole file... I am OCD.
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: 7c6cab6345a7398ebc95048418f379d43e9a00fd
Component: engine
2015-05-21 17:59:38 -07:00
3c9aadce7f
Merge pull request #13386 from icecrime/experimental_suffix_version
...
Suffix experimental version / fix warning output
Upstream-commit: 2b8271399e0871efd769a79b7ae43b2f51358a3a
Component: engine
2015-05-21 17:42:23 -07:00
f7e26caad3
Fix test failure when --net none build
...
Closes : #13369
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: c0dd8538db070a055150a0da76d093d5d196ab42
Component: engine
2015-05-22 08:21:09 +08:00
b53e996e55
Add suffix to experimental builds version
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 78578125ce6c534253d8d60c242d6993c569449e
Component: engine
2015-05-21 16:27:42 -07:00
329dcd34ed
Merge pull request #13395 from SvenDowideit/cs-docker-1.6.2cs5-release-notes
...
Publish release notes for latest cs Docker engine
Upstream-commit: ddf783ed2fc4f6750daf5b2298b7684038b4d632
Component: engine
2015-05-22 09:16:12 +10:00
d5d48e47c8
Publish release notes for latest cs Docker engine
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 740b1b5a2d89ef8d2c4c606636e5b42234298734
Component: engine
2015-05-22 09:14:06 +10:00
d60fe719f4
Merge pull request #13336 from calavera/document_missing_build_flags
...
Document missing build flags.
Upstream-commit: b639f00280d974f4c8c3e1ced18afd5173a1f4e3
Component: engine
2015-05-22 01:03:37 +02:00
21792a8e30
Merge pull request #13393 from tiborvass/fix-token-bug
...
registry: Fix auth bug
Upstream-commit: 6c5a140f8a4470c45f3a9302c00c398b75c23549
Component: engine
2015-05-21 15:58:17 -07:00
a0524deeed
Merge pull request #12964 from Microsoft/10662-emptywindowsexecdriver
...
Windows: Empty Windows Exec Driver
Upstream-commit: 2be757f8696a2df6b02b153db15ea4f6d756c02a
Component: engine
2015-05-21 15:30:21 -07:00
50f6b1411a
Document missing build flags.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: a85b09d8a40456fb5f3b72b7b1999cd9df08c082
Component: engine
2015-05-21 15:02:00 -07:00
ebafe2bed3
registry: fix auth bug
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: fc29f7f70b34ae11e1084a66cf401ff11b4573e7
Component: engine
2015-05-21 16:53:22 -04:00
522037006a
Merge pull request #13387 from cpuguy83/fix_ngroutine_test
...
Better checking for LogsFollowGoroutinesWithStdout
Upstream-commit: 7fffcfff32ce6c4379f3b90a1570847b06d75a8c
Component: engine
2015-05-21 12:31:57 -07:00
97013d9e36
Better checking for LogsFollowGoroutinesWithStdout
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 2805ff1ecee7cd850a08a00ee9448b54beb4032b
Component: engine
2015-05-21 14:13:01 -04:00
8e905a0abb
Merge pull request #13371 from theadactyl/patch-2
...
Add theadactyl as community manager
Upstream-commit: 523d2f6a04d59883d0a45c177209e04729a4daa6
Component: engine
2015-05-21 11:06:38 -07:00
832c917cec
Merge pull request #13380 from coolljt0725/add_missing_check_return_err_function
...
Add missing return error check for container.WriteHostConfig() in container_linux.go
Upstream-commit: 00e78a18ba56970cdb213f41f98fba04c4c7b84b
Component: engine
2015-05-21 09:32:52 -07:00
397e4d3e91
Merge pull request #13383 from duglin/CreateRMTest
...
Add a 'docker create' + 'docker rm' testcase
Upstream-commit: 0ac5e8a1709b09f311f9032c7e139b66ce0bccb5
Component: engine
2015-05-21 09:32:32 -07:00
aa89cbdb44
Add a 'docker create' + 'docker rm' testcase
...
Per @thaJeztah's comment here: https://github.com/docker/docker/pull/13367#issuecomment-104286651
I couldn't find an existing test that covered this.
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 012e588a744ce3000d58a7562a1a8291a7fe10ae
Component: engine
2015-05-21 07:30:51 -07:00
aee8d65658
Add missing return error check
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: a9bc05a2f8e0978f47473b07b43d79692cf498bc
Component: engine
2015-05-21 17:03:43 +08:00
a90378a2ea
Merge pull request #13310 from coolljt0725/make_ps_size_show_virtual_size_work
...
Make docker ps --size show virtual size really work
Upstream-commit: ef0a14559332f443a0f111dd22a43b13de3aa967
Component: engine
2015-05-20 18:32:11 -07:00
19664cd1d4
Experimental features placeholder
...
Signed-off-by: Mary Anthony <mary@docker.com >
Adding experimental features into the mix
Signed-off-by: Mary Anthony <mary@docker.com >
renaming file
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 7231692a02ee6346b051a00fde153675e0a9a771
Component: engine
2015-05-20 18:10:07 -07:00
