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

1581 commits

Author SHA1 Message Date
Misty Stanley-Jones
c16860b649 Merge pull request #28029 from tealtail/27994-add-service-ls-truncate-opt 
remove COMMAND column from `service ls` output. closes #27994
 2016-11-07 14:39:16 -08:00
Vincent Demeester
89ef0f2151 Merge pull request #25983 from jhorwit2/jah/ps-refactor 
Add -a option to service/node ps
 2016-11-07 17:33:10 +01:00
Brian Goff
e00e7e9582 Merge pull request #28059 from lixiaobing10051267/masterDockerInfo 
Rectify Images display information for docker 1.10.3
 2016-11-07 09:05:34 -05:00
Vincent Demeester
5b2cedf11e Merge pull request #28102 from yongtang/11052016-docs-build-Step 
Update docs for the output of `docker build` (Step 1/...)
 2016-11-07 09:28:08 +01:00
Vincent Demeester
b8140249b4 Merge pull request #28075 from yongtang/27958-docs-follow-up 
Follow up docs update for PR #27958
 2016-11-07 09:21:40 +01:00
Alicia Lauerman
6ad95c4dad remove COMMAND column from service ls output. closes #27994 
Signed-off-by: Alicia Lauerman <alicia@eta.im>
 2016-11-06 13:32:44 -05:00
Josh Horwitz
139fff2bf0 Add -a option to service/node ps 
Signed-off-by: Josh Horwitz <horwitzja@gmail.com>
 2016-11-06 07:40:39 -05:00
Yong Tang
7d529492cc Update docs for the output of docker build (Step 1/...) 
PR 24978 adds hint of of progress to the output of `docker build`
for 1.13, in the format of
```
Step 1/5 ...
...
Step 2/5 ...
...
```

Though some of the docs hasn't been updated.

This fix did a grep in docs and updated the related places.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-11-05 19:05:19 -07:00
yupeng
c09277d5c3 Align arg with other cli 
Signed-off-by: yupeng <yu.peng36@zte.com.cn>
 2016-11-05 13:47:02 +08:00
Yong Tang
f82f8eeaf8 Follow up docs update for PR 27958 
This fix is a follow up for any additional docs update for PR 27958.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-11-04 20:18:40 -07:00
Darren Stahl
4e15420b9b Windows: Add cpu count option 
Signed-off-by: Darren Stahl <darst@microsoft.com>
 2016-11-04 13:38:50 -07:00
Justin Cormack
d7d0bc1d58 Merge pull request #28070 from runcom/seccomp-path-fixes 
Seccomp path fixes
 2016-11-04 20:36:35 +00:00
Misty Stanley-Jones
da499758b8 Merge pull request #28064 from lixiaobing10051267/masterInstallation 
modify URL because installation directory removed
 2016-11-04 12:06:37 -07:00
Antonio Murdaca
e6ec90608c
docs: update for new secopts struct in GET /info 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-11-04 19:25:51 +01:00
Yong Tang
846baf1fd3 Add --cpus flag to control cpu resources 
This fix tries to address the proposal raised in 27921 and add
`--cpus` flag for `docker run/create`.

Basically, `--cpus` will allow user to specify a number (possibly partial)
about how many CPUs the container will use. For example, on a 2-CPU system
`--cpus 1.5` means the container will take 75% (1.5/2) of the CPU share.

This fix adds a `NanoCPUs` field to `HostConfig` since swarmkit alreay
have a concept of NanoCPUs for tasks. The `--cpus` flag will translate
the number into reused `NanoCPUs` to be consistent.

This fix adds integration tests to cover the changes.

Related docs (`docker run` and Remote APIs) have been updated.

This fix fixes 27921.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-11-04 09:43:10 -07:00
Justin Cormack
efa5e85cf7 Merge pull request #26276 from runcom/seccomp-conf 
daemon: add a flag to override the default seccomp profile
 2016-11-04 15:45:30 +00:00
Vincent Demeester
b4e14c6edc Merge pull request #27857 from vasil-yordanov/docker-service-hostname-2 
Adding the hostname option to docker service command
 2016-11-04 15:22:55 +01:00
lixiaobing10051267
56cca92922 modify URL because installation directory removed 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
 2016-11-04 16:40:15 +08:00
lixiaobing10051267
1a43f5c396 Rectify Images display information for docker 1.10.3 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
 2016-11-04 13:04:20 +08:00
Misty Stanley-Jones
a89f8f2d93 Merge pull request #28053 from gdevillele/pr_fix_docs_frontmatter_keywords_2 
fix frontmatter keywords value type (string, instead of []string) in /docs/reference/
 2016-11-03 17:16:40 -07:00
Sebastiaan van Stijn
6b3b9d53e1 Merge pull request #28021 from YuPengZTE/devString 
Add “” for String
 2016-11-03 17:03:56 -07:00
Gaetan de Villele
248c699ec8 fix frontmatter keywords value type (string, instead of []string) in /docs/reference 
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
 2016-11-03 15:48:30 -07:00
Sebastiaan van Stijn
b2641bd9df Merge pull request #27910 from dperny/node_ip_in_raft 
Auto-detect node IP address
 2016-11-03 10:30:55 -07:00
Drew Erny
9bcf623719 added node ip autodetection 
Manager now auto-detects the address that an agent connects to the cluster
from and stores it. This is useful for many kinds of internal cluster
management tools.

Signed-off-by: Drew Erny <drew.erny@docker.com>
 2016-11-03 08:10:14 -07:00
Nikolay Milovanov
b222aa1a58 Adding the hostname option to docker service command 
Signed-off-by: Nikolay Milovanov <nmil@itransformers.net>
 2016-11-03 10:02:14 +00:00
yupeng
167daf5060 Add for String 
Signed-off-by: yupeng <yu.peng36@zte.com.cn>
 2016-11-03 16:15:26 +08:00
Akihiro Suda
273eeb813c cli: add --mount to docker run 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2016-11-03 07:08:59 +00:00
Vincent Demeester
9a6f26ce55 Merge pull request #27973 from yuexiao-wang/add-stack 
Add stack service and fix typos
 2016-11-02 23:04:54 -07:00
yuexiao-wang
0a56e81ca4 Add stack service and fix typos 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2016-11-03 19:21:27 +08:00
Sebastiaan van Stijn
d83f56ee5f Merge pull request #27979 from allencloud/more-specific-in-service-scale-description 
add replicated in service scale command description
 2016-11-02 18:01:59 -07:00
Gaetan de Villele
8d61e36edc fix frontmatter in reference md files 
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
 2016-11-02 14:23:27 -07:00
Antonio Murdaca
b237189e6c
daemon: add a flag to override the default seccomp profile 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-11-02 21:41:29 +01:00
allencloud
002262d6f5 node rm can be applied on not only active node 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-11-02 17:22:04 +08:00
allencloud
b9fdbbad61 add replicated in service scale command description 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-11-02 16:15:57 +08:00
Sebastiaan van Stijn
85da2562f4 Merge pull request #27862 from crosbymichael/metrics-docs 
Add metrics docs to cli reference
 2016-11-02 00:41:14 -07:00
Sebastiaan van Stijn
2c43762cf2 Merge pull request #27942 from yuexiao-wang/remove-const 
Remove some redundant consts
 2016-11-01 20:43:50 -07:00
yuexiao-wang
6b412d4fd3 Remove some redundant consts 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2016-11-02 16:42:42 +08:00
Sebastiaan van Stijn
b998088145 Merge pull request #27864 from vdemeester/add-statsformat-to-configfile 
Add StatsFormat to the config.json file
 2016-11-01 20:32:13 -07:00
Michael Crosby
22f3e43e9a Merge pull request #22641 from cpuguy83/build_finalization 
Adds ability to flatten image after build
 2016-11-01 14:30:18 -07:00
Brian Goff
362369b4bb Adds ability to squash image after build 
Allow built images to be squash to scratch.
Squashing does not destroy any images or layers, and preserves the
build cache.

Introduce a new CLI argument --squash to docker build
Introduce a new param to the build API endpoint `squash`

Once the build is complete, docker creates a new image loading the diffs
from each layer into a single new layer and references all the parent's
layers.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2016-11-01 13:41:59 -04:00
Addam Hardy
f150f42009 Convert Unused ARG error to warning 
Signed-off-by: Addam Hardy <addam.hardy@gmail.com>
 2016-10-31 21:42:50 -05:00
Michael Crosby
66c2549be3 Add metrics docs to cli reference 
Fixes #27843

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-10-31 15:34:52 -07:00
Sebastiaan van Stijn
a13fc3fd36 Merge pull request #26683 from yuexiao-wang/update-inspect 
Modify short and flags for docker inspect
 2016-10-31 13:39:59 -07:00
yuexiao-wang
cc03984e17 Modify short and flags for docker inspect 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2016-10-31 18:11:25 +08:00
Qiang Huang
e6866492c4 Fix bunch of typos 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2016-10-29 15:03:26 +08:00
Vincent Demeester
515e5dade7 Merge pull request #24698 from jhorwit2/jah/clist-health-filter-format 
Fixes #24022 - Adds container health support to docker ps filter/format
 2016-10-29 06:56:06 +02:00
Vincent Demeester
1fb9c4e891 Merge pull request #27840 from estesp/add-userns-status-to-info 
Add "userns" to `docker info` security options output
 2016-10-29 02:58:34 +02:00
Sebastiaan van Stijn
d69fce79f9
docs: add missing IPAM options to API docs 
Commit dd28ded711
brought in new networking features and API, but
did not document the available IPAM options.

This adds a description of those options.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-10-28 16:18:49 -07:00
Phil Estes
ae74092e45 Add "userns" to docker info security options output 
If user namespaces is enabled on the daemon, reveal that via docker info
by adding "userns" to the list of security options reported by the
info endpoint.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2016-10-28 19:16:57 -04:00
Vincent Demeester
9ddbaddedc Merge pull request #27851 from yuexiao-wang/add-format 
Add --format to man and fix some typos
 2016-10-28 23:58:20 +02:00