45a710ef4e
Merge pull request #17504 from calavera/default_network_driver
...
Let the api to choose the default network driver.
Upstream-commit: d7bdbdf564d58b6f5d47c8114b720c96eaee80df
Component: engine
2015-10-29 20:37:21 -04:00
9e7bc2e568
Refactor Shutdown a little to reduce indentation
...
Also make daemon.netController.Stop() regardless of container existance.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: ace5854f654d58e821bb3d47c4e3255ae49619e5
Component: engine
2015-10-29 17:20:32 -07:00
5502018bf5
update go version for debs and rpms
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 985fe8857d6670e5a484237a8c8ccdde66a39013
Component: engine
2015-10-29 17:04:38 -07:00
961ca9c736
Let the api to choose the default network driver.
...
That way swarm can understand the user's intention.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 34668ad68bb42d7488649e41b32818f3f1a7cff2
Component: engine
2015-10-29 19:47:12 -04:00
55e3716df6
Update kill.md
...
Added Note to show users that signals will not propagate to the container if the preferred exec form isn't used.
Signed-off-by: Eric Rosenberg <ehaydenr@gmail.com >
Upstream-commit: c1a5ee53c19d62918f5ef245b5d2268fb9c89ca8
Component: engine
2015-10-29 18:40:16 -05:00
631571fcc6
Merge pull request #17497 from LK4D4/put_err
...
Do not ignore errors from graphdriver.Put
Upstream-commit: 82203d06ebbd7e205cf620c2e8555914f3c86d8f
Component: engine
2015-10-29 19:37:10 -04:00
db9e9ee3c5
Merge pull request #17228 from ecnahc515/patch-1
...
cliconfig: Do not rely on platform dependent code
Upstream-commit: 6c80fd24687bed12b394e35cc59742e75a19376a
Component: engine
2015-10-29 19:29:38 -04:00
ff7c252b26
Merge pull request #17491 from LK4D4/seq_tests
...
Run unit tests as single command
Upstream-commit: d30caedbf8860b0cc07aa2429ca20dafb5e918e2
Component: engine
2015-10-29 16:29:24 -07:00
2bf3bcdc0a
Windows: Adds support for Hyper-V Containers
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 15e35c447058851850155f90292e51decb482956
Component: engine
2015-10-29 16:18:52 -07:00
12614debc5
Fix test file paths
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 1847641b7b6985e7fe06cb09adf5c9f6237b5931
Component: engine
2015-10-29 15:51:04 -07:00
873a58e636
expand the list a bit more
...
Signed-off-by: Chase Bolt <chase.bolt@gmail.com >
Upstream-commit: d8aaf962169e2c6070d178bb754b0171b45e2328
Component: engine
2015-10-29 15:23:44 -07:00
d7b7b49b51
Merge pull request #17499 from jfrazelle/fix-lxc-tests
...
lxc does not support exec
Upstream-commit: 2eaa25d3554dbe9f6d5c4f66a97c8eb83a463880
Component: engine
2015-10-29 15:08:13 -07:00
f8757c11b0
Merge pull request #17490 from aboch/pm
...
Libnetwork vendoring & overlay networking fixes
Upstream-commit: 7f7950aa187e551bdc4d6128523207c2b8343250
Component: engine
2015-10-29 13:45:19 -07:00
27424c56e7
Merge pull request #17460 from dmcgowan/fix-rmi-force-tag
...
Fix rmi -f removing multiple tags
Upstream-commit: cdfd9846f480b54dc6207b578c29ecfe2cdeed34
Component: engine
2015-10-29 13:01:06 -07:00
6cae6d09ea
lxc does not support exec
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: aaa134ea0e12781c7e1f19562544826274263a4b
Component: engine
2015-10-29 11:51:59 -07:00
a94cd37485
Execute buildPortMapInfo after Endpoint.Join()
...
- As the retrieved info may not be available at
Endpoint creation time for certain network drivers
- Also retrieve the MAC address from Endpoint.Info().Iface()
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: e03daebb48221bae84bfc48b0f9b652ced6d93f3
Component: engine
2015-10-29 11:47:30 -07:00
35f2f24931
Fix Graph() docstring
...
It's not true anymore, it used in builder for example.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 134772f91ec40616d974e61388638495c8a126fb
Component: engine
2015-10-29 11:41:42 -07:00
b276a5731c
Do not ignore errors from graphdriver.Put
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: ac4b2905528457d9dba252c1590b9ac143372d0b
Component: engine
2015-10-29 11:25:53 -07:00
9a9584b78d
setting device-mapper-libs version dependency for centos 7 rpm
...
Signed-off-by: Chase Bolt <chase.bolt@gmail.com >
Upstream-commit: 787d94626febc306f5f0340af40c085b9a41f614
Component: engine
2015-10-29 11:11:19 -07:00
09de1db703
Merge pull request #17488 from jfrazelle/skip-windows-test
...
cant run volume on windows w remote daemon host
Upstream-commit: 8d62f243c725c6eba43ca59ef17407e43004a238
Component: engine
2015-10-29 13:37:39 -04:00
0b3d47d91e
Remove dead code
...
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net >
Upstream-commit: 164d0bca63b74e6e0deeceee17b55c044f8d274e
Component: engine
2015-10-29 16:56:29 +00:00
691e7791f8
Run unit tests as single command
...
For me it increased speed of unit-tests tremendously, however this disabled
coverage profiles generation, which I think is pretty good tradeoff.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 1c23de0e64887f6c36b2156dd65717f723493775
Component: engine
2015-10-29 09:39:51 -07:00
4a8db513f4
Vendoring libnetwork 20351a84241aa1278493d74492db947336989be6
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 90744fe9432d988bae187a8dab7c606b2dc13895
Component: engine
2015-10-29 09:24:48 -07:00
7fc5a670bb
cant run volume on windows
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 1a6a860c143487b96b8a6221768a73ed4cef6d7b
Component: engine
2015-10-29 08:55:48 -07:00
c41fca36c1
Using checkers assert for integration-cli/docker_cli_attach_unix_test.go
...
Fixes part of #16756
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com >
Upstream-commit: f4abc6406e5837cee33763b6784b89578045d4db
Component: engine
2015-10-29 21:38:00 +08:00
45e2cb6b92
Rework docker cli history
...
The implementation of `history` is a little redundant espacially
when user set the `--human` and/or `--no-trunc` options.
There are too many conditionals for `human`, `no-trunc` and `quiet` which
I think is useless and complicated.
Since `quiet` will only display the container IDs so it could be not
nested with the other options.
Signed-off-by: Hu Keping <hukeping@huawei.com >
Upstream-commit: 09eedc35b2e309c4b9489e21a623ad72179a8ded
Component: engine
2015-10-29 17:59:07 +08:00
58647231c1
fix experimental tests
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 44da86172aeb750d0ac46c000e32e51a12411ecd
Component: engine
2015-10-28 21:14:45 -07:00
b2d6b2b0d2
Merge pull request #17462 from LK4D4/fix_device_tool
...
Fix docker-device-tool
Upstream-commit: 965706245b702c08d23ce7da2e91440ccec74726
Component: engine
2015-10-28 18:56:54 -07:00
8ca5c39620
Add show error when attach to a paused container
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: de1d611990a80cf4a38ec501469c08c1aeee2d60
Component: engine
2015-10-28 21:00:09 -04:00
b0c9467783
Merge pull request #17437 from LK4D4/put_error
...
Do not ignore error from driver.Put
Upstream-commit: 0e1618db194388e7fe54332a7e192eb41ad9df89
Component: engine
2015-10-28 17:32:03 -07:00
7a5788a9d4
Fix docker-device-tool
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 584bdaf5d92d1f8beda602493c90c389d6b82b47
Component: engine
2015-10-28 16:43:53 -07:00
26f967025f
Merge pull request #17458 from LK4D4/unnec_err
...
Remove unnecessary error returns
Upstream-commit: 7de2b49ac86cf92fd2af34f671503118c3cc8b16
Component: engine
2015-10-28 16:25:40 -07:00
4cf9c8be78
Fix rmi -f removing multiple tags
...
When an image has multiple tags and rmi is called with force on a tag, only the single tag should be removed.
The current behavior is broken and removes all tags and the image.
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: 48e7f7963e142a0a45b583c5e65015d896c59433
Component: engine
2015-10-28 16:07:02 -07:00
0317f9b3fb
Merge pull request #16898 from hqhq/hq_bump_bolt
...
Bump bolt to v1.1.0
Upstream-commit: b6e1f4dd69a865df847dd4f6efe12df21f5c34dd
Component: engine
2015-10-28 18:51:23 -04:00
a0d60ea3e8
Remove unnecessary error returns
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 990655448dec63ef8add376becb1a20ae184a162
Component: engine
2015-10-28 15:15:22 -07:00
b5b91966d7
Merge pull request #17424 from coolljt0725/fix_inspect_gateway_value
...
Fix docker inspect display odd gateway value for none network mode
Upstream-commit: 54d42f4a107641c2755ea1d6e55ca41d8945f4f8
Component: engine
2015-10-28 13:39:59 -07:00
b78e8b7756
docker-py: upgrade and fix test script
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 8db141049f5323d754584f265b267e52ee5d9e17
Component: engine
2015-10-28 12:56:50 -04:00
dd17d17d3e
Fix volume error messages
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 5f4cb33a5186c7822dc718ba915f59979c598c28
Component: engine
2015-10-28 09:23:43 -07:00
552e02ae16
Do not ignore error from driver.Put
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: bc09eceaf401893275b6ec5508d523ec39357d78
Component: engine
2015-10-28 06:54:09 -07:00
870fa4ea2c
modified docker_cli_kill_test.go to use c.Asserts
...
Signed-off-by: Zuhayr Elahi <elahi.zuhayr@gmail.com >
Upstream-commit: d0762a60e01339235917007fd48722ce5390ed71
Component: engine
2015-10-27 21:18:26 -07:00
72e420120c
Merge pull request #17418 from diogomonica/bump-go-1.5
...
Bump go 1.5
Upstream-commit: 96a6e810de0bfabe6cc59588f237470810703656
Component: engine
2015-10-27 20:12:43 -07:00
62616f762f
Fix docker inspect display odd gateway value for none network mode
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 7fa601adc7858606630dec5b037e60b8955e716d
Component: engine
2015-10-27 21:47:12 -04:00
238006044d
Merge pull request #17423 from cpuguy83/so_sensitive
...
Revert "dockerversion placeholder for library-import"
Upstream-commit: b227d19cae34d6d0ce92b72a53f02330b0be5992
Component: engine
2015-10-27 18:32:18 -07:00
cc55863497
Revert "dockerversion placeholder for library-import"
...
This reverts commit d5cd032a86617249eadd7142227c5355ba9164b4.
Commit caused issues on systems with case-insensitive filesystems.
Revert for now
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: b78ca243d9fc25d81c1b50008ee69f3e71e940f6
Component: engine
2015-10-27 21:23:53 -04:00
ff53341015
Bump bolt to v1.1.0
...
It adds ARM64, ppc64le, s390x, solaris support, and a bunch of
bugfixs.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: a41917c2c88bd7f694d141ac67f4a194aaa16fa1
Component: engine
2015-10-28 08:49:45 +08:00
76053edbd7
extract docker volume API from local
...
Signed-off-by: Dong Chen <dongluo.chen@docker.com >
Upstream-commit: 9862a4b43ec6236305f6b57274c6edd61dad96b7
Component: engine
2015-10-27 17:28:19 -07:00
50ef9e9aba
Merge pull request #17422 from calavera/inspect_networks_docs
...
Update inspect api examples with new network settings.
Upstream-commit: 94811ae814ddce67b623d35ef44dcf276629442f
Component: engine
2015-10-27 20:09:54 -04:00
fbb5f4e19f
Merge pull request #17393 from tiborvass/carry-17360
...
Carry Fix docker inspect container only reports last assigned information
Upstream-commit: 9ab71b68af5b340373411e26e679c6e7506ce167
Component: engine
2015-10-27 17:00:41 -07:00
28eb09ab06
Update inspect api examples with new network settings.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 9a7e632cf097b71aab6e46ef010d038f602e03d3
Component: engine
2015-10-27 19:56:29 -04:00
1cfc0cf7f6
Merge pull request #17373 from Microsoft/10662-volumetests
...
Windows: Volume integration tests
Upstream-commit: 2266462f724492d3802d7043723347adeb18024e
Component: engine
2015-10-27 19:52:11 -04:00
Tibor Vass
Alexander Morozov
Jessica Frazelle
David Calavera
Eric Rosenberg
Brian Goff
Jess Frazelle
John Howard
Chase Bolt
Alexander Morozov
Alessandro Boch
Aidan Hobson Sayers
Wen Cheng Ma
Hu Keping
Lei Jitang
Derek McGowan
Doug Davis
Tibor Vass
Zuhayr Elahi
Qiang Huang
Dong Chen