docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-15 07:40:57 +03:00
Code Activity
15,103 Commits 12 Branches 295 Tags
d5259f3ff9a3fa027ba40fd46cb2a0eb56dc2fab
Commit Graph

785 Commits

Author SHA1 Message Date
Alexander Morozov
cc66f7a04e Merge pull request #12502 from calavera/shallow_git_history 
Shallow clone using git to build images.
Upstream-commit: 790c63a5ef34d54ae8ba79886b6c8daae547bf25
Component: engine
 2015-04-24 10:16:01 -07:00
David Calavera
dfd9ef2b64 Remove duplicated git clone logic. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 1cfb307d70558110e8e88a7391ae0e6cf6ebf174
Component: engine
 2015-04-24 09:39:45 -07:00
Lei Jitang
734115a06e Add cpu cfs quota to build 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 5f4fb8be006c0ffeff2671e5752111e543e07d9f
Component: engine
 2015-04-24 08:54:08 +08:00
Antonio Murdaca
41061500b4 Remove engine/job from graph 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: fa2c68a89e153cfc82c5af7cbb6d7f15b06e0a8c
Component: engine
 2015-04-23 23:36:29 +02:00
Alexander Morozov
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
Jessie Frazelle
683e3fbf65 Merge pull request #12702 from LK4D4/good_ol_flushed 
Return weird behaviour of returning json errors
Upstream-commit: 1492a7d7fd91e52a52937cafe1137330a89a910e
Component: engine
 2015-04-23 13:03:29 -07:00
Arnaud Porterie
079bd06b02 Merge pull request #12577 from jfrazelle/actually-depreciate-rm 
actually depreciate -rm insteam of --rm.. and a few others
Upstream-commit: c4914f071ffad203bc4ed16404f7ddc985a5f63e
Component: engine
 2015-04-23 11:55:20 -07:00
Alexander Morozov
fdbedc1a2a Merge pull request #12636 from duglin/MoveConfig 
Move CLI config processing out from under registry dir
Upstream-commit: 9ed5bfb083a8e848b43f5220ca89c82ea416a93b
Component: engine
 2015-04-23 11:50:31 -07:00
Brian Goff
7362927093 Merge pull request #12703 from LK4D4/carry_12596 
remove job from image_export
Upstream-commit: 2c70288ca60cde8844220c90306da8bf7728026f
Component: engine
 2015-04-23 14:27:59 -04:00
Srini Brahmaroutu
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
Jessie Frazelle
19c7093025 Merge pull request #12687 from WeiZhang555/NotFound 
refactor httpError() and add 404 "not found" mapping
Upstream-commit: 2345389975258c0a586ff39de070749151733625
Component: engine
 2015-04-23 11:21:09 -07:00
Simei He
bda3c79940 remove job from image_export 
Signed-off-by: He Simei <hesimei@zju.edu.cn>
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 2a14b7dd35901167d83735a25ff626596391c4ed
Component: engine
 2015-04-23 10:54:25 -07:00
Alexander Morozov
0c04318339 Return weird behaviour of returning json errors 
We need this, so client can get error from stream and not from status
code, which is already 200, because write to ResponseWriter was occured.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: ec51ba01dbbeadb06cc7f3c14e94f8a2ee938a34
Component: engine
 2015-04-23 10:27:37 -07:00
Doug Davis
c8f1332dce Move CLI config processing out from under registry dir 
No logic changes should be in here, just moving things around.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: bb9da6ba9294a8eab8f4dfaf7cf07c57959fe608
Component: engine
 2015-04-23 10:18:38 -07:00
Alexander Morozov
898f52e474 Merge pull request #12505 from ZJU-SEL/remove_job_from_push 
remove job from push
Upstream-commit: 2351b87551a0ee3ec97afc34b7cace7f716190d2
Component: engine
 2015-04-23 09:57:17 -07:00
Alexander Morozov
ad85dea266 Merge pull request #12681 from hqhq/hq_fix_test_in_apiserver 
fix test case name
Upstream-commit: 71ac5b79038964c353645c78e354654cb5730434
Component: engine
 2015-04-23 09:21:00 -07:00
Simei He
6b55be9005 remove job from push 
Signed-off-by: Simei He <hesimei@zju.edu.cn>

Signed-off-by: He Simei <hesimei@zju.edu.cn>
Upstream-commit: d456401fe1d038ddaf9866bb6ab4ac5744186e2d
Component: engine
 2015-04-23 21:21:56 +08:00
Zhang Wei
84dc009f41 refactor httpError() and add 404 "not found" mapping 
When docker pull a non-existent repo, daemon will report "image xxx not found"
with an error code 500, which should be 404.
This commit add 404 "not found" mapping and refactor httpError function.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: ab42a3a23a1276ccad874a13cf8604cb59124e10
Component: engine
 2015-04-23 19:37:47 +08:00
Simei He
ece94d0722 remove job from load 
Signed-off-by: Simei He <hesimei@zju.edu.cn>

Signed-off-by: He Simei <hesimei@zju.edu.cn>
Upstream-commit: 70bb0d8ed7847d7e7850a1a864ff258767f0ad7a
Component: engine
 2015-04-23 19:13:12 +08:00
Qiang Huang
f4814df32c fix test case name 
Name like this will never run by go test. And this test case won't
get PAAS.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: a8d2fbe7b4593f1e10800a19df14e1bbfb212d41
Component: engine
 2015-04-23 18:41:30 +08:00
Doug Davis
0b0a96ad89 Merge pull request #12390 from hqhq/hq_fix_inspect 
fix inspect format result
Upstream-commit: eae272f90eb6c01824112054140b5dc7d9d679ce
Component: engine
 2015-04-22 23:06:13 -04:00
Qiang Huang
1c1b244ecd fix inspect format result 
Currently `docker inspect -f` use json.Unmarshal() unmarshal
to interface, it will store all JSON numbers in float64, so
we use `docker inspect 4f0d73b75a0d | grep Memory` and
`docker inspect -f {{.HostConfig.Memory}} 4f0d73b75a0d` will
get different values.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: b0ef3194aaa8c22b674ed5301c59e8e557a7e85e
Component: engine
 2015-04-23 09:28:07 +08:00
Brian Goff
078d379cc0 Merge pull request #12406 from runcom/remove-job-container-inspect 
Remove job from container_inspect
Upstream-commit: 387227217004d4ea54e2d2405aaef761752e3bdc
Component: engine
 2015-04-22 21:05:15 -04:00
Doug Davis
9b8b781646 Merge pull request #12649 from jlhawn/fix_pull_err_explosion 
Correctly format API error on image pull
Upstream-commit: 5ea8dc376c94de6939e35a4152b1a9a5979911dd
Component: engine
 2015-04-22 20:28:24 -04:00
Antonio Murdaca
fdf9a8d629 Remove job from container_inspect 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 4b9fe9c298c8778855c1d14e978c791496dd7c42
Component: engine
 2015-04-23 00:58:13 +02:00
Jessie Frazelle
54ac8d85af Merge pull request #12650 from LK4D4/carry_12472 
remove execCreate & execStart from job
Upstream-commit: 3c9ae03a868bb86fdb3026a21ef1b9a3f6a75dfb
Component: engine
 2015-04-22 15:32:14 -07:00
Josh Hawn
cd9ba3cbe6 Correctly format API error on image pull 
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
Upstream-commit: fd4f7c4e5c4460bad7baf0854f1edc1bbf93aeef
Component: engine
 2015-04-22 14:11:25 -07:00
jianbosun
f089bf1e0a remove execCreate & execStart from job 
Also removed the function ExecConfigFromJob

Signed-off-by: Sun Jianbo <wonderflow@zju.edu.cn>
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 24425021d26f29a475702064181e6c99fb6bd1c5
Component: engine
 2015-04-22 13:51:57 -07:00
Peggy Li
ed4e61e70a Fix golint errors in docker/api/client 
Signed-off-by: Peggy Li <peggyli.224@gmail.com>
Upstream-commit: 58065d0dd9adec4b2f397a453652cc8cc7237a17
Component: engine
 2015-04-22 00:14:23 -07:00
Alexander Morozov
43e79cc411 Remove chain of engine passing from builder to loadManifest 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: a2f74aa4b449479dc3953b129c839ca90b089494
Component: engine
 2015-04-21 14:55:23 -07:00
Antonio Murdaca
e46db750a1 Remove writeJSONEnv 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 27811355bd15dd2d0f102dd3b02512c677d5da44
Component: engine
 2015-04-21 18:14:39 +02:00
Jessie Frazelle
cff18dc122 Merge pull request #10736 from coolljt0725/add_cpu_limit 
Add support cpu cfs_quota
Upstream-commit: 17d5450bc31e81c22e8ccba806294e4d744af275
Component: engine
 2015-04-20 17:55:01 -07:00
Jessie Frazelle
23af23a14a Merge pull request #12430 from icecrime/11551_carry 
Add -H|--human command-line flag to `docker history`
Upstream-commit: 47b703593efa10489f39b2396081fa65d12ccae4
Component: engine
 2015-04-20 17:28:24 -07:00
Jessie Frazelle
bf5cc9f8c8 Merge pull request #12457 from calavera/remove_engine_job_builder 
Remove engine.Job from Builder.
Upstream-commit: 82f75df9e9faceabd9a2653ac57ad17aeab5e44b
Component: engine
 2015-04-20 17:27:17 -07:00
Jessie Frazelle
27af7aa804 Merge pull request #12539 from WeiZhang555/httpError 
change httpError logic
Upstream-commit: 4bb8924b52a4d8a25ccfcd39a43e7ba22b393424
Component: engine
 2015-04-20 17:26:09 -07:00
Jessica Frazelle
f0d8d3abd1 actually depreciate -rm, -sig-proxy, -name, seriously its been forever 
Signed-off-by: Jessica Frazelle <princess@docker.com>
Upstream-commit: f3d4c33213088ce3c381156760064f07da76de30
Component: engine
 2015-04-20 17:20:23 -07:00
Jessie Frazelle
a2ec388af9 Merge pull request #12533 from ankushagarwal/gofmt-directory 
gofmt 1.4.2  src directory
Upstream-commit: 4a25c5d25bad693f9e79a810d87f9103769f918c
Component: engine
 2015-04-20 17:02:43 -07:00
David Calavera
1edadd0f1c Add flusher check to utils.WriteFlusher. 
That way we can know when the stream has been flushed.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 3b05005a1262e53d042512e88c52a6dae0f2e93d
Component: engine
 2015-04-20 14:25:45 -07:00
David Calavera
16569396d9 Remove engine.Job from builder.CmdBuildConfig. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: ae4063585e7936780154101f7fe416a080c6ff7c
Component: engine
 2015-04-20 13:37:06 -07:00
David Calavera
a618f11507 Remove engine.Job references from builder.CmdBuild 
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 9a2c00975123c17033ac7b50762af82051ec73db
Component: engine
 2015-04-20 13:37:04 -07:00
Alexander Morozov
d6cf7ae01f Merge pull request #12009 from duglin/AddConfig 
Migrate .dockercfg to .docker/config.json and support for HTTP Headers
Upstream-commit: 08ef006d178b7a869c9dfc05c8b887316a856445
Component: engine
 2015-04-20 13:12:17 -07:00
Doug Davis
44c88b9112 Add .docker/config.json and support for HTTP Headers 
This PR does the following:
- migrated ~/.dockerfg to ~/.docker/config.json. The data is migrated
  but the old file remains in case its needed
- moves the auth json in that fie into an "auth" property so we can add new
  top-level properties w/o messing with the auth stuff
- adds support for an HttpHeaders property in ~/.docker/config.json
  which adds these http headers to all msgs from the cli

In a follow-on PR I'll move the config file process out from under
"registry" since it not specific to that any more. I didn't do it here
because I wanted the diff to be smaller so people can make sure I didn't
break/miss any auth code during my edits.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 18c9b6c6455f116ae59cde8544413b3d7d294a5e
Component: engine
 2015-04-20 13:05:24 -07:00
Alexander Morozov
47e2254d8e Make all http handlers api.server.Server methods 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: da7bca449652396dd8a4a0ff2e303d3d3c7a58a2
Component: engine
 2015-04-20 09:45:31 -07:00
Zhang Wei
73aebaff91 change httpError logic 
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Signed-off-by: Zhang Wei <zhangwei198900@gmail.com>
Upstream-commit: 66239ab5c914ce716c044b676ba1ad4757ce6f2b
Component: engine
 2015-04-20 23:26:56 +08:00
Lei Jitang
f8f4bcdb38 Add support cpu cfs quota 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: dcc50e1d593fd7995189872791c6d7a013f16970
Component: engine
 2015-04-20 08:16:47 -07:00
Alexander Morozov
2e27fa9e39 Make API server datastructure 
Added daemon field to it, will use it later for acces to daemon from
handlers

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: d9ed3165228b60cb89c31d0d66b99e01ab83eb3e
Component: engine
 2015-04-20 08:13:39 -07:00
Alexander Morozov
3ad142821c Merge pull request #12537 from hqhq/hq_remove_unused_function 
remove unused function in server_unit_test.go
Upstream-commit: b5584ec24a6c711a842605dd9fbf5535e77ae878
Component: engine
 2015-04-20 07:51:53 -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
Qiang Huang
5848586647 remove unused function in server_unit_test.go 
After engine refactor, some functions are no longer used.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 641a7ec9ad61a42b255d203b7791198431761104
Component: engine
 2015-04-20 16:27:47 +08:00
Ankush Agarwal
396287023b gofmt whole directory 
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
Upstream-commit: edf541c22b5253a980ee061b35110d0da8fdb905
Component: engine
 2015-04-20 01:08:51 -07:00