42096e6c34
Merge pull request #12939 from draghuram/history_test
...
Adding test for "GET /images/(name)/history" API.
Upstream-commit: 24bd3db0b5c3368968830f775546ccd03c86c380
Component: engine
2015-05-04 12:58:43 -04:00
a0ae4df58b
Use git url fragment to specify reference and dir context.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 49fd83a25e2e6604014de41d4f4099a7bc07a09b
Component: engine
2015-05-04 09:28:06 -07:00
9531505238
Allow pulling stats once and disconnecting.
...
Adds a `stream` query param to the stats API which allows API users to
only collect one stats entry and disconnect instead of keeping the
connection alive to stream more stats.
Also adds a `--no-stream` flag to `docker stats` which does the same
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: f3023a93d1a0a96a7312de441a550c758ac0c17d
Component: engine
2015-05-04 10:49:13 -04:00
12b77cedd1
Verifiy status Codes 404 when no such image
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
Upstream-commit: 9eefd2c17dd5813f6d471b08473a79c65e235450
Component: engine
2015-05-04 15:39:40 +08:00
66f3f4a759
Adding test for "GET /images/(name)/history" API.
...
Closes #12284 .
Signed-off-by: Raghuram Devarakonda <draghuram@gmail.com >
Upstream-commit: aaaa8bab0cad495c842580e35322bee8e73de08f
Component: engine
2015-05-02 23:09:32 -04:00
7bd38d02c2
Finally remove our copy of "archive/tar" now that Go 1.4 is the minimum!
...
IT'S ABOUT TIME. 🎉
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: 576985a1dcd76a9af2c5c483e6f12035a1f47b96
Component: engine
2015-05-01 16:01:10 -06:00
9893237498
Merge pull request #12720 from DarianAnjuhal/fix-ensure-dockerinit
...
TestDiffEnsureDockerinitFilesAreIgnored is too long
Upstream-commit: 1f2f3db1e34a72f4b739ce3654fcca7dbe427282
Component: engine
2015-05-01 14:52:34 -07:00
fd5203244a
Fix TestApiImagesDelete for --net none build
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 5c86f311c88fafe87e08e58e2cd083fba127f95a
Component: engine
2015-04-30 20:49:28 +02:00
203abf3991
Merge pull request #12771 from runcom/say-bye-to-engine
...
Remove engine
Upstream-commit: 0d0b42547e74e183c7c459a13877bd27c21dba0c
Component: engine
2015-04-30 12:18:16 -04:00
5b60c778bd
Merge pull request #12837 from mavenugo/integ
...
A few more Integration tests to test Networking related daemon flags
Upstream-commit: 1eb4e96f2125764a38114c7cdcdf2b336b6173f7
Component: engine
2015-04-30 11:12:43 -04:00
17d88307f9
sort ports mapping before allocating
...
prioritize the ports with static mapping before dynamic mapping. This removes
the port conflicts when we allocate static port in the reserved range
together with dynamic ones.
When static port is allocated first, Docker will skip those when determining
free ports for dynamic ones.
Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com >
Upstream-commit: cd2b019214eb1978ae267786668dc7a8a3702679
Component: engine
2015-04-30 02:18:04 +00:00
0ec0dcde9e
Remove integration tests and port them to integration-cli
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: f7e417ea5e26f11ec43dba64ee153765d2276f40
Component: engine
2015-04-30 01:35:16 +02:00
4d11977943
Merge branch 'master' of github.com:docker/docker into kill
...
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
Upstream-commit: d0a4f310efb39f8817f08fef3604d653a9da2bb8
Component: engine
2015-04-29 15:06:47 -04:00
9d5c96c875
Moved explicit cleanups into defered action
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 1c073ec1766e0f3cfe28d8f9c2e9a9a37154ece6
Component: engine
2015-04-29 11:41:13 -07:00
0976611d84
Integration Tests for --icc=false & container Linking using --expose
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: dd0666e64f17329355c77aae1a2ac0fe2fe43402
Component: engine
2015-04-29 10:16:31 -07:00
febe54901d
Integration tests for --ip daemon option
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: ba11929ebdf4cf7798cddc98c4dcfc000b154264
Component: engine
2015-04-29 09:55:49 -07:00
73bcda784f
Integration tests for --fixed-cidr daemon config
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 0e254411b1fe0b5024d4a8e5ade7ce12f4545d8e
Component: engine
2015-04-29 09:55:42 -07:00
e04b055914
Integration tests for --bip daemon flag
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 9c325c3f54b24621b76dee530a855b37cb22abcc
Component: engine
2015-04-29 09:55:34 -07:00
2a71cc5aaf
Integration tests for --bridge daemon flag
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: f3f5ff9d837eecb97eeeb878f0bd416b6ab57cf2
Component: engine
2015-04-29 09:55:25 -07:00
6982f607b4
c.Fatal won't fail and exit test inside a goroutine, errors should be handled outside with a channel
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 4203230cbbf46238e38099c9073bdcad5f69a63f
Component: engine
2015-04-29 17:02:22 +02:00
53d8f39607
Remove use of "DEBUG" env var from CLI and decouple DEBUG from --log-level
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 534ed8c2d4573e88fcb68b23341504f8949b34b5
Component: engine
2015-04-29 06:20:33 -07:00
d550f6b9ae
Merge pull request #12789 from LK4D4/daemon_suite
...
Implement daemon suite for integration-cli
Upstream-commit: f80300e9cf150f9770c8ffce94a4d57acac6aadc
Component: engine
2015-04-28 15:30:36 -07:00
f4e54f0df1
Merge pull request #12820 from runcom/yet-another-sockRequest-refactor
...
Expose whole Response struct in sockRequestRaw
Upstream-commit: cfa3a080c646878414585a8931416538a703a3e0
Component: engine
2015-04-28 13:26:30 -07:00
bc3d7f1531
add support for exclusion rules in dockerignore
...
Signed-off-by: Dave Goodchild <buddhamagnet@gmail.com >
Upstream-commit: 6fd8e485c85c4f8ca62578d0840bdeddc4cba151
Component: engine
2015-04-28 18:56:45 +01:00
741aa30caf
Fix for Daemon crashing when wildcards are used for COPY/ADD
...
in the filename and the command itself
Closes #12267
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 82daa43844556953101b201bc5983aed4fbe6233
Component: engine
2015-04-27 19:09:57 -07:00
5f37bbe0bd
Implement daemon suite for integration-cli
...
For creating and stopping test daemons automatically.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 57464c32b99b36a2963fb37da86b9870c9a56145
Component: engine
2015-04-27 15:48:29 -07:00
0b5b481a6d
Merge pull request #12828 from tdmackey/trivial-spelling
...
trivial: typo cleanup
Upstream-commit: 0153edcda1527cd19f5952046b51c4e8358d01ed
Component: engine
2015-04-27 17:05:46 -04:00
72bf48b9df
Merge pull request #12794 from runcom/small-cleaning
...
Small if err cleaning
Upstream-commit: 62a85fe2026f3f5114f19638baf53d19a51d39c0
Component: engine
2015-04-27 17:02:27 -04:00
ae74d9f34f
trivial: typo cleanup
...
Signed-off-by: David Mackey <tdmackey@booleanhaiku.com >
Upstream-commit: 3941623fbc3fa724d61f53121513ffd87d03b61c
Component: engine
2015-04-27 13:35:08 -07:00
6b34bbbde8
fixed TestDiffEnsureDockerinitFilesAreIgnored is too long #12672
...
Signed-off-by: Daniel Antlinger <d.antlinger@gmx.at >
Upstream-commit: 50868b2c575c26492f4c49a79d2f3b51ec68a229
Component: engine
2015-04-27 13:24:15 -07:00
954f940156
Small if err cleaning
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 844538142d95c1b7dda1bb2903179510105fe9b5
Component: engine
2015-04-27 21:50:33 +02:00
6143f43f8d
Parallelize TestEventsLimit
...
Signed-off-by: Lorenzo Fontana <fontanalorenzo@me.com >
Upstream-commit: 40779b28bb04dca6178ba17eaeb93265e2974ee1
Component: engine
2015-04-27 21:14:00 +02:00
d1facd32fc
Expose whole Response struct in sockRequestRaw
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: bb1c576eb3024f7fb4242d76dc835b7c4dd85c5b
Component: engine
2015-04-27 18:49:00 +02:00
563a5f77d4
Merge pull request #12809 from runcom/remove-cfatal-goroutine-attachws
...
Remove c.Fatal from goroutine in TestGetContainersAttachWebsocket
Upstream-commit: 5305e675b554a7451433bbd64bca4d6f3070a45b
Component: engine
2015-04-27 08:59:47 -07:00
4342c93053
Merge pull request #12799 from aidanhs/aphs-fix-net-container-deadlock
...
Prevent deadlock on --net=container:<self>
Upstream-commit: 02d73d910fa56e89a2d999b95b0fa0738332fed7
Component: engine
2015-04-27 08:46:22 -07:00
5e258c2907
Merge pull request #12783 from duglin/Issue12763-LinkedEnvs
...
A fix for = in env values in linked containers
Upstream-commit: 8dc07af52f1822a1d337f005c6c4292611d3313d
Component: engine
2015-04-27 10:50:14 -04:00
55c6259a4a
Merge pull request #12616 from cpuguy83/remove_uneeded_sleeps
...
remove some uneeded sleeps in tests
Upstream-commit: 325c0404c84db11630cfcc24ac93cb82763de511
Component: engine
2015-04-27 10:42:40 -04:00
bb3c396980
remove some uneeded sleeps in tests
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 9e0ffae864d6679084e84e2e27cbb9d350f6dbae
Component: engine
2015-04-27 10:14:29 -04:00
270e43ec62
Prevent deadlock on attempt to use own net
...
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net >
Upstream-commit: f30d1c1835618eadea5d0a68d1301dffd9f09b22
Component: engine
2015-04-27 14:57:37 +01:00
e570165119
Remove c.Fatal from goroutine in TestGetContainersAttachWebsocket
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: c7b2632dc8550c8aa80ebd8b229809ac37fa53e1
Component: engine
2015-04-27 13:56:55 +02:00
13d6b715bf
Merge pull request #12728 from HuKeping/addtest
...
Add test for REST API container rename
Upstream-commit: fefb8367663e5f97f8c85418691b10c6e9356134
Component: engine
2015-04-25 17:01:10 -07:00
04f8bd2003
Migrate integration test to new method
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com >
Upstream-commit: 9dbe12b792a46538c01862930c85ace18dbe14f3
Component: engine
2015-04-25 17:12:01 -04:00
0a0035ed72
Add dep to test
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com >
Upstream-commit: 65aba0c9d6a72fc89f87c328e9ca21e20bf3cf7a
Component: engine
2015-04-25 15:25:52 -04:00
2f02e8950c
Fix gofmt
...
Mischevious comma is mischevious
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com >
Upstream-commit: f039c699a40397b71f05838e9a9c67100ae474c6
Component: engine
2015-04-25 15:25:52 -04:00
43c42369ac
Add test for cgroup parent flag for build
...
Signed-off-by: Marianna <mtesselh@gmail.com >
Upstream-commit: f40dd69c97a5a3797f07d52fe5f76e296ef629dc
Component: engine
2015-04-25 15:25:52 -04:00
478eada080
Fix race condition in API commit test
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: cd4f507b42e800d148b211ca2c780d01192a9041
Component: engine
2015-04-25 05:46:47 -07:00
1e118310a9
A fix for = in env values in linked containers
...
Closes : #12763
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: bc149be69c5ad22f82269427dd4b4aed9df4fa40
Component: engine
2015-04-25 04:42:43 -07:00
e384b42fa8
Add test for REST API container rename
...
Signed-off-by: Hu Keping <hukeping@huawei.com >
Upstream-commit: 8f752ffeafd2f8c08035a5e39220fe17c9309fd7
Component: engine
2015-04-25 17:19:57 +08:00
8d345fadf2
Merge pull request #12765 from LK4D4/registry_suite
...
Implement DockerRegistrySuite in integration-cli
Upstream-commit: 6e9a6f53963137e21ba790ab79501a7cd8ed5b96
Component: engine
2015-04-24 23:05:29 -04:00
a2a6303a84
Implement DockerRegistrySuite in integration-cli
...
To avoid manually creating and destroying registrys in tests.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: f696b1071a296bee1f4ac7cafa807ce337fb9f2c
Component: engine
2015-04-24 14:17:00 -07:00
