78c9a12642
Merge pull request #20011 from Microsoft/MinimalBaseImage
...
Move base image selection to a utility function
Upstream-commit: d4c8d0519d2e521fd8b364d7231973455963e0ba
Component: engine
2016-02-04 18:06:30 -08:00
dc25bc1e26
Merge pull request #20005 from Microsoft/jjh/testrunrestartmaxretries
...
Windows CI: Up timeout TestRunRestartMaxRetries
Upstream-commit: 2da5ad3bb0fb553112751a683ac861ab8fd5b8e2
Component: engine
2016-02-04 16:07:42 -08:00
495762f74d
Move base image selection to a utility function
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: 96c522162634ff4d5e55ddf2ff841921a99b7b09
Component: engine
2016-02-04 15:06:34 -08:00
36dd8337c1
Merge pull request #19357 from chenchun/internal
...
Display `internal` flag on `network inspect`
Upstream-commit: 18204ea61690797930efcf2d0a638961664ba0df
Component: engine
2016-02-04 16:31:12 -05:00
9a586d64c2
Merge pull request #19984 from calavera/vendor_engine_api_master
...
Vendor engine-api with client context changes.
Upstream-commit: da58ee42bb1d4e17c5b525d161f29ad8efc0569e
Component: engine
2016-02-04 16:20:06 -05:00
1262ec37e1
Windows CI: Up timeout TestRunRestartMaxRetries
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 4a2122e020f2f4637b2a32e1ba2bfa3511988f8f
Component: engine
2016-02-04 11:59:13 -08:00
32fac24f32
Apply context changes to the client.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: fe53be4e1785ab4d8cadf246e5f2de419f337adc
Component: engine
2016-02-04 13:59:57 -05:00
d572e76048
Merge pull request #19994 from runcom/fix-test-for-19936
...
integration-cli: fix minimum and default api version test
Upstream-commit: 3329c94e256d7816ec20edb215d5c3614504e403
Component: engine
2016-02-04 08:33:07 -08:00
25898f320a
Remove stray printf
...
This came in with the Windows CI work and I assume was meant for local
debug, but adds a bare printf line to the test output.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
Upstream-commit: 77590d4dae9223ccd8edf9b153c669f631747f24
Component: engine
2016-02-04 10:13:31 -05:00
83fc309845
integration-cli: fix minimum and default api version test
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: fe6b88e3fa12810b2eaad45c613742c1eeb7290e
Component: engine
2016-02-04 13:58:08 +01:00
76c413d163
Merge pull request #19949 from Microsoft/jjh/testapiresize
...
Windows CI: Port docker_api_resize_test.go
Upstream-commit: 38e774d32caf29155d27aad4fad964b082246a73
Component: engine
2016-02-04 10:11:32 +01:00
e109e016c1
Display internal flag on network inspect
...
Also adds internal network tests for bridge network
Signed-off-by: Chun Chen <ramichen@tencent.com >
Upstream-commit: c199506b59f60ac456cb0448ddd86e6dec92bc0a
Component: engine
2016-02-04 15:28:37 +08:00
96b7f387ba
Windows CI: Port docker_api_resize_test.go
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 4080ce35e0ffec4703c04e8d9fa0e2def41fddfe
Component: engine
2016-02-03 20:30:06 -08:00
9044b5c3c7
Merge pull request #19979 from mavenugo/gccgoci
...
Use waitRun in TestDockerNetworkHostModeUngracefulDaemonRestart
Upstream-commit: f0a58947abceb524044d7aa88aeae61523c0bc9b
Component: engine
2016-02-03 20:33:52 -05:00
8ebdd00a4c
Use waitRun in TestDockerNetworkHostModeUngracefulDaemonRestart
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 76a765140e831bdd5b7139b86db001ec6872023a
Component: engine
2016-02-03 14:44:55 -08:00
e930e772f5
Merge pull request #19942 from LK4D4/fix_vet_errors
...
Fix minor vet warnings
Upstream-commit: fdcce4ac0302729be91ff9de670fdb5be1c50b58
Component: engine
2016-02-03 13:31:11 -08:00
3f8eca9ec3
Merge pull request #19943 from aboch/ec
...
Store endpoint config on network connect to a stopped container
Upstream-commit: 3b80b1947c0f7ac879c4fdf5d6f50e5e3e97d07e
Component: engine
2016-02-03 11:06:35 -08:00
5649ae9668
Merge pull request #19959 from WeiZhang555/fix-cli-print-err
...
Remove redundant error message
Upstream-commit: 28a7577a029780e4533faf3d057ec9f6c7a10948
Component: engine
2016-02-03 10:56:19 -08:00
7eab87efde
Fix minor vet warnings
...
Also use Asserts where it's possible.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 7a20a270bc7ce34c9a6f7cc9eebb38c0bb332b7f
Component: engine
2016-02-03 10:43:01 -08:00
3e36908d7b
Add a getPrefixAndSlashFromDaemonPlatform …
...
… to limit code duplication in integration tests :P
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 382c96ee7b02f393e7515e4cc4882738398b86a6
Component: engine
2016-02-03 15:16:00 +01:00
7f7ec57612
Merge pull request #19948 from Microsoft/jjh/testclirm
...
Windows CI: Port docker_cli_rm_test.go
Upstream-commit: bc082033147418c9d2b45dad104f84e8a6d29ae9
Component: engine
2016-02-03 15:05:21 +01:00
e9b0659a70
Merge pull request #19947 from Microsoft/jjh/testclistart
...
Windows CI: Port docker_cli_start_test.go
Upstream-commit: 0736dba624e616d8b8af26f03ea1a438535e8dc1
Component: engine
2016-02-03 13:40:55 +01:00
5f2192d684
Merge pull request #19946 from Microsoft/jjh/stats
...
Windows: Turn off stats
Upstream-commit: 4ef06e9ef18e7538c71818175d3228ba65c00b64
Component: engine
2016-02-03 09:28:25 +01:00
68f96de053
Remove redundant error message
...
Currently some commands including `kill`, `pause`, `restart`, `rm`,
`rmi`, `stop`, `unpause`, `udpate`, `wait` will print a lot of error
message on client side, with a lot of redundant messages, this commit is
trying to remove the unuseful and redundant information for user.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: 894266c1bbdfeb53bf278f3cb762945bac69e592
Component: engine
2016-02-03 15:45:20 +08:00
298796a142
Disable flakey TestClientSetsTLSServerName
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 6b8341a2d529ff6489e77ef6d496a2054af31cd5
Component: engine
2016-02-02 19:56:31 -08:00
cc8995d14c
Windows CI: Port docker_cli_rm_test.go
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 07fd173225408342de76f749c2a5bccadec32d3a
Component: engine
2016-02-02 18:43:50 -08:00
40c9bed676
Windows CI: Port docker_cli_start_test.go
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: b47749102d8bfde1ec6f87b2cd291b8f45146b67
Component: engine
2016-02-02 18:23:29 -08:00
cf751d8144
Windows: Turn off stats
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 55268f4e9158738631f04e7e4becf39c9043b60a
Component: engine
2016-02-02 17:59:11 -08:00
2a82c3d7ca
Merge pull request #19939 from Microsoft/jjh/testcreate
...
Windows CI: TestCreate* porting
Upstream-commit: 6f88a3d7d3f51c643667f437539ed75ad569688c
Component: engine
2016-02-02 17:48:43 -08:00
2b5317f067
Store endpoint config on network connect to a stopped container
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 9b63e4e7f5a02efa89d8bc91e1cb5e4cada60093
Component: engine
2016-02-02 17:25:44 -08:00
d2d1dc51de
Merge pull request #19761 from HackToday/enhancesortattr
...
Sort the attributes for events
Upstream-commit: 1bc4c99372fa458c70eeb411575a1c538912521d
Component: engine
2016-02-02 16:08:23 -08:00
c3a476e4f1
Windows CI: TestCreate* porting
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 5e3fdd3c20900b5db5895fee85f5ff11744a9bea
Component: engine
2016-02-02 16:00:39 -08:00
151776465a
Merge pull request #19901 from calavera/debug_cli_tests
...
Always show debug information in the info output
Upstream-commit: 85a32baa3be8a5f2e9dd5262e03726fe9d4d52b3
Component: engine
2016-02-02 15:56:55 -08:00
9615203fd9
Merge pull request #19915 from wenchma/add_net_bind_test
...
Add integration test for network host bind option
Upstream-commit: 5ba3edd4862a3308ff4863d4aef049159b4d31c8
Component: engine
2016-02-02 15:34:13 -08:00
fd18daf360
Merge pull request #19800 from wenchma/19425-TestApiStatsNetworkStats
...
Optimize TestApiStatsNetworkStats and TestApiStatsNetworkStatsVersioning
Upstream-commit: 01cc315322597a00b3f82da140d922a6ebc5b7b3
Component: engine
2016-02-02 14:56:51 -08:00
46e42d4581
Add regression tests for client debug flag.
...
- Add client debug info to the `docker info` command.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 9f315dd328a33b51133a41067a508a8b59166a39
Component: engine
2016-02-02 16:57:36 -05:00
5f147f683f
Merge pull request #19868 from HackToday/fixwindows
...
Fix windows CI test
Upstream-commit: f830cec78a03ab7e6dba48afff261c2e8ed0788d
Component: engine
2016-02-02 19:58:29 +01:00
fbdea5f61d
Merge pull request #18605 from fgimenez/9969-add-sni-support
...
Added cli SNI integration test
Upstream-commit: 7abc7b383c8f37812db85fd9e4020c2ce6f30f32
Component: engine
2016-02-02 10:12:44 -08:00
ed5a9b6268
Add integration test for network host bind option
...
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com >
Upstream-commit: 4f1d876e4c6907154e0dbb52fcc1ecc2643c6915
Component: engine
2016-02-02 18:01:04 +08:00
fc2f331561
Merge pull request #19822 from Microsoft/jjh/testexeccli
...
Windows CI: Initial porting CLI TestExec*
Upstream-commit: 5cdc0dfce3b058874566721b1f111baaa19df18b
Component: engine
2016-02-02 08:32:28 +01:00
9de80c7080
Fix windows CI test
...
The windows CI is not clean in some tests, this try address that.
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com >
Upstream-commit: 7ed10d4a4cc724fe6ce3f623051546710a18a3b6
Component: engine
2016-02-02 04:54:14 +00:00
eb79a73a95
Merge pull request #19889 from Microsoft/jjh/reliabilitytake2
...
Windows CI: TP4 reliability hack
Upstream-commit: a39ad952ec1efc3b7536d3d8a93e96a22cd1818b
Component: engine
2016-02-01 22:30:51 -05:00
e2603dbc62
Windows CI: TP4 reliability hack
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 2ebcb48cf1b4f883260b62f687e2c54926749b68
Component: engine
2016-02-01 18:02:57 -08:00
fd11be5874
Add test to make sure raw logs are properly activated.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 898599171e2f36a1cf36a2eea31d82a226acd802
Component: engine
2016-02-01 16:52:31 -05:00
810a289a07
Merge pull request #19570 from WeiZhang555/18679-flaky-test
...
Fix flaky test `TestGetContainerStatsRmRunning`
Upstream-commit: a898478a795f3839b67ff119922bd0ba7d091a7e
Component: engine
2016-02-01 13:15:20 -08:00
f0d917c642
Merge pull request #19725 from WeiZhang555/opt-TestRunSeccompDefaultProfile
...
Optimize `TestRunSeccompDefaultProfile`
Upstream-commit: c28bba04601c153af5d8f70dd500e7247157b835
Component: engine
2016-02-01 16:01:51 -05:00
6337f0e1f4
Merge pull request #19708 from wenchma/19425-TestDaemonCorruptedLogDriverAddress
...
Optimize slow bottleneck tests of TestDaemonCorruptedLogDriverAddress
Upstream-commit: 0c620d62c2a538ae61af7dde33e013f095fe0686
Component: engine
2016-02-01 12:59:37 -08:00
65eec6c5ac
Merge pull request #19885 from tophj-ibm/fix-integration-cli-suite-requirements
...
Fix integration-cli suite setup requirements
Upstream-commit: c19c08b97af613928bce1253e438e3c097ade7df
Component: engine
2016-02-01 11:13:39 -08:00
cb0539b747
Windows CI: Initial porting CLI TestExec*
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: a9379b4af227f1966b71ee255fc8bcf272ffe43c
Component: engine
2016-02-01 10:19:21 -08:00
f274470025
Merge pull request #19695 from Microsoft/10662-TestBuildCI2
...
Second set of enabling TestBuild CI for Windows
Upstream-commit: c2d6831fc498383be0ba9e555e3ab3139b844bb9
Component: engine
2016-02-01 16:29:52 +01:00
