Commit Graph

21804 Commits

Author SHA1 Message Date
e1cbc10ddf Merge pull request #12363 from ahmetalpbalkan/integ-cli/use-sockRequest-statuscode
integ-cli: Use status code from sockRequest (fix #12335)
Upstream-commit: 8f0b63925ebf71c8b6f755e3b2d35bcdc7c92205
Component: engine
2015-04-14 09:38:10 -07:00
1375a98c5e change go tools to use certain commit
Signed-off-by: Jessica Frazelle <jess@docker.com>
Upstream-commit: 736824ccc134a90740c2ae95034b4c5c506594c7
Component: engine
2015-04-14 09:32:23 -07:00
325400d97c Use local variable err instead of a outer one
Signed-off-by: Hu Keping <hukeping@huawei.com>
Upstream-commit: a0804e8e118510dc49e7e74273a323e99c097a3d
Component: engine
2015-04-15 00:29:53 +08:00
8b7d236741 Fix vet warning in archive.go
Signed-off-by: Megan Kostick <mkostick@us.ibm.com>
Upstream-commit: fc20658a01e362a5bb484b439a0a1004c51f9ff5
Component: engine
2015-04-14 09:13:50 -07:00
07f1e1bf7b Merge pull request #11992 from runcom/11923-refactor-utils-utils
Refactor utils/utils, fixes #11923
Upstream-commit: fe53c277857ba77caf9189b1d6d095835c1b792c
Component: engine
2015-04-14 12:01:23 -04:00
c1570d1a97 Merge pull request #11980 from sunyuan3/TestSearchCmdOptions
add TestSearchCmdOptions case
Upstream-commit: 5019f35111cb7253f4cf94e48193dc757d81d6aa
Component: engine
2015-04-14 08:34:40 -07:00
01cea82b52 fix memory stats display document
Signed-off-by: Sun Jianbo <wonderflow@zju.edu.cn>
Upstream-commit: d791f7e9f81010299130ae8816ebe58667ea6b09
Component: engine
2015-04-14 18:34:20 +08:00
981c7e3504 Add -f option and explanation to push after rebase
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
Upstream-commit: c89ddb6d015692e38a9b1a3223c406ddb5409758
Component: engine
2015-04-14 10:53:37 +01:00
491bf980ce integ-cli: Use status code from sockRequest (fix #12335)
sockRequest now makes the status code available in the returned
values. This helps avoid string checking for non-HttpStatusOK(=200)
yet successful error messages.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: 531433e7650c5d33ff6580d7de28a093a504ac6c
Component: engine
2015-04-14 08:07:50 +00:00
c4d568bf1b Improve test accuracy for pkg/chrootarchive (part 2)
Check test correctness of untar by comparing destination with
source. For part 2, it checkes hashes of source and destination
files or the target files of symbolic links.

This is a supplement to the #11601 fix.

Signed-off-by: Yestin Sun <sunyi0804@gmail.com>
Upstream-commit: 67df8e4257c165bc6abe77bb8f4ab55c10b2fbff
Component: engine
2015-04-13 21:46:14 -07:00
e458801862 names-generator: use local random instance
Instead of seeding/polluting the global random instance,
creating a local `rand.Random` instance which provides the same
level of randomness.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: 25fab69f7dcf72dabfeb60f61f50f175692f0b03
Component: engine
2015-04-14 02:35:16 +00:00
78acc699c1 graphdriver: prefer prior driver state
Before this, a storage driver would be defaulted to based on the
priority list, and only print a warning if there is state from other
drivers.

This meant a reordering of priority list would "break" users in an
upgrade of docker, such that there images in the prior driver's state
were now invisible.

With this change, prior state is scanned, and if present that driver is
preferred.

As such, we can reorder the priority list, and after an upgrade,
existing installs with prior drivers can have a contiguous experience,
while fresh installs may default to a driver in the new priority list.

Ref: https://github.com/docker/docker/pull/11962#issuecomment-88274858

Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: b68e161e5b76b5f622cf4fc226df46cbe314ea1e
Component: engine
2015-04-13 21:37:55 -04:00
2cc2a96cc1 Enable "netgo" library when we build a static binary with gccgo
Signed-off-by: Tatsushi Inagaki <e29253@jp.ibm.com>
Upstream-commit: bcd5e20a094e63093a95840f4f3342d981752708
Component: engine
2015-04-13 21:33:04 -04:00
53daac3bca add TestSearchCmdOptions case
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
Upstream-commit: 77f2a4a0e373225c145966c96d076d6d9f25b3b3
Component: engine
2015-04-14 09:23:26 +08:00
fc9842cd3d Merge pull request #12353 from sunyuan3/duplicate
duplicate logDone in TestRmRunningContainerCheckError409 and TestRmRunni...
Upstream-commit: 00eddf5e6718bca6fd011014d0acfbf71a84ac2c
Component: engine
2015-04-13 17:48:53 -07:00
3657626534 Move utils from commands_test.go into utils.go
Everything else was gone from this file except these utils which are
being used in other files and can't yet be removed.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 7d738e0b8c650817b8596e8c12fbe0baa3f045ed
Component: engine
2015-04-13 20:48:26 -04:00
0ca0f7ea18 Remove TestRunAutoremove
This test is already being skipped, and is also fully tested by
`TestRunContainerWithRmFlagExitCodeNotEqualToZero`

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 125747e967e82788df8799622f28a7bcd97a03ad
Component: engine
2015-04-13 20:48:26 -04:00
7cb5356905 MovetAttachDisconnect to integration-cli
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: e4cfd9b3924fae0369956b4f0e7f73a7e3b0cbf7
Component: engine
2015-04-13 20:48:26 -04:00
62b5c75dea Move TestAttachDetachTruncatedID to integration-cli
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 28cda048384ac8913f4912758fe35a673f4f8465
Component: engine
2015-04-13 20:48:26 -04:00
500830abe9 Move TestAttachDetach to integration-cli
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: ae0883ce009daa2b94e67264cfa5a13b4cae76bf
Component: engine
2015-04-13 20:48:26 -04:00
e303a2505f Move TestRunDetach to integration-cli
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: f7538c77efaf47fa5b82ae844b5c01887239ce65
Component: engine
2015-04-13 20:48:24 -04:00
afa485daa3 Merge pull request #12345 from kostickm/12324-add-detection-f2fs-jfs-filesystem
Add detection for F2Fs and JFS
Upstream-commit: f68ad63496aefb3d4c4c457bfbb113296b14e234
Component: engine
2015-04-13 17:32:47 -07:00
bb0567addc duplicate logDone in TestRmRunningContainerCheckError409 and TestRmRunningContainer
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
Upstream-commit: b85ade79d5a2cceb926fcae13997a6dfa28be4bc
Component: engine
2015-04-14 08:32:25 +08:00
c7a9533eb2 Merge pull request #12351 from jfrazelle/fix-test-daemon-with-wrong-key-messing-up-builds
cleanup daemon tests
Upstream-commit: b93d3f876814b23b2b7934783b02d40c0b3f6ca1
Component: engine
2015-04-13 20:31:41 -04:00
5ed1c63736 Merge pull request #11920 from SvenDowideit/flesh-out-docker-hub-automated-builds-docs
Researching Docker Hub account linking and automated builds details
Upstream-commit: e8a7e762839ae8a70f8bb6f25fded156bedc2277
Component: engine
2015-04-14 10:31:21 +10:00
f0104588db Researching Docker Hub account linking and automated builds details
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: a55f8e1ce734035a77cc13d1e2f42dbef41d418e
Component: engine
2015-04-14 10:29:55 +10:00
81dfdc7b63 Add detection for F2Fs and JFS
Signed-off-by: Megan Kostick <mkostick@us.ibm.com>

Alphabetize FSMagic list to make more human-readable.

Signed-off-by: Megan Kostick <mkostick@us.ibm.com>
Upstream-commit: 7e2d05b4938c010bf15224bd2857e2dca92ec9b3
Component: engine
2015-04-13 17:01:43 -07:00
99af06daa4 Merge pull request #12349 from calavera/patch-1
Fix JSON format in the remote api configuration examples.
Upstream-commit: 24df333fa555bc3768bf6509f06e306bf11b835f
Component: engine
2015-04-13 16:59:12 -07:00
ce3584d9d7 cleanup test wrong key.json leading to other failures
wait for container to be running before trying to kill it in daemon tests

Signed-off-by: Jessica Frazelle <jess@docker.com>
Upstream-commit: 9a87553e4fc6c0abdd298893deefc44050208dda
Component: engine
2015-04-13 16:58:44 -07:00
a4111cba55 Refactor utils/utils, fixes #11923
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: c30a55f14dbbe3971ba0ac716ba69a60868f4490
Component: engine
2015-04-14 01:37:36 +02:00
b524d0385e Fix JSON format in the remote api configuration examples.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: d71c929d081c2fb7c33b36ae5db40014163f9b6c
Component: engine
2015-04-13 16:12:00 -07:00
e41b731dd5 Merge pull request #12166 from cpuguy83/remove_err_when_volume_exists
Don't return error when adding existing volume
Upstream-commit: 7ecf4e5d4dfbb0c9adcdea65f51d40fd6d4a1f43
Component: engine
2015-04-13 14:15:48 -07:00
6165959ea5 Merge pull request #12025 from coolljt0725/add_exec_with_user
Add docker exec run command as a different user and in privileged mode
Upstream-commit: 12f7db18309950785e873119edb03e0a1621e7a3
Component: engine
2015-04-13 13:50:51 -07:00
d6a743bd91 Merge pull request #12044 from reteptilian/11721-remove-randomstring-3
fixes 11721 replace stringutils.GenerateRandomString with stringid.GenerateRandomID
Upstream-commit: b5c3d01e6b5d06ba3e477a71acf92ec564b279e6
Component: engine
2015-04-13 13:47:50 -07:00
1b83890462 Don't return error when adding existing volume
Error wasn't really doing anything except for making a bunch of extra
debug logs.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 579c9ec1d07983edf423d8c7564840d2fcc6f303
Component: engine
2015-04-13 16:45:35 -04:00
8259affad5 Merge pull request #12111 from tianon/builder-deb
Add "builder-deb" base images for building ".deb" packages properly
Upstream-commit: 8652ca5d5f56590651e7500b097566083bb1a0da
Component: engine
2015-04-13 13:41:17 -07:00
b498ab25b2 move TestImagesFilter to integration-cli
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 02706a40bb29c6ab7f5ac36ece6fd1073879d95d
Component: engine
2015-04-13 16:40:48 -04:00
a8ff8c9aa8 Move TestCreateNumberHostname to integration-cli
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 2c24a8a4ea7ea0571cd4e125158fa59f584d2464
Component: engine
2015-04-13 16:40:48 -04:00
367b23adf0 Move TestMergeOnCommit to integration-cli
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: ed6074ea6be17518a3b21e4dd5038f13ca835194
Component: engine
2015-04-13 16:40:48 -04:00
7d986b9758 Move TestRunWithTooLowMemory to integration-cli
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 9b4d9a34218bcc506c7080a35c70788f46dc2e4e
Component: engine
2015-04-13 16:40:48 -04:00
483871b67f Merge pull request #12172 from ZJU-SEL/change_stats
change memory usage display
Upstream-commit: 6fa2a1e486797c1aa151e242902bed716347850f
Component: engine
2015-04-13 13:32:45 -07:00
58a255f72b Merge pull request #12287 from calavera/check_memory_swap_when_disabled
Log memory swap capabilities properly.
Upstream-commit: 3d424ead3baa489380faca50d433a80b91df527e
Component: engine
2015-04-13 13:19:52 -07:00
c70c4ed8f3 Merge pull request #12204 from yestin/11601-supplement-tests-part-1
Improve test accuracy for pkg/chrootarchive (part 1)
Upstream-commit: b6e64981e655d1c0cdd3778d4d9fad0caca6e08a
Component: engine
2015-04-13 16:14:18 -04:00
b2386cf473 Merge pull request #12341 from jfrazelle/add-vet-script
Add vet script
Upstream-commit: e961f7da6705500502a772bbfbc6c1196556673d
Component: engine
2015-04-13 13:13:56 -07:00
20c653370b Merge pull request #12222 from chenhanxiao/cp-support-colon
cp: add support for copy filename with ":"
Upstream-commit: 75b911eb3cb12e4c4d86fd42aa12bc71458f77b1
Component: engine
2015-04-13 13:09:12 -07:00
64a92fd92c Merge pull request #12262 from YanFeng-Adam/daemon
A wrong key.json would remain if the TestDaemonwithwrongkey case fails. The issue would lead to failure of other cases.
Upstream-commit: 6b40377c189e77bcaf688e2b6a6f628a6dfe6927
Component: engine
2015-04-13 16:00:20 -04:00
31603a5780 Merge pull request #12342 from LK4D4/fix_vet_warn
Fix vet warning
Upstream-commit: afd973c4971ee2bed4c943cf08d6e7ef19dd8501
Component: engine
2015-04-13 12:56:47 -07:00
73aea16588 change tabs to spaces
Signed-off-by: Jessica Frazelle <jess@docker.com>
Upstream-commit: f3ba0a6a3505f5c5c690b84a4db2255fea9af18f
Component: engine
2015-04-13 12:48:40 -07:00
ddcc756587 Adds validate-vet script
resolves #11970

Signed-off-by: bobby abbott <ttobbaybbob@gmail.com>
Upstream-commit: 3280ce651b13866f93440b60a9182f9a4f9f14b9
Component: engine
2015-04-13 12:48:05 -07:00
7e81577a52 Log memory swap capabilities properly.
Check whether the swap limit capabilities are disabled or not only when memory swap is set to greater than 0.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 7523beff41eca212794e902afa1a614b2672e245
Component: engine
2015-04-13 11:56:59 -07:00