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
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
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
022782c7fa
refacter attach API tests to use checkers
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com >
Upstream-commit: 4f6f46a11d9a8588d1e21f5cb543bb9c7181fec3
Component: engine
2015-10-27 16:20:06 +08: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
37bb29c370
Merge pull request #17368 from HuKeping/update-test
...
Update docker_cli_build_unix_test
Upstream-commit: 74a881c9e4e4010d79799baec751e278864b5509
Component: engine
2015-10-26 13:21:31 -07:00
da50e3fb15
Merge pull request #17343 from fgimenez/16756-refactor-docker_cli_external_graphdriver_unix_test-to-use-checker
...
Use checker assert for docker_cli_external_graphdriver_unix_test.go
Upstream-commit: b21f95c6125cf183fe04bcb23f40f3bffbddca54
Component: engine
2015-10-26 15:39:08 -04:00
7e73e071bd
Version exec json check.
...
Keep backwards compatibility with old versions of the api.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 0b5e628e14a673cd1940876b2f3d091c2fe236d9
Component: engine
2015-10-26 15:12:06 -04:00
654728d047
GCCGO requires more memory and time to start containers, fixing GCCGO x86 CI
...
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: 2046ba3e3ceee6c51f6e4c55f5d26af212d2dc3e
Component: engine
2015-10-26 19:09:00 +00:00
07425589a1
Merge pull request #17351 from mavenugo/predefined
...
Prevent user from deleting pre-defined networks
Upstream-commit: 34439f3ecb5cbde2f733e162179dfbe57dbaabff
Component: engine
2015-10-26 10:06:45 -07:00
abd9d36021
Update docker_cli_build_unix_test
...
Signed-off-by: Hu Keping <hukeping@huawei.com >
Upstream-commit: f410d7e70f7196673ed63a7aa7dec25ad4475ef1
Component: engine
2015-10-26 21:06:11 +08:00
5c51a1e94a
Merge pull request #17222 from maaquib/16756-integration-cli-export-import-test
...
Using checkers assert for integration-cli/docker_cli_export_import_test.go
Upstream-commit: 9328fc7e62e703ac5bae7de5fdf9c02dbcccb034
Component: engine
2015-10-26 13:58:21 +01:00
15e5b8010a
Use checker assert for integration-cli/docker_cli_external_graphdriver_unix_test.go
...
Signed-off-by: Federico Gimenez <fgimenez@coit.es >
Upstream-commit: 7058ec278dcd27fce62c50b1e462aca8ade42439
Component: engine
2015-10-26 09:09:38 +01:00
f303148ee9
Use of checkers on docker_cli_config_test.go.
...
Signed-off-by: liaoqingwei <liaoqingwei@huawei.com >
Upstream-commit: d1ed5f62adadac202e34d11d513a9c7bc946ab27
Component: engine
2015-10-26 10:51:12 +08:00
d4226455f9
Use checker assert for integration-cli/docker_cli_cp_* four files.
...
Signed-off-by: Jian Zhang <zhangjian.fnst@cn.fujitsu.com >
Upstream-commit: f26a31e80cfcc77daba0872ddb14bf03f4398311
Component: engine
2015-10-26 10:22:28 +08:00
2e3f8e6b23
use of checkers on docker_cli_exec_test.go
...
Signed-off-by: weiyan <weiyan3@huawei.com >
Upstream-commit: 9120a1fc3ef929b18200b4f315bb7147889a0c36
Component: engine
2015-10-26 10:01:48 +08:00
d8b43fba9e
Merge pull request #17189 from maaquib/16756-integration-cli-unix-events-test
...
Using checkers assert for integration-cli/docker_cli_events_unix_test.go
Upstream-commit: 75128c46c7881325c87de8797b455534558784ed
Component: engine
2015-10-25 20:39:32 -04:00
e52c395265
Prevent user from deleting pre-defined networks
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: ead62b59522bba132b9a14712e4350439e7fa2a5
Component: engine
2015-10-25 17:17:29 -07:00
e999854115
Merge pull request #17332 from askb/17225_flakytest_TestExecEnv
...
Fix for the issue #17225 flaky test DockerSuite.TestExecEnv test case.
Upstream-commit: c71e97fc122d82c4bd99e47b38000d216bf360f2
Component: engine
2015-10-25 21:17:50 +01:00
b01426a7bc
Fix for #17243 DockerSuite.TestExecAfterContainerRestart.
...
Added waitRun(containerID) statement after docker run -d and docker restart
to ensure the container is restarted before issuing a exec cmd.
Signed-off-by: Anil Belur <askb23@gmail.com >
Upstream-commit: 2a5f04dcc900888ff706e36e6360d0b51d82bed1
Component: engine
2015-10-25 21:43:31 +05:30
107977a6ca
Merge pull request #17325 from aboch/d0
...
Disable built-in SD on default bridge network
Upstream-commit: 271f85afac94b224a8e2d4dd99936bafba18a473
Component: engine
2015-10-25 11:04:27 -04:00
f0a3d33be3
Integration test: bridge ip is excluded from the allocator pool
...
Signed-off-by: Federico Gimenez <fgimenez@coit.es >
Upstream-commit: e8da75d4a1f048bc449e225dd833d7d74cf69352
Component: engine
2015-10-25 09:36:38 +01:00
082dcadcb4
Fix for the issue #17225 flaky test DockerSuite.TestExecEnv test case.
...
This is done by calling waitRun() followed by the docker run, which ensures the container is loaded
before calling docker exec to obtain the env variable set previously.
Incorporated the change as suggeted by duglin.
Signed-off-by: Anil Belur <askb23@gmail.com >
Upstream-commit: 6d974ec19d2f484586ec57c2e2455a6de927cddf
Component: engine
2015-10-24 22:54:24 +05:30
ca2f6a1a48
Use of checkers on docker_cli_history_test.go
...
Signed-off-by: James Carey <jecarey@us.ibm.com >
Upstream-commit: 04b6b0b47fab7751b716b0b6c8ce3b98a8c51e99
Component: engine
2015-10-23 22:32:56 -05:00
213dc33b1a
Disable built-in SD on docker0 network
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: be1c77595eed1d9b22511faf64783e4c65f40c61
Component: engine
2015-10-23 19:46:28 -07:00
b872eb980f
integration-cli test for active container rename and reuse
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Signed-off-by: Santhosh Manohar <santhosh@docker.com >
Upstream-commit: 3b16a8c91c77cbae99b04d641ae73693780f52ca
Component: engine
2015-10-23 16:26:24 -07:00
