0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
48607 commits 14 branches 412 tags 338 MiB
Commit graph

3794 commits

Author SHA1 Message Date
Brian Goff
f2f8e4c5c9 Merge pull request #12870 from coolljt0725/fix_rename_help 
Fix docker rename help not consistent with other commands
 2015-04-29 09:14:03 -04:00
Lei Jitang
0e752adf55 Fix docker rename help not consistent with other commands 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-04-29 19:37:20 +08:00
Qiang Huang
c7812f01c7 fix a minor inspect format issue 
Before, inspect cont1 cont2 shows:
[{
    xxx
}
,{
    xxx
}
]
After, it shows:
[
{
   xxx
}
,{
    xxx
}
]

Because `func (*Encoder) Encode` always followed by a newline character,
so it's difficult to put '}' and ']' one the same line.

To get symmetry, above is our choice.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-04-28 18:51:04 +08:00
Antonio Murdaca
844538142d Small if err cleaning 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-27 21:50:33 +02:00
Tibor Vass
572ba9cb40 Merge pull request #12333 from Mashimiao/clean-up-viz 
Clean up viz code
 2015-04-27 14:13:03 -04:00
He Simei
6d9439c627 remove useless http call from export 
Signed-off-by: He Simei <hesimei@zju.edu.cn>
 2015-04-27 12:41:03 +08:00
Julien Barbier
bb41193998 Happy birthday Docker! cgroup-parent option for docker build. Thanks to Michael, Nathan and Jessie for their support! #42 
Signed-off-by: Julien Barbier <write0@gmail.com>
 2015-04-25 15:25:51 -04:00
He Simei
daad696e09 Fix error prompt for pull & import handler postImagesCreate. 
Signed-off-by: He Simei <hesimei@zju.edu.cn>
 2015-04-25 09:10:32 +08:00
Alexander Morozov
790c63a5ef Merge pull request #12502 from calavera/shallow_git_history 
Shallow clone using git to build images.
 2015-04-24 10:16:01 -07:00
David Calavera
1cfb307d70 Remove duplicated git clone logic. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-04-24 09:39:45 -07:00
Lei Jitang
5f4fb8be00 Add cpu cfs quota to build 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-04-24 08:54:08 +08:00
Ma Shimiao
66acef865d clean up viz code 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
 2015-04-24 08:38:14 +08:00
Antonio Murdaca
fa2c68a89e Remove engine/job from graph 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-23 23:36:29 +02:00
Alexander Morozov
799cf056e7 Merge pull request #11839 from brahmaroutu/template_11641 
Allow go template to work properly with inspect …
 2015-04-23 13:07:40 -07:00
Jessie Frazelle
1492a7d7fd Merge pull request #12702 from LK4D4/good_ol_flushed 
Return weird behaviour of returning json errors
 2015-04-23 13:03:29 -07:00
Arnaud Porterie
c4914f071f Merge pull request #12577 from jfrazelle/actually-depreciate-rm 
actually depreciate -rm insteam of --rm.. and a few others
 2015-04-23 11:55:20 -07:00
Alexander Morozov
9ed5bfb083 Merge pull request #12636 from duglin/MoveConfig 
Move CLI config processing out from under registry dir
 2015-04-23 11:50:31 -07:00
Brian Goff
2c70288ca6 Merge pull request #12703 from LK4D4/carry_12596 
remove job from image_export
 2015-04-23 14:27:59 -04:00
Srini Brahmaroutu
231d362db7 Allow go template to work properly with inspect 
Closes #11641

Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2015-04-23 18:25:18 +00:00
Jessie Frazelle
2345389975 Merge pull request #12687 from WeiZhang555/NotFound 
refactor httpError() and add 404 "not found" mapping
 2015-04-23 11:21:09 -07:00
Simei He
2a14b7dd35 remove job from image_export 
Signed-off-by: He Simei <hesimei@zju.edu.cn>
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-04-23 10:54:25 -07:00
Alexander Morozov
ec51ba01db 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>
 2015-04-23 10:27:37 -07:00
Doug Davis
bb9da6ba92 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>
 2015-04-23 10:18:38 -07:00
Alexander Morozov
2351b87551 Merge pull request #12505 from ZJU-SEL/remove_job_from_push 
remove job from push
 2015-04-23 09:57:17 -07:00
Alexander Morozov
71ac5b7903 Merge pull request #12681 from hqhq/hq_fix_test_in_apiserver 
fix test case name
 2015-04-23 09:21:00 -07:00
Simei He
d456401fe1 remove job from push 
Signed-off-by: Simei He <hesimei@zju.edu.cn>

Signed-off-by: He Simei <hesimei@zju.edu.cn>
 2015-04-23 21:21:56 +08:00
Zhang Wei
ab42a3a23a 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>
 2015-04-23 19:37:47 +08:00
Simei He
70bb0d8ed7 remove job from load 
Signed-off-by: Simei He <hesimei@zju.edu.cn>

Signed-off-by: He Simei <hesimei@zju.edu.cn>
 2015-04-23 19:13:12 +08:00
Qiang Huang
a8d2fbe7b4 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>
 2015-04-23 18:41:30 +08:00
Doug Davis
eae272f90e Merge pull request #12390 from hqhq/hq_fix_inspect 
fix inspect format result
 2015-04-22 23:06:13 -04:00
Qiang Huang
b0ef3194aa 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>
 2015-04-23 09:28:07 +08:00
Brian Goff
3872272170 Merge pull request #12406 from runcom/remove-job-container-inspect 
Remove job from container_inspect
 2015-04-22 21:05:15 -04:00
Doug Davis
5ea8dc376c Merge pull request #12649 from jlhawn/fix_pull_err_explosion 
Correctly format API error on image pull
 2015-04-22 20:28:24 -04:00
Antonio Murdaca
4b9fe9c298 Remove job from container_inspect 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-23 00:58:13 +02:00
Jessie Frazelle
3c9ae03a86 Merge pull request #12650 from LK4D4/carry_12472 
remove execCreate & execStart from job
 2015-04-22 15:32:14 -07:00
Josh Hawn
fd4f7c4e5c Correctly format API error on image pull 
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
 2015-04-22 14:11:25 -07:00
jianbosun
24425021d2 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>
 2015-04-22 13:51:57 -07:00
Peggy Li
58065d0dd9 Fix golint errors in docker/api/client 
Signed-off-by: Peggy Li <peggyli.224@gmail.com>
 2015-04-22 00:14:23 -07:00
Alexander Morozov
a2f74aa4b4 Remove chain of engine passing from builder to loadManifest 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-04-21 14:55:23 -07:00
Antonio Murdaca
27811355bd Remove writeJSONEnv 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-21 18:14:39 +02:00
Jessie Frazelle
17d5450bc3 Merge pull request #10736 from coolljt0725/add_cpu_limit 
Add support cpu cfs_quota
 2015-04-20 17:55:01 -07:00
Jessie Frazelle
47b703593e Merge pull request #12430 from icecrime/11551_carry 
Add -H|--human command-line flag to `docker history`
 2015-04-20 17:28:24 -07:00
Jessie Frazelle
82f75df9e9 Merge pull request #12457 from calavera/remove_engine_job_builder 
Remove engine.Job from Builder.
 2015-04-20 17:27:17 -07:00
Jessie Frazelle
4bb8924b52 Merge pull request #12539 from WeiZhang555/httpError 
change httpError logic
 2015-04-20 17:26:09 -07:00
Jessica Frazelle
f3d4c33213 actually depreciate -rm, -sig-proxy, -name, seriously its been forever 
Signed-off-by: Jessica Frazelle <princess@docker.com>
 2015-04-20 17:20:23 -07:00
Jessie Frazelle
4a25c5d25b Merge pull request #12533 from ankushagarwal/gofmt-directory 
gofmt 1.4.2  src directory
 2015-04-20 17:02:43 -07:00
David Calavera
3b05005a12 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>
 2015-04-20 14:25:45 -07:00
David Calavera
ae4063585e Remove engine.Job from builder.CmdBuildConfig. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-04-20 13:37:06 -07:00
David Calavera
9a2c009751 Remove engine.Job references from builder.CmdBuild 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-04-20 13:37:04 -07:00
Alexander Morozov
08ef006d17 Merge pull request #12009 from duglin/AddConfig 
Migrate .dockercfg to .docker/config.json and support for HTTP Headers
 2015-04-20 13:12:17 -07:00