265055473c
Support downloading remote tarball contexts in builder jobs.
...
Signed-off-by: Moysés Borges <moysesb@gmail.com >
Upstream-commit: d48bface59ef28aedc692c1f7c51a7ddde94a7fe
Component: engine
2015-06-19 16:35:00 -03:00
4c8d2626b0
register libnetwork API and UI with docker parent chain
...
This commit also brings in the ability to specify a default network and its
corresponding driver as daemon flags. This helps in existing clients to
make use of newer networking features provided by libnetwork.
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: da5a3e6dee80f1f5d4059851e4762ffb0484f7e9
Component: engine
2015-06-18 12:07:58 -07:00
f2616f1d40
Replace "sleep" by "top" in test implementation
...
Eliminate any chance of race condition by replacing a call to sleep by a
call to top, and rely on test cleanup logic to have it exit cleanly.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: e5b7f61f090bfc951590dd5dad3f6bb1ce3888ba
Component: engine
2015-06-12 10:45:42 -07:00
1bda4f96e2
Set omitempty for IP and PublicPort to conform w/ API 1.18
...
Signed-off-by: Darren Shepherd <darren@rancher.com >
Upstream-commit: 09de92b891c15bda593cf47617f032d2b0b40605
Component: engine
2015-06-12 09:49:53 -07:00
6aab6b5654
Avoid nil pointer dereference while creating a container with an empty Config
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
Upstream-commit: 4ce817796e639391f6bc3e338f5a88985daacaca
Component: engine
2015-06-06 20:07:32 +02:00
e28afd6060
SizeRW & SizeRootFs omitted if empty in /container/json call
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
Upstream-commit: 6945ac2d02adbe2931c9e8756ecbb7496b43081a
Component: engine
2015-06-03 23:13:56 +02:00
90d04ee342
Do not omit empty json field in /containers/json api response
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
Upstream-commit: 725f34151c5f86b0b50f6e5601223e6da194af1b
Component: engine
2015-06-03 18:53:40 +02:00
77c76a3170
Update api documentation to add labels in commit
...
It is already possible to set labels at commit when using the API. But
it is not present in the API documentation. Added an integration test
too, to validate this work (and will be in the future).
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: c61fa8471a567b4890e0861f8aaff91a68c42e4f
Component: engine
2015-05-30 11:31:51 +02:00
4f53f1bb13
Merge pull request #13425 from runcom/13421-stats-default-stream
...
Fix regression in stats API endpoint
Upstream-commit: 4389fc8bf975a5df567c8431dda82d19a09733a3
Component: engine
2015-05-29 15:05:21 -07:00
2b62e414ad
Fix regression in stats API endpoint where stream query param default is true
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: ec97f414657189f2ce95d6b5bda26aa9d206b705
Component: engine
2015-05-29 22:38:36 +02:00
6226136075
Remove PortSpecs from Config
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 15134a3320fbacee36e86a0342e7ffb49285f297
Component: engine
2015-05-29 22:38:09 +02:00
49dc08b2f2
Fix unregister stats on when rm running container
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: b3e8ab3021d2021202e14b912e7fdbfede4c7c20
Component: engine
2015-05-26 22:22:03 -04:00
89782c55eb
Volumes refactor and external plugin implementation.
...
Signed by all authors:
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Signed-off-by: David Calavera <david.calavera@gmail.com >
Signed-off-by: Jeff Lindsay <progrium@gmail.com >
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Signed-off-by: Luke Marsden <luke@clusterhq.com >
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 81fa9feb0cdc0773eff99d7393c16271e84aac08
Component: engine
2015-05-21 20:34:17 -07:00
56af424158
TestCase for CpuShares and Cpuset
...
Signed-off-by: Rajdeep Dua <dua_rajdeep@yahoo.com >
Upstream-commit: ebe344d34b9d708b3634c2e17929cae1abb61ae8
Component: engine
2015-05-20 11:32:48 -07:00
7a2a7a58a0
Modified Test Case to include check for Memory and MemorySwap
...
Signed-off-by: Rajdeep Dua <dua_rajdeep@yahoo.com >
Upstream-commit: 1eea2c589da4a4a3f5bfb83f6acf54af83ff4533
Component: engine
2015-05-13 13:39:07 -07:00
217a680718
Test Cases for API - Container create with Hostname, DomainName and NetworkMode
...
Signed-off-by: Rajdeep Dua <dua_rajdeep@yahoo.com >
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 80d73c838a279a3354713b56687e0c3f90c1efff
Component: engine
2015-05-07 21:03:39 +02:00
b9064ad316
Merge pull request #12822 from brahmaroutu/container_stop_api
...
restapi stop fails if ?t=int not present
Upstream-commit: d78755d15972fd1d3115d9927932f82bc09483df
Component: engine
2015-05-07 09:38:59 -07:00
e580063058
Restapi for stop fails if ?t=int not present
...
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: 68e9c07850c95ded1e0a8adda39a8efe68e1c0ee
Component: engine
2015-05-07 15:43:50 +00:00
e90b34218e
Do not check and return strconv.Atoi error in api container restart, regression
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 74121a42118750e560e772a3fee33e9d7bd903d0
Component: engine
2015-05-07 01:49:16 +02:00
61793a6050
Move ChunkedEncoding from integration
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 7c574b9e9d62f14c8d73ea358a557a771dcd8d4d
Component: engine
2015-05-06 13:00:17 -04:00
0f648e8ecd
Add tests for API container delete
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 8771cafab65e50d09d3590a7f22758e919b78fe4
Component: engine
2015-05-04 22:41:57 +02: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
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
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
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
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
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
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
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
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
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
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
c48fdf0abd
Implement teardown removeAllImages
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: a9688cdca5577d6db65d76f38bcbe4c1e6f5994f
Component: engine
2015-04-24 10:37:21 -07:00
74db1507f9
Fixing statusCode checks for sockRequest
...
Signed-off-by: Megan Kostick <mkostick@us.ibm.com >
Upstream-commit: c7845e27ee2b0462b01d043caeb771f21d5e4ac7
Component: engine
2015-04-23 15:35:56 -07:00
1c64e12359
Merge pull request #11839 from brahmaroutu/template_11641
...
Allow go template to work properly with inspect …
Upstream-commit: 799cf056e7f672f987b0b44adf0868ce56caab8b
Component: engine
2015-04-23 13:07:40 -07:00
38989f71ca
Merge pull request #12690 from rajdeepd/dry-run-test
...
Container API Test with HostName
Upstream-commit: 03e77e5c8fe90ee7620f2198d140eca7bed23ab8
Component: engine
2015-04-23 11:32:47 -07:00
68210d0ad0
Merge pull request #12692 from cpuguy83/fix_commit_test
...
Fix race with TestContainerApiCommit
Upstream-commit: 59acccb6f2dae4659797636196dfde7263789923
Component: engine
2015-04-23 11:31:27 -07:00
12be8c3158
Allow go template to work properly with inspect
...
Closes #11641
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: 231d362db73310a5243a72dcdb6df2df57c74488
Component: engine
2015-04-23 18:25:18 +00:00
dd4b0467ca
Remove deleteAllContainers call in test
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: ee7a7b07e752c56bbe1b941feb1e4313275d68c2
Component: engine
2015-04-23 16:32:50 +02:00
407d8746a2
TestCase added for Container Create with HostName
...
Signed-off-by: Rajdeep Dua <dua_rajdeep@yahoo.com >
Upstream-commit: fca4aea077f1960a0cdd0056477730b3f8e0ca38
Component: engine
2015-04-23 06:53:34 -07:00
a10a6cc648
Fix race with TestContainerApiCommit
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 563708d78d42afe89374d5819fdb671ed72c2dad
Component: engine
2015-04-23 09:45:06 -04:00
1884ef3b9b
Use suite for integration-cli
...
It prints test name and duration for each test.
Also performs deleteAllContainers after each test.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: dc944ea7e48d11a2906e751d3e61daf08faee054
Component: engine
2015-04-21 10:28:52 -07:00
97fb2745d9
Port test from integration tests
...
Addresses #12255
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: 1a35b16b08ef5a8b0764e5a383f36d5572f20dfe
Component: engine
2015-04-20 17:57:53 +00:00
5e15f55a29
Removed unnecessary error output from dockerCmd
...
Changed method declaration. Fixed all calls to dockerCmd
method to reflect the change.
resolves #12355
Signed-off-by: bobby abbott <ttobbaybbob@gmail.com >
Upstream-commit: 621b601b3c602aab5ef0f07903fdf413881bb261
Component: engine
2015-04-17 09:11:14 -07:00
b5835957f0
Move TestPostCreateNull to integration-cli
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 308a23021d65282cdf471ef0708ba5998b48c247
Component: engine
2015-04-16 13:49:46 -04:00
6688a2d031
Move TestPostJsonVerify to integration-cli
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 5dc02a2fa8819b3a61bcd5a6fedcfb1a5e64cba5
Component: engine
2015-04-16 13:49:28 -04:00
3cb6dbb528
Move TestContainerApiCreate to integration-cli
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 23fa7d41d5510131cdf7883a930087ac4fb34187
Component: engine
2015-04-16 13:49:10 -04:00
9e85fe7e11
Move TestPostCommit to integration-cli
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: f19061ccfd526487391f7677bef7e1b38694d06a
Component: engine
2015-04-16 13:48:54 -04:00
51eea9357f
Move TestGetContainersTop to integration-cli
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: d9e4b14346c6a93bee8c24803a8538dc2d74911d
Component: engine
2015-04-16 13:48:33 -04:00
c48f58ea6d
Make sockRequestRaw return reader, not []byte
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 8232cc777e329a47e123dbdc42411dae65288a80
Component: engine
2015-04-16 13:40:49 -04:00
