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

395 commits

Author SHA1 Message Date
David Calavera
d78755d159 Merge pull request #12822 from brahmaroutu/container_stop_api 
restapi stop fails if ?t=int not present
 2015-05-07 09:38:59 -07:00
Srini Brahmaroutu
68e9c07850 Restapi for stop fails if ?t=int not present 
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2015-05-07 15:43:50 +00:00
Antonio Murdaca
74121a4211 Do not check and return strconv.Atoi error in api container restart, regression 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-05-07 01:49:16 +02:00
Arnaud Porterie
e960e4bb12 Merge pull request #11844 from jbarbier/cgroup-parent-42 
Adding cgroup-parent option for docker build
 2015-05-05 14:46:47 -07:00
Adria Casas
a2c76912e0 Rename int64Value to int64ValueOrZero. 
Signed-off-by: Adria Casas <adriacasas88@gmail.com>
 2015-05-05 08:54:28 +02:00
Tibor Vass
91fb4d672a Merge pull request #10766 from cpuguy83/stats_pull_once 
Allow pulling stats once and disconnecting.
 2015-05-04 22:28:01 -07:00
Brian Goff
f3023a93d1 Allow pulling stats once and disconnecting. 
Adds a `stream` query param to the stats API which allows API users to
only collect one stats entry and disconnect instead of keeping the
connection alive to stream more stats.

Also adds a `--no-stream` flag to `docker stats` which does the same

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-05-04 10:49:13 -04:00
Antonio Murdaca
c7cfdb65aa Refactor server to use daemon as the service layer in controllers 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-05-02 03:12:58 +02:00
Antonio Murdaca
531f4122bd Remove engine mechanism 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-30 01:35:16 +02: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
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
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
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
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
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
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
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
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
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
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
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
da7bca4496 Make all http handlers api.server.Server methods 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-04-20 09:45:31 -07:00
Zhang Wei
66239ab5c9 change httpError logic 
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Signed-off-by: Zhang Wei <zhangwei198900@gmail.com>
 2015-04-20 23:26:56 +08:00
Alexander Morozov
d9ed316522 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>
 2015-04-20 08:13:39 -07:00
Hu Keping
f4942ed864 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>
 2015-04-20 18:14:06 +08:00
Doug Davis
b1d8ae3824 Merge pull request #12358 from ZJU-SEL/remove_job_from_tag 
remove job from tag
 2015-04-19 16:02:28 -04:00
Simei He
99f6309b97 remove job from tag 
Signed-off-by: Simei He <hesimei@zju.edu.cn>
 2015-04-19 18:36:56 +08:00
Brian Goff
055c6dbaef Merge pull request #12490 from LK4D4/carry_12396 
remove job from pull and import
 2015-04-17 15:26:30 -04:00
Simei He
6e38a53f96 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>
 2015-04-17 09:55:02 -07:00
Antonio Murdaca
a0bf80fe03 Remove builtins 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-17 14:27:38 +02:00
Antonio Murdaca
e41192a3f8 Remove job from restart 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-16 18:50:24 +02:00
Brian Goff
de923f59b3 Merge pull request #12253 from calavera/remove_job_from_start_and_create 
Remove engine.Job from Start and Create
 2015-04-15 21:49:25 -04:00
David Calavera
767df67e31 Decode container configurations into typed structures. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-04-15 10:22:07 -07:00