f62844e779
Merge pull request #17558 from aboch/nw
...
Fix bug in initializeNetwork()
Upstream-commit: beeec6d103cadb037ccd5f9bc4c6647ae74a6b45
Component: engine
2015-11-02 12:15:41 -08:00
0094681e85
Merge pull request #17598 from zelahi/16756-dockercli-createtest
...
Added c.Assert statements to docker_api_create_test.go
Upstream-commit: 920ab75bd5969fc4d387c530043115974fae8c79
Component: engine
2015-11-02 11:43:20 -08:00
e2a063d0d8
Fix bug in initializeNetwork()
...
- On `docker run --net <network id> ...`
the bug would cause the container to attempt
to connect to the network two times
- Also made sure endpoint creation rollback will
be executed on failures in `func (container *Container) connectToNetwork()`
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 45e71a79840887b7974387bedba0544015ab4e3b
Component: engine
2015-11-02 11:20:15 -08:00
ed19776156
Merge pull request #17542 from estesp/restart-root-dir-cleanup
...
Fix integration-cli daemon restart with user namespaces enabled
Upstream-commit: 6563b7d2e8a5c1ebef978e2ad8a1f7971b385abc
Component: engine
2015-11-02 09:50:12 -08:00
6bc6afa199
Added c.Assert statements to docker_api_create_test.go
...
removed the if/else statements and added c.Assert statements for docker_api_create_test.go.
Removed check.commentf in c.Assert statements
Signed-off-by: Zuhayr Elahi <elahi.zuhayr@gmail.com >
Upstream-commit: 6694326d5d23ab866d1fccf1f9cbcedfd8a31e85
Component: engine
2015-11-01 19:54:19 -08:00
c0bdea2939
Merge pull request #16903 from cxxly/16756-refactor-docker_cli_netmode_test
...
refactor docker_cli_netmode_test .go with Assert statement
Upstream-commit: 29c9717cac9d8da8c6327d742deb514fc7ab152b
Component: engine
2015-11-01 11:07:54 +01:00
eb4a438be7
Fix integration-cli daemon restart with user namespaces enabled
...
The `d.root` dir is resolved to the full path to the graph dir after the
daemon starts, but on restart, should be set back to the parent (without
the "<uid>.<gid>" ending) so that it uses/resolves to the same graphdir
on restart.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
Upstream-commit: 0c57b9f5b3cb72df47578a3f0e505db2bec5ccf1
Component: engine
2015-10-31 14:39:33 -04:00
1dd04a954b
Merge pull request #16579 from coolljt0725/fix_attach_paused_container
...
Add show error when attach to a paused container
Upstream-commit: 5719d010665377c0696e36b894e742399deb30ed
Component: engine
2015-10-31 07:43:22 -07:00
8aced90277
Merge pull request #17524 from mountkin/fix-teardown
...
dont try to remove builtin networks in teardown
Upstream-commit: cccb6bce7d76672a41e683d19063a4c12a0ced08
Component: engine
2015-10-30 20:59:57 -04:00
30dea50165
IT for daemon restarts when container connected to multiple networks
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: e16e794805ec1e578951f271af7993d9619a4ede
Component: engine
2015-10-30 16:25:25 -07:00
057d34fa0f
Fix network inspect for default networks.
...
- Keep old fields in NetworkSetting to respect the deprecation policy.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: f301c5765a0d7f4b6866cedfdface6f87874ff53
Component: engine
2015-10-30 16:55:21 -04:00
1384f6d7a7
Merge pull request #17518 from WeiZhang555/integration-test-bug
...
bug fix for test cases
Upstream-commit: 05534b6f8007e1f614cccdf9467e07a8cc38ae3d
Component: engine
2015-10-30 16:56:35 +01:00
57ba704963
dont try to remove builtin networks in teardown
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com >
Upstream-commit: 5970e94072b922b4c5e4ef12fb1b11391ba36d6b
Component: engine
2015-10-30 23:05:33 +08:00
0adc841955
Merge pull request #17385 from aditirajagopal/16756-upgrade_commit_test
...
Checkers on integration-cli/docker_cli_commit_test
Upstream-commit: 2c6351a4a51d1090658c55b33fbbec28c635c97b
Component: engine
2015-10-30 10:36:41 -04:00
f0f0d423c9
Merge pull request #17427 from zelahi/16756-dockercli-killtest
...
modified docker_cli_kill_test.go to use c.Asserts
Upstream-commit: 0598ff46ac0d4e485ff8109f9d287990d5d54256
Component: engine
2015-10-30 12:56:52 +01:00
3b3b529e21
Merge pull request #17425 from wenchma/16756-docker_cli_attach_unix_test
...
Using checkers assert for integration-cli/docker_cli_attach_unix_test.go
Upstream-commit: 77488b90c5dbc4d3e5237aa856fdd042ff8d9f42
Component: engine
2015-10-30 12:41:14 +01:00
f93a5200e3
bug fix for test cases
...
Fix bug that `isNwPresent` can't distinguish network names with same
prefix.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: 8f53edae3bd628e00f052182a3a5e84ee578f018
Component: engine
2015-10-30 15:13:35 +08:00
82ce818530
Checkers on integration-cli/docker_cli_commit_test
...
Applying #16756 to integration-cli/docker_cli_commit_test.go
Signed-off-by: Aditi Rajagopal <arajagopal@us.ibm.com >
Upstream-commit: 483abbb313a35696a9c1b7ff72407b0a0118a22b
Component: engine
2015-10-29 21:47:54 -05: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
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
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
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
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
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
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
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
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
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
6c30abdc61
Extract network settings types for inspect.
...
Keeping backwards compatibility.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 25682577c9d29b325b4b615c4b88c132a4640082
Component: engine
2015-10-27 19:16:21 -04:00
a3a7b41a5a
Merge pull request #17382 from jecarey/16765-docker_cli_images_test
...
Use of checkers on docker_cli_images_test.go
Upstream-commit: 1c8ee617d164fec5da15d274516dc5131bcd41dd
Component: engine
2015-10-27 17:25:45 -04:00
9cd08e6796
Merge pull request #17350 from vdemeester/11699-auto-libraryimport
...
dockerversion placeholder for library-import
Upstream-commit: 6276c676a897ab8a4c7fdcd78d18c8fc3a761707
Component: engine
2015-10-27 13:39:40 -07:00
95c227e717
Merge pull request #17364 from mavenugo/advertise
...
Enhancing --cluster-advertise to support <interface-name>
Upstream-commit: 85ae8b034a5bf9428dbcc7cfd94c55739eaf2862
Component: engine
2015-10-27 13:29:18 -07:00
46ab4a1920
Use of checkers on docker_cli_images_test.go
...
Signed-off-by: James Carey <jecarey@us.ibm.com >
Upstream-commit: 5814d67f9850e5eff9d6beb24b2b9dde89ee7381
Component: engine
2015-10-27 15:26:38 -05:00
c2f87fdd0e
Fix docker inspect container only reports last assigned information
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 1b9a08e719776e53b7aea1a89c2c29fbf27b1ae4
Component: engine
2015-10-27 16:26:06 -04:00
edfe664f0f
Merge pull request #17390 from sanimej/libn
...
Vendor in libnetwork changes to support container rename
Upstream-commit: 64854277f87d5f5d1f79db340ecb0b82d82f1865
Component: engine
2015-10-27 13:21:15 -07:00
4d261096ec
dockerversion placeholder for library-import
...
- Move autogen/dockerversion to version
- Update autogen and "builds" to use this package and a build flag
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: d5cd032a86617249eadd7142227c5355ba9164b4
Component: engine
2015-10-27 20:36:07 +01:00
8ad5b6fcfd
Enhancing --cluster-advertise to support <interface-name>
...
--cluster-advertise daemon option is enahanced to support <interface-name>
in addition to <ip-address> in order to amke it automation friendly using
docker-machine.
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 3e7db73b99498d037b43eb59972a6360cfbc971b
Component: engine
2015-10-27 11:03:22 -07:00
3ad728d9e8
Do not update etc/hosts for every container
...
- Only user named containers will be published into
other containers' etc/hosts file.
- Also block linking to containers which are not
connected to the default network
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 4f6f00e1916a8c58e67c8118d015988d86718d19
Component: engine
2015-10-26 20:08:57 -07:00
744e201d80
Merge pull request #17257 from echo33/docker_cli_exec_test
...
use of checkers on docker_cli_exec_test.go
Upstream-commit: f3f63c6044057637f3eadf78c2c939ef60556db7
Component: engine
2015-10-26 23:14:38 +01:00
ae1be9214f
Merge pull request #17256 from liaoqingwei/16756-docker_cli_config_test
...
Use of checkers on docker_cli_config_test.go
Upstream-commit: 962243e3878ba214f65fe7a9b88462644533c333
Component: engine
2015-10-26 23:00:04 +01:00
14116a686a
Windows: Volume integration tests
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 2af5034ce8faa1f93d81864aa25ec64527fac76b
Component: engine
2015-10-26 14:33:28 -07:00
e73cfc9762
Merge pull request #17206 from liaoqingwei/16756-docker_cli_import_test
...
Use of checkers on docker_cli_import_test.go
Upstream-commit: 2dd822f3226393b5611364785793d38a44debd08
Component: engine
2015-10-26 13:42:02 -07:00
c164ea0c2b
Merge pull request #17374 from brahmaroutu/fix_gccgo_ci
...
GCCGO requires more memory and time to start containers, fixing GCCGO…
Upstream-commit: 8173acca9530dc3ff090f6025e6940e3f1f6f116
Component: engine
2015-10-26 13:33:59 -07:00
d358a1b7cc
Merge pull request #17313 from calavera/version_exec_json_check
...
Version exec json check.
Upstream-commit: 5cf028d3ddc8808bbd3ff710cdd82bf4a04042a2
Component: engine
2015-10-26 13:32:32 -07:00
