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

439 commits

Author SHA1 Message Date
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
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
Antonio Murdaca
531f4122bd Remove engine mechanism 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-30 01:35:16 +02: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
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
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
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
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
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
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
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
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
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
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
Doug Davis
18c9b6c645 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>
 2015-04-20 13:05:24 -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
Ankush Agarwal
edf541c22b gofmt whole directory 
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
 2015-04-20 01:08:51 -07:00
Arnaud Porterie
ae5cf30c7c Add -H|--human flag to docker history 
Add a flag to print sizes and dates in human readable format.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-04-16 08:38:18 -07:00
Dave Henderson
dcff07d03d Adding a verbose time option to output formatted timestamps 
Fixes #11413

Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
 2015-04-16 08:34:50 -07:00
Alexander Morozov
83d809f3d2 Merge pull request #12388 from xiaods/issue-12373 
client.StatusError don't be returned as a pointer
 2015-04-15 17:34:38 -07:00
Deshi Xiao
bae3023eef client.StatusError don't be returned as a pointer 
closes #12373

1. remove & from client.StatusError
2. remove * from Error method

Signed-off-by: Deshi Xiao <xiaods@gmail.com>
 2015-04-16 01:27:07 +08:00
Qiang Huang
f8dc7e8754 Add cpuset-mems support for docker build 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-04-15 09:34:12 +08:00
Phil Estes
5395cdcae5 Merge pull request #12269 from kostickm/12251-remove-not-empty-check 
Remove container name not empty check
 2015-04-14 17:55:13 -04:00
Megan Kostick
98f857772f Remove container name not empty check 
Signed-off-by: Megan Kostick <mkostick@us.ibm.com>
 2015-04-14 11:27:06 -07:00
Alexander Morozov
5be5749d54 Merge pull request #12370 from buddhamagnet/11593-api-client-docs 
add docs for DockerCli and NewDockerCli fixes #11593
 2015-04-14 11:00:19 -07:00
buddhamagnet
69747b3c1e add docs for DockerCli and NewDockerCli 
Signed-off-by: buddhamagnet <buddhamagnet@gmail.com>
 2015-04-14 18:33:11 +01:00
Antonio Murdaca
c30a55f14d Refactor utils/utils, fixes #11923 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-14 01:37:36 +02:00
Michael Crosby
6fa2a1e486 Merge pull request #12172 from ZJU-SEL/change_stats 
change memory usage display
 2015-04-13 13:32:45 -07:00
Michael Crosby
75b911eb3c Merge pull request #12222 from chenhanxiao/cp-support-colon 
cp: add support for copy filename with ":"
 2015-04-13 13:09:12 -07:00
jianbosun
d6d8f45b04 change memory usage display 
using standard unix postfixes add unit test for display
also change doc for memory usage display change
for example GiB will be GB

Signed-off-by: Sun Jianbo <wonderflow@zju.edu.cn>
 2015-04-11 20:04:34 +08:00
Michael Crosby
bae3273ef4 Merge pull request #12259 from duglin/RemoveJobTop 
Remove Job from `docker top`
 2015-04-10 10:56:01 -07:00
Chen Hanxiao
5037297388 cp: add support for copy filename with ":" 
We use ":" as separator CONTAINER:PATH.
This patch enables copy filename with ":"
to host.

Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
 2015-04-10 00:08:05 -04:00
Tibor Vass
fa2ace00a8 Rebase + some fixes 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2015-04-09 21:29:42 -04:00
David Young
bf57339527 Add comment column in docker history command output 
Signed-off-by: David Young <yangboh@cn.ibm.com>
 2015-04-09 21:29:41 -04:00