docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-16 20:22:36 +03:00
Code Activity
14,887 Commits 12 Branches 296 Tags
9d60a63dde9ccbf6d4b2bb625ec6795b1ebe3473
Commit Graph

1193 Commits

Author SHA1 Message Date
Alexander Morozov
9d60a63dde Merge pull request #12561 from sergeyevstifeev/12549-fix-test-requires-network 
Add missing testRequires(t, Network)
Upstream-commit: cfe7c9c1b24a965985eb54d10fa114e339a95e0b
Component: engine
 2015-04-20 12:58:30 -07:00
Sergey Evstifeev
3d762e6cee Add missing testRequires(t, Network) 
Fixes #12552

Signed-off-by: Sergey Evstifeev <sergey.evstifeev@gmail.com>
Upstream-commit: 716e21be2b9780306cc1ffe02b2a784e2dece94e
Component: engine
 2015-04-20 21:19:50 +02:00
Phil Estes
bd79229dd5 Merge pull request #12554 from buddhamagnet/12553-cli-doc-correction 
12553 fix typo
Upstream-commit: 53edce79f16816a165b5be9cd4ee05501c103c6f
Component: engine
 2015-04-20 14:30:51 -04:00
buddhamagnet
e52ab0e055 fix typo 
Signed-off-by: buddhamagnet <buddhamagnet@gmail.com>
Upstream-commit: cdd5d5e4c3fe241d178c09edb521ae91689b55df
Component: engine
 2015-04-20 18:56:21 +01:00
Alexander Morozov
932b7d41ce Make daemon initialization in main goroutine 
It is simplifies code and lead to next refactoring step, where daemon
will be incorporated to some structure which represents API.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 181fea24aac7499a3d6dc0c8c9de67e6c0036140
Component: engine
 2015-04-20 08:13:39 -07:00
Hu Keping
899b777d56 Remove Job from Info API 
Two main things
- Create a real struct Info for all of the data with the proper types
- Add test for REST API get info

Signed-off-by: Hu Keping <hukeping@huawei.com>
Upstream-commit: f4942ed864f00a31591ef0257a971ef41ddd4c70
Component: engine
 2015-04-20 18:14:06 +08:00
Arnaud Porterie
ad529b2798 Merge pull request #12466 from robertabbott/fix_dockerCmd 
Removed unnecessary error output from dockerCmd
Upstream-commit: 5fd378c0d1d97601c7cfab6a62bb8da031a0001d
Component: engine
 2015-04-17 15:15:34 -07:00
Brian Goff
41c63ff3d3 Merge pull request #12490 from LK4D4/carry_12396 
remove job from pull and import
Upstream-commit: 055c6dbaefc61c597164aaedee4448bc32522b2e
Component: engine
 2015-04-17 15:26:30 -04:00
Simei He
0ff275f7b4 remove job from pull and import 
Closes #12396

Signed-off-by: Simei He <hesimei@zju.edu.cn>

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 6e38a53f96403b4cbd38e49e6b294128ed054a20
Component: engine
 2015-04-17 09:55:02 -07:00
bobby abbott
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
Antonio Murdaca
6488f10044 Remove builtins 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: a0bf80fe0372196812a9cb295f209c08f8037601
Component: engine
 2015-04-17 14:27:38 +02:00
Doug Davis
9a1ff57e85 Merge pull request #12468 from icecrime/disable_test_pull_verified 
Skip TestPullVerified
Upstream-commit: 5e40de92864009e7385300af1dd0a83bb4693126
Component: engine
 2015-04-17 02:31:01 -04:00
Arnaud Porterie
7e8cef686e Skip TestPullVerified 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 9a4fa9c19167756cf39a4d002efe81d4bcd3bb75
Component: engine
 2015-04-16 23:05:47 -07:00
Doug Davis
52da95a5c0 Merge pull request #12446 from icecrime/please_go_away_testexp.tar 
Always remove testexp.tar test file
Upstream-commit: 5207b3eb2b9894c282e46254b727aeee7e03e949
Component: engine
 2015-04-17 01:58:29 -04:00
Arnaud Porterie
e095f708fe Improve export/import tests cleanup 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 4e356ee410e1abb86665ab15e4c4155d7c807866
Component: engine
 2015-04-16 22:10:55 -07:00
Brian Goff
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
Brian Goff
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
Brian Goff
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
Brian Goff
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
Brian Goff
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
Brian Goff
f8e57bde88 Move SaveAndThenload to integration-cli 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 6f5b895bc767585be9a8e1109672fb4946e56f15
Component: engine
 2015-04-16 13:40:49 -04:00
Brian Goff
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
Qiang Huang
9f222f171d Add cpuset-mems support for docker build 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: f8dc7e8754355c504562021da244c52055ab9204
Component: engine
 2015-04-15 09:34:12 +08:00
Qiang Huang
4f6ebaa34e add support for cpuset.mems 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 8077b2fb805c78cee642d8350df88227c6414960
Component: engine
 2015-04-15 09:33:46 +08:00
Thomas Texier
ef2b1dddc8 Remove unnecessary fmt.Printf 
Signed-off-by: Thomas Texier <sharkone@en-mousse.org>
Upstream-commit: 2ea1febd9aafd94985a2430c35243e539fa29f53
Component: engine
 2015-04-14 20:55:32 +00:00
Phil Estes
c444005c81 Merge pull request #12292 from cpuguy83/remove_commands_integration 
Remove commands integration
Upstream-commit: 2f0f04e8fa32a7f8d02b4a9078537f52887d8ab7
Component: engine
 2015-04-14 16:17:25 -04:00
Alexander Morozov
023499d83c Merge pull request #12282 from cpuguy83/remove_some_integration_tests 
Move integration/server_test tests to integration-cli
Upstream-commit: 676bf4afa53a30dcf2f0598895942701c7d59448
Component: engine
 2015-04-14 11:55:05 -07:00
Alexander Morozov
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
Alexander Morozov
c1570d1a97 Merge pull request #11980 from sunyuan3/TestSearchCmdOptions 
add TestSearchCmdOptions case
Upstream-commit: 5019f35111cb7253f4cf94e48193dc757d81d6aa
Component: engine
 2015-04-14 08:34:40 -07:00
Ahmet Alp Balkan
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
Yuan Sun
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
Arnaud Porterie
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
Brian Goff
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
Brian Goff
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
Brian Goff
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
Brian Goff
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
Yuan Sun
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
Jessica Frazelle
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
Michael Crosby
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
Brian Goff
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
Brian Goff
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
Brian Goff
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
Brian Goff
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
Michael Crosby
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
Evan Hazlett
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
Evan Hazlett
e120033d69 Merge pull request #12275 from LK4D4/pid_host_hell 
Get process list after PID 1 dead
Upstream-commit: 05433a4dabeb7204d6925606549ba79022f506d6
Component: engine
 2015-04-13 14:50:23 -04:00
Evan Hazlett
97f1b60257 Merge pull request #12301 from ewindisch/https_links 
Use HTTPS links for URLs in READMEs / comments / docs
Upstream-commit: 3509132a6e28caa18003298521c58746f490b57b
Component: engine
 2015-04-13 14:30:53 -04:00
Michael Crosby
6c72e654c8 Merge pull request #12325 from hqhq/hq_fix_build_test 
fix build test by adding --no-cache
Upstream-commit: 0e46cc9be49f741b873cf1016cfd66b258947ffb
Component: engine
 2015-04-13 10:57:19 -07:00
Alexander Morozov
ab385b72f9 Fix errors due changed sockRequest signature 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 27fccdbabb277e29488de88f9af2e7b83af93132
Component: engine
 2015-04-13 10:30:07 -07:00
Michael Crosby
05674d127e Merge pull request #12320 from runcom/fix-api-resize-exec-resize 
fix api server resize&execResize
Upstream-commit: 6f928be7ef7d8610875e860e72433dc2477b1c5d
Component: engine
 2015-04-13 09:59:11 -07:00