fd28f15288
Merge pull request #13452 from WeiZhang555/cleanup
...
Cleanup: change test func name
2015-05-25 13:11:31 +02:00
ab121345ee
Cleanup: change test func name
...
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2015-05-25 14:51:10 +08:00
f83073d3eb
Merge pull request #13424 from mavenugo/vendorin
...
Vendoring in libnetwork 67438080724b17b641b411322822c00d0d3c3201
2015-05-23 21:08:58 -07:00
bce3e761c0
Merge pull request #13161 from calavera/plugin_discovery
...
Proposal: Volume refactor and external volume plugins
2015-05-23 18:44:18 -07:00
a3d22c764c
Vendoring in libnetwork 67438080724b17b641b411322822c00d0d3c3201
...
This version brings in upto-date important bug-fixes from libnetwork
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-05-23 18:42:34 -07:00
2e2e36e476
Merge pull request #13427 from moxiegirl/event-state-12164
...
Finally, finally, close #12164
2015-05-23 15:37:57 -07:00
6de4138465
Finally, finally, close #12164
...
Updating with typo Seb found
Signed-off-by: Mary Anthony <mary@docker.com>
2015-05-23 14:27:50 -07:00
89582f9781
Merge pull request #13403 from hqhq/hq_fix_ipcmode_check
...
Don't check running container at create time
2015-05-23 08:32:51 -07:00
8d0486832d
Document in the experimental section
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
(cherry picked from commit a31633c2707c78c2ffd684a5a3e576f310af0fb5)
2015-05-22 17:00:04 -07:00
ab8a5bcf04
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>
2015-05-22 16:58:48 -07:00
d592778f4a
Propagate unmount events to the external volume drivers.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-05-22 16:43:34 -07:00
84aae5a226
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>
2015-05-23 07:15:14 +08:00
4bcfa47362
Merge pull request #13414 from tiborvass/no-distrib-in-dockerfile
...
Remove distribution source code from /go/src
2015-05-22 15:11:36 -07:00
2b0b0c4b97
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>
2015-05-22 16:50:56 -04:00
f2c0b54315
Merge pull request #13408 from jfrazelle/13407-fix-experimental-build
...
lol 108 chars ETOOMANY
2015-05-22 10:42:57 -07:00
ed9ad0be6d
Merge pull request #13391 from jfrazelle/add-security-maintainers
...
Add diogo and nathan as security maintainers.
2015-05-22 10:12:04 -07:00
a1ea562b20
lol 108 chars ETOOMANY
...
Signed-off-by: Jessica Frazelle <princess@docker.com>
2015-05-22 10:10:17 -07:00
d71ba0cc83
Merge pull request #13372 from calavera/move_socket_creation_to_package
...
Extract sockets initialization to a package.
2015-05-22 08:46:31 -07:00
8e76c0d1d8
Merge pull request #13303 from moxiegirl/experimental-work
...
Experimental features placeholder
2015-05-22 08:42:57 -07:00
0775456b46
Merge pull request #13401 from WeiZhang555/cleanup
...
Delete "defer deleteAllContainers()" from integration-cli
2015-05-22 09:17:23 -04:00
6809fa6861
Delete "defer deleteAllContainers()" from integration-cli
...
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2015-05-22 17:01:52 +08:00
a867c1b70a
Mark volume drivers and plugins as experimental in the documentation.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-05-21 20:34:17 -07:00
3bf0ca31cf
Allow named volumes for external drivers.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-05-21 20:34:17 -07:00
2653c7c16c
Make API volume-driver dependent on 'experimental'
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-05-21 20:34:17 -07:00
4fc37a1ede
Mark --volume-driver as experimental
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-05-21 20:34:17 -07:00
7da5a7eb66
Disable -v overloading
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
(cherry picked from commit ec5a362fb93358244305067419589f602fd33807)
2015-05-21 20:34:17 -07:00
81fa9feb0c
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>
2015-05-21 20:34:17 -07:00
23e8dff9e7
Merge pull request #13399 from hqhq/hq_fix_run_test
...
Fix test failure when --net none build
2015-05-21 21:50:44 -04:00
88275e94d6
Merge pull request #12766 from Microsoft/10662-graphdriverrefactor
...
Windows: graphdriver refactor
2015-05-21 21:28:24 -04:00
7c6cab6345
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>
2015-05-21 17:59:38 -07:00
2b8271399e
Merge pull request #13386 from icecrime/experimental_suffix_version
...
Suffix experimental version / fix warning output
2015-05-21 17:42:23 -07:00
c0dd8538db
Fix test failure when --net none build
...
Closes : #13369
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-05-22 08:21:09 +08:00
78578125ce
Add suffix to experimental builds version
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-05-21 16:27:42 -07:00
ddf783ed2f
Merge pull request #13395 from SvenDowideit/cs-docker-1.6.2cs5-release-notes
...
Publish release notes for latest cs Docker engine
2015-05-22 09:16:12 +10:00
740b1b5a2d
Publish release notes for latest cs Docker engine
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-05-22 09:14:06 +10:00
b639f00280
Merge pull request #13336 from calavera/document_missing_build_flags
...
Document missing build flags.
2015-05-22 01:03:37 +02:00
6c5a140f8a
Merge pull request #13393 from tiborvass/fix-token-bug
...
registry: Fix auth bug
2015-05-21 15:58:17 -07:00
2be757f869
Merge pull request #12964 from Microsoft/10662-emptywindowsexecdriver
...
Windows: Empty Windows Exec Driver
2015-05-21 15:30:21 -07:00
a85b09d8a4
Document missing build flags.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-05-21 15:02:00 -07:00
fc29f7f70b
registry: fix auth bug
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2015-05-21 16:53:22 -04:00
7fffcfff32
Merge pull request #13387 from cpuguy83/fix_ngroutine_test
...
Better checking for LogsFollowGoroutinesWithStdout
2015-05-21 12:31:57 -07:00
2805ff1ece
Better checking for LogsFollowGoroutinesWithStdout
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-05-21 14:13:01 -04:00
523d2f6a04
Merge pull request #13371 from theadactyl/patch-2
...
Add theadactyl as community manager
2015-05-21 11:06:38 -07:00
00e78a18ba
Merge pull request #13380 from coolljt0725/add_missing_check_return_err_function
...
Add missing return error check for container.WriteHostConfig() in container_linux.go
2015-05-21 09:32:52 -07:00
0ac5e8a170
Merge pull request #13383 from duglin/CreateRMTest
...
Add a 'docker create' + 'docker rm' testcase
2015-05-21 09:32:32 -07:00
012e588a74
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>
2015-05-21 07:30:51 -07:00
a9bc05a2f8
Add missing return error check
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-05-21 17:03:43 +08:00
ef0a145593
Merge pull request #13310 from coolljt0725/make_ps_size_show_virtual_size_work
...
Make docker ps --size show virtual size really work
2015-05-20 18:32:11 -07:00
7231692a02
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>
2015-05-20 18:10:07 -07:00
d0de2b1e2f
Make docker ps --size show virtual size really work
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-05-21 08:57:11 +08:00
Sebastiaan van Stijn
Zhang Wei
Arnaud Porterie
Madhu Venugopal
moxiegirl
Alexander Morozov
David Calavera
Qiang Huang
Jessie Frazelle
Tibor Vass
Michael Crosby
Jessica Frazelle
Brian Goff
Sven Dowideit
Sven Dowideit
Doug Davis
Lei Jitang