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

1766 commits

Author SHA1 Message Date
Bharath Thiruveedula
94def48878 Removing the SetDaemon method 
Signed-off-by: Bharath Thiruveedula <bharath_ves@hotmail.com>
 2015-05-07 22:25:13 +05:30
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
Qiang Huang
5a6db4fd44 a few cleanups for client output 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-05-05 15:59:17 +08: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
Phil Estes
3fcf387d52 Merge pull request #12718 from Microsoft/10662-mkdirall 
Windows: Volume path aware mkdirall
 2015-05-04 15:51:56 -04:00
Phil Estes
4895a887e2 Merge pull request #12937 from runcom/daemon-as-a-service 
Refactor server to use daemon as the service layer in controllers
 2015-05-04 13:03:28 -04: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
HuKeping
a4a924e1b6 Feature: option for disable OOM killer 
Add cgroup support for disable OOM killer.

Signed-off-by: Hu Keping <hukeping@huawei.com>
 2015-05-04 21:11:29 +08:00
Doug Davis
15313dfdf3 Merge pull request #12735 from jmzwcn/patch-1 
Remove empty line after client.CmdInspect docstring
 2015-05-03 11:10:14 -04:00
jmzwcn
28547a1a3a Remove empty line after client.CmdInspect docstring #12706 
Signed-off-by: Daniel Zhang <jmzwcn@gmail.com>

Remove empty line after client.CmdInspect docstring

fix #12706
Signed-off-by: Daniel Zhang <jmzwcn@gmail.com>

Remove empty line after client.CmdInspect docstring

fix #12706
Signed-off-by: Daniel Zhang <jmzwcn@gmail.com>
 2015-05-03 17:23:18 +08: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
Alexander Morozov
393678474f Merge pull request #12924 from runcom/provide-struct-to-cli-stream 
Provide a struct to configure cli streaming
 2015-05-01 15:10:58 -07:00
Antonio Murdaca
d9639409fd Provide a struct to configure cli streaming 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-05-01 20:23:44 +02:00
Qiang Huang
79f13d1497 fix docker rm name issue 
Addresses https://github.com/docker/docker/issues/12308

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-05-01 22:26:40 +08:00
Doug Davis
68ee5bdf96 Don't wrap 'cp' help too soon. 
Minor thing but docker cp --help was:
Copy files/folders from a PATH on the container to a HOSTDIR on the host
running the command. Use '-' to write the data
as a tar file to STDOUT.

This changes it to:
Copy files/folders from a PATH on the container to a HOSTDIR on the host
running the command. Use '-' to write the data as a tar file to STDOUT.

The \n made the output look funky.

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-04-30 14:43:14 -07:00
jhowardmsft
86d1223a29 Windows: mkdirall volume path aware 
Signed-off-by: jhowardmsft <jhoward@microsoft.com>
 2015-04-30 11:59:42 -07:00
Antonio Murdaca
531f4122bd Remove engine mechanism 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-30 01:35:16 +02:00
Doug Davis
534ed8c2d4 Remove use of "DEBUG" env var from CLI and decouple DEBUG from --log-level 
Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-04-29 06:20:33 -07:00
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