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

1462 commits

Author SHA1 Message Date
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
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
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
Sebastiaan van Stijn
0fb23fb6bc Merge pull request #27871 from yongtang/10282016-docs-max-concurrent-downloads-uploads 
Update docs for dockerd.md about `max-concurrent-downloads/max-concurrent-uploads`
 2016-10-28 14:32:48 -07:00
Yong Tang
1f660febbd Update docs for dockerd.md about max-concurrent-downloads/max-concurrent-uploads 
It seems that `max-concurrent-downloads` and `max-concurrent-uploads`
are supported in Windows for `config.json`. Though that was not
mentioned in the docs for dockerd.md.

This fix adds the following to the example `config.json` file for Windows:
```
    "max-concurrent-downloads": 3,
    "max-concurrent-uploads": 5,
```

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-10-28 14:11:18 -07:00
Sebastiaan van Stijn
beccf0f898 Merge pull request #27863 from Microsoft/jjh/clarifyworkdir 
Windows: Clarify WORKDIR in docs
 2016-10-28 14:07:03 -07:00
Lily Guo
2f58494ae6 Service create --group param 
--group-add was used for specifying groups for both service create
and service update. For create it was confusing since we don't have
an existing set of groups. Instead I added --group to create, and
moved --group-add to service update only, like --group-rm
This deals with issue 27646

Signed-off-by: Lily Guo <lily.guo@docker.com>

Update flag documentation

Specify that --group, --group-add and --groupd-rm refers to
supplementary user groups

Signed-off-by: Lily Guo <lily.guo@docker.com>

Fix docs for groups and update completion scripts

Signed-off-by: Lily Guo <lily.guo@docker.com>
 2016-10-28 13:26:31 -07:00
Misty Stanley-Jones
010ee5a8e8 Merge pull request #27819 from lixiaobing10051267/masterDirInvalid 
fill all the rest invalid address because no related directory
 2016-10-28 13:05:18 -07:00
Misty Stanley-Jones
cfe7cb0292 Merge pull request #27815 from lixiaobing10051267/masterDocsDel 
fill the complete address because of no userguide directory
 2016-10-28 13:04:04 -07:00
Vincent Demeester
f860289131 Merge pull request #27369 from cezarsa/hc 
Add --health-* flags to service create and update
 2016-10-28 21:59:52 +02:00
Josh Horwitz
1a149a0ea5 Adds container health support to docker ps filter 
Signed-off-by: Josh Horwitz <horwitzja@gmail.com>
 2016-10-28 15:43:04 -04:00
Vincent Demeester
12cae3a590
Add StatsFormat to the config.json file 
As for `ps`, `images`, `network ls` and `volume ls`, this makes it
possible to define a custom default format.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-10-28 11:48:25 -07:00
John Howard
744cf2c971 Update examples in builder.md 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-10-28 11:36:11 -07:00
John Howard
e87c6dd3e4 Windows: Clarify WORKDIR in docs 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-10-28 10:28:38 -07:00
Vincent Demeester
87ddc8b0a5 Merge pull request #26837 from AkihiroSuda/newtmpfs 
api: add TypeTmpfs to api/types/mount
 2016-10-28 19:21:26 +02:00
Cezar Sa Espinola
7bd2611789
Add --health-* commands to service create and update 
A HealthConfig entry was added to the ContainerSpec associated with the
service being created or updated.

Signed-off-by: Cezar Sa Espinola <cezarsa@gmail.com>
 2016-10-28 15:19:08 -02:00
yuexiao-wang
2d99344d3c Add --format to man and fix some typos 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2016-10-28 22:31:20 +08:00
yuexiao-wang
4d2af44300 Fix some typos 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2016-10-29 00:46:16 +08:00
Akihiro Suda
18768fdc2e api: add TypeTmpfs to api/types/mount 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2016-10-28 08:38:32 +00:00
Vincent Demeester
89011970e0 Merge pull request #27654 from gaocegege/add-quiet-mode-to-service-ps 
Add -q option to `docker service ps`
 2016-10-28 05:21:03 +02:00
lixiaobing10051267
7d1eb5ea1b fill all the rest invalid address because no related directory 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
 2016-10-28 11:12:54 +08:00
lixiaobing10051267
97c00f9754 fill the complete address because of no userguide directory 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
 2016-10-28 10:57:37 +08:00