p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
15,316 Commits 2 Branches 295 Tags
ba0c92d010136e401d4441aaecb05a2e4e0bcdcb
Commit Graph

809 Commits

Author SHA1 Message Date
Arnaud Porterie
f6876820fd Merge pull request #11844 from jbarbier/cgroup-parent-42 
Adding cgroup-parent option for docker build
Upstream-commit: e960e4bb129de15b3beb7da37421e32af8dccf2f
Component: engine
 2015-05-05 14:46:47 -07:00
Adria Casas
3f873c25b6 Rename int64Value to int64ValueOrZero. 
Signed-off-by: Adria Casas <adriacasas88@gmail.com>
Upstream-commit: a2c76912e04b087233577b46f96f446c5d13e2de
Component: engine
 2015-05-05 08:54:28 +02:00
Tibor Vass
da6438ab18 Merge pull request #10766 from cpuguy83/stats_pull_once 
Allow pulling stats once and disconnecting.
Upstream-commit: 91fb4d672a8536d2f0437aeeb2dfc7b9e51aac16
Component: engine
 2015-05-04 22:28:01 -07:00
Phil Estes
e79952cb66 Merge pull request #12718 from Microsoft/10662-mkdirall 
Windows: Volume path aware mkdirall
Upstream-commit: 3fcf387d52676d9c4f24b7a4d2f48c4992d7485f
Component: engine
 2015-05-04 15:51:56 -04:00
Phil Estes
a4975c3e58 Merge pull request #12937 from runcom/daemon-as-a-service 
Refactor server to use daemon as the service layer in controllers
Upstream-commit: 4895a887e2e88699a07ab6fea9113a5ff13d2450
Component: engine
 2015-05-04 13:03:28 -04:00
Brian Goff
9531505238 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>
Upstream-commit: f3023a93d1a0a96a7312de441a550c758ac0c17d
Component: engine
 2015-05-04 10:49:13 -04:00
HuKeping
ad3d66108b Feature: option for disable OOM killer 
Add cgroup support for disable OOM killer.

Signed-off-by: Hu Keping <hukeping@huawei.com>
Upstream-commit: a4a924e1b6c50f0f02460489259d73468a6c282e
Component: engine
 2015-05-04 21:11:29 +08:00
Doug Davis
703dea0308 Merge pull request #12735 from jmzwcn/patch-1 
Remove empty line after client.CmdInspect docstring
Upstream-commit: 15313dfdf38ecaa0dc93005f1c3824491fbb3b96
Component: engine
 2015-05-03 11:10:14 -04:00
jmzwcn
c5e187ce2d 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>
Upstream-commit: 28547a1a3a594ee24b4cb51a89d9fce630c8c066
Component: engine
 2015-05-03 17:23:18 +08:00
Antonio Murdaca
d6d6bba166 Refactor server to use daemon as the service layer in controllers 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: c7cfdb65aa43a4561adb919d170bba5e86d69bee
Component: engine
 2015-05-02 03:12:58 +02:00
Alexander Morozov
57496db316 Merge pull request #12924 from runcom/provide-struct-to-cli-stream 
Provide a struct to configure cli streaming
Upstream-commit: 393678474f7364b44e7b26b5e9a99aabf1762724
Component: engine
 2015-05-01 15:10:58 -07:00
Antonio Murdaca
cad4e1508b Provide a struct to configure cli streaming 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: d9639409fd54ee6955793474fa9a5bac1e583c77
Component: engine
 2015-05-01 20:23:44 +02:00
Qiang Huang
96a8cfc20a fix docker rm name issue 
Addresses https://github.com/docker/docker/issues/12308

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 79f13d1497b073113f713e903e934dafcf78c42f
Component: engine
 2015-05-01 22:26:40 +08:00
Doug Davis
43117afa87 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>
Upstream-commit: 68ee5bdf96f1653d73e29329506949a765398a40
Component: engine
 2015-04-30 14:43:14 -07:00
jhowardmsft
8259fbca23 Windows: mkdirall volume path aware 
Signed-off-by: jhowardmsft <jhoward@microsoft.com>
Upstream-commit: 86d1223a29907ffc6afba557b5138cfad7816bb4
Component: engine
 2015-04-30 11:59:42 -07:00
Antonio Murdaca
016ac4bf61 Remove engine mechanism 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 531f4122bdcd4de289f613a5ef010f4c1989f098
Component: engine
 2015-04-30 01:35:16 +02:00
Brian Goff
93d4e49319 Merge pull request #12870 from coolljt0725/fix_rename_help 
Fix docker rename help not consistent with other commands
Upstream-commit: f2f8e4c5c9c89e3df59cb3123fa30a0eb6592ddb
Component: engine
 2015-04-29 09:14:03 -04:00
Lei Jitang
b38b865566 Fix docker rename help not consistent with other commands 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 0e752adf550ef4891e40889ea92e12ec3d775a00
Component: engine
 2015-04-29 19:37:20 +08:00
Qiang Huang
d6802adb29 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>
Upstream-commit: c7812f01c7269c713c2243fe8a69b55cdb77b72a
Component: engine
 2015-04-28 18:51:04 +08:00
Antonio Murdaca
954f940156 Small if err cleaning 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 844538142d95c1b7dda1bb2903179510105fe9b5
Component: engine
 2015-04-27 21:50:33 +02:00
Tibor Vass
6a2c490ba2 Merge pull request #12333 from Mashimiao/clean-up-viz 
Clean up viz code
Upstream-commit: 572ba9cb407f3c383367c67b1a6d3da612ece4a7
Component: engine
 2015-04-27 14:13:03 -04:00
He Simei
5d5dd54df9 remove useless http call from export 
Signed-off-by: He Simei <hesimei@zju.edu.cn>
Upstream-commit: 6d9439c627e36349679249d991400da45eb75587
Component: engine
 2015-04-27 12:41:03 +08:00
Julien Barbier
7a068916d5 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>
Upstream-commit: bb411939989dabb56eb604b9a873d1dfbf0646ef
Component: engine
 2015-04-25 15:25:51 -04:00
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
Ma Shimiao
8910bbac66 clean up viz code 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Upstream-commit: 66acef865d7504605572b0d9566d9e250cf19bc2
Component: engine
 2015-04-24 08:38:14 +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