Commit Graph

838 Commits

Author SHA1 Message Date
457e448f9f Remove some redundant consts
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 6b412d4fd30afe2a24f66839a6c26fbc94b01493
Component: engine
2016-11-02 16:42:42 +08:00
63adf4cb5d Merge pull request #26683 from yuexiao-wang/update-inspect
Modify short and flags for docker inspect
Upstream-commit: a13fc3fd367437a779d3562093bbc9f499816733
Component: engine
2016-10-31 13:39:59 -07:00
613dd5861e Modify short and flags for docker inspect
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: cc03984e17f77ce1ad3f41e815a616405b6ffc76
Component: engine
2016-10-31 18:11:25 +08:00
34bac6f06e Fix bunch of typos
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: e6866492c4492db3bb9546afa2fbaed20f4c1883
Component: engine
2016-10-29 15:03:26 +08:00
0be42defbd Merge pull request #24698 from jhorwit2/jah/clist-health-filter-format
Fixes #24022 - Adds container health support to docker ps filter/format
Upstream-commit: 515e5dade7a006dbd2c42880f1af695da22ece60
Component: engine
2016-10-29 06:56:06 +02:00
4e9b278e51 Merge pull request #27840 from estesp/add-userns-status-to-info
Add "userns" to `docker info` security options output
Upstream-commit: 1fb9c4e89188f48c79889f6128fdec865bed467d
Component: engine
2016-10-29 02:58:34 +02:00
68b003581b 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>
Upstream-commit: ae74092e450f1f2665b90257b65513cc0c19702f
Component: engine
2016-10-28 19:16:57 -04:00
2f6eac7cd7 Merge pull request #27851 from yuexiao-wang/add-format
Add --format to man and fix some typos
Upstream-commit: 9ddbaddedc13ce8be238331176a22be55eb1808f
Component: engine
2016-10-28 23:58:20 +02:00
6c60350948 Merge pull request #27871 from yongtang/10282016-docs-max-concurrent-downloads-uploads
Update docs for dockerd.md about `max-concurrent-downloads/max-concurrent-uploads`
Upstream-commit: 0fb23fb6bc59f406a7e532385f27e31374260966
Component: engine
2016-10-28 14:32:48 -07:00
ab40031c77 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>
Upstream-commit: 1f660febbd114f40e5232ba3137ac4f912ab53cc
Component: engine
2016-10-28 14:11:18 -07:00
ed2e1f6e2b 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>
Upstream-commit: 2f58494ae6e796325329f849cf547bcf94bb68e3
Component: engine
2016-10-28 13:26:31 -07:00
b0519ec516 Merge pull request #27815 from lixiaobing10051267/masterDocsDel
fill the complete address because of no userguide directory
Upstream-commit: cfe7cb0292eb9654fba13d380ead30f2525d09df
Component: engine
2016-10-28 13:04:04 -07:00
86df94b9ba Merge pull request #27369 from cezarsa/hc
Add --health-* flags to service create and update
Upstream-commit: f860289131e36ad2dde5ebe60d15a86fd97934b5
Component: engine
2016-10-28 21:59:52 +02:00
5b866e7f54 Adds container health support to docker ps filter
Signed-off-by: Josh Horwitz <horwitzja@gmail.com>
Upstream-commit: 1a149a0ea59b6653e0ba14599476bfe19c4c33f3
Component: engine
2016-10-28 15:43:04 -04:00
c05d99582c 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>
Upstream-commit: 7bd2611789e6898576f7229255c238f7c1129293
Component: engine
2016-10-28 15:19:08 -02:00
92cd9574a7 Add --format to man and fix some typos
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 2d99344d3c55672e1d2805610835bf8b74cf1cfa
Component: engine
2016-10-28 22:31:20 +08:00
0bd2417b94 Fix some typos
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 4d2af4430080e9c7ed5badc465be0e8f04b4b1a4
Component: engine
2016-10-29 00:46:16 +08:00
ef5cf518c7 Merge pull request #27654 from gaocegege/add-quiet-mode-to-service-ps
Add -q option to `docker service ps`
Upstream-commit: 89011970e04614dd285ea4c3423ec7a86602488b
Component: engine
2016-10-28 05:21:03 +02:00
810cfad17d fill the complete address because of no userguide directory
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: 97c00f9754271bbc03c6309793482e11920e4f3e
Component: engine
2016-10-28 10:57:37 +08:00
0df16199a0 fixes #27643
Signed-off-by: Ce Gao <ce.gao@outlook.com>
Upstream-commit: 9efa472bd1cfe1274248612c952937334ea3e252
Component: engine
2016-10-28 08:02:57 +08:00
c04a526463 Merge pull request #26988 from thaJeztah/remove-service-update-name-flag
Remove service update name flag
Upstream-commit: 3a3a87bff8dcc2f880e849e186bda02a8cee8d90
Component: engine
2016-10-27 16:55:47 -07:00
bf6f304cc7 Add --env-file flag to docker create service
This fix tries to address the issue in 24712 and add
`--env-file` file to `docker create service`.

Related documentation has been updated.

An additional integration has been added.

This fix fixes 24712.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: ee3105c68a94411f2c019324bd71c56e9663a80d
Component: engine
2016-10-27 11:48:32 -07:00
4cadaabc3f Remove --name flag from service update
The --name flag was inadvertently added to
docker service update, but is not supported,
as it has various side-effects (e.g., existing
tasks are not renamed).

This removes the flag from the service update
command.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 047e44eeb186a8bde41765a44c5966a150fa84f3
Component: engine
2016-10-27 09:16:29 -07:00
3affb6aba8 Implementing support for --cpu-rt-period and --cpu-rt-runtime so that
containers may specify these cgroup values at runtime. This will allow
processes to change their priority to real-time within the container
when CONFIG_RT_GROUP_SCHED is enabled in the kernel. See #22380.

Also added sanity checks for the new --cpu-rt-runtime and --cpu-rt-period
flags to ensure that that the kernel supports these features and that
runtime is not greater than period.

Daemon will support a --cpu-rt-runtime flag to initialize the parent
cgroup on startup, this prevents the administrator from alotting runtime
to docker after each restart.

There are additional checks that could be added but maybe too far? Check
parent cgroups to ensure values are <= parent, inspecting rtprio ulimit
and issuing a warning.

Signed-off-by: Erik St. Martin <alakriti@gmail.com>
Upstream-commit: 56f77d5ade945b3b8816a6c8acb328b7c6dce9a7
Component: engine
2016-10-26 11:33:06 -04:00
b63aa05761 Merge pull request #27702 from tonistiigi/net-builder0
add --network option for docker build
Upstream-commit: 62ff3e90835c3c572051afbbbac53303e57a5c89
Component: engine
2016-10-25 21:50:33 -07:00
29210e7b5b add --network option for docker build
Signed-off-by: sandyskies <chenmingjie0828@163.com>
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 60813af7aeea819ca228b6b1d6f4888969b95da3
Component: engine
2016-10-25 10:25:36 -07:00
a3de26010f Merge pull request #27525 from AkihiroSuda/prune-network-cluster
add `docker network prune`
Upstream-commit: 11cd64f0dce35ad897ede7eb29babdc487e99617
Component: engine
2016-10-25 09:02:28 -07:00
4fb550ce0f add docker network prune
`docker network prune` prunes unused networks, including overlay ones.
`docker system prune` also prunes unused networks.

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 7e24c16086a9a4f38e241e51837f2be4877c04a6
Component: engine
2016-10-25 06:43:54 +00:00
0780040018 update docs/reference/commandline/network_inspect.md
The following sentences (introduced in v1.11 via #21160) were misleading for Swarm mode services (>= v1.12)

  For networks backed by multi-host network driver, such as Overlay,
  this command also shows the container endpoints in other hosts in the
  cluster. These endpoints are represented as "ep-{endpoint-id}" in the output.

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 2c288e60db1ecd47842e92432fbe0ab367033374
Component: engine
2016-10-25 02:46:59 +00:00
9a299b360f Make experimental a runtime flag
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 7781a1bf0fef748877326632b88e92fbf3c90daa
Component: engine
2016-10-24 15:20:01 -07:00
efd79c3c13 Merge pull request #27578 from yuexiao-wang/update-network
Fix the incorrect links in the document about network and service
Upstream-commit: 96efb2cf25394b1589aced296e27f3928dc9c229
Component: engine
2016-10-24 08:05:04 -07:00
6eaaf1f7ae Fix the incorrect links in the document about network and service
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 49e8c3d8d0c24a4a550732e4c4377646330e2e44
Component: engine
2016-10-24 22:01:38 +08:00
4e59434f98 Merge pull request #27546 from yuexiao-wang/fix-subtitle
Update the subtitle for stack ps
Upstream-commit: b2786a388817784e8abde3da1b67e50b58cc8b7a
Component: engine
2016-10-23 22:28:43 -07:00
39b84d5fbe Add force option to service update
Currently, there's no way to restart the tasks of a service without
making an actual change to the service. This leads to us giving awkward
workarounds as in
https://github.com/docker/docker.github.io/pull/178/files, where we tell
people to scale a service up and down to restore balance, or make
unnecessary changes to trigger a restart.

This change adds a --force option to "docker service update", which
forces the service to be updated even if no changes require that.

Since rolling update parameters are respected, the user can use
"docker service --force" to do a rolling restart. For example, the
following is supported:

   docker service update --force --update-parallelism 2 \
   --update-delay 5s myservice

Since the default value of --update-parallelism is 1, the default
behavior is to restart the service one task at a time.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: c9fdf9abf8d6443598808809b900d96e04adfcb1
Component: engine
2016-10-21 17:43:27 -07:00
bf7ee5e9d0 Merge pull request #27575 from yuexiao-wang/fix-cli-link
Modify the links for docker container commands
Upstream-commit: 78dae2a037e87825381ec4efb9fb47491f41e7e4
Component: engine
2016-10-21 11:15:57 -07:00
e924961e4f Update the subtitle for stack ps
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 98fb1644c2b9bf7d808a3d75de5997f87b9c60e6
Component: engine
2016-10-21 16:47:21 +08:00
f2a96efba0 fix wrong location for network related doc files
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: c0260766588ed4c2c82cca2384d8ae30ac10b362
Component: engine
2016-10-21 11:27:24 +08:00
593f92302a Merge pull request #27564 from mlaventure/add-networks-format-to-ps
Add Networks placeholder to ps --format
Upstream-commit: d98f995d7d191f8ae7ab0c442eed92f67faa305b
Component: engine
2016-10-20 18:43:46 -07:00
63025d814f Merge pull request #27560 from mstanleyjones/sync_docs_master
Sync docker/docker refs with files mistakenly edited in docker.github.io repo
Upstream-commit: 790629c02168f712884f181a9392df36de7abc20
Component: engine
2016-10-20 13:42:40 -07:00
1943bac573 Merge pull request #22337 from allencloud/support-insecure-registry-config-reload
support insecure registry in configuration reload
Upstream-commit: c18fbc945514f32379ac2638c3f4fff67e9aa040
Component: engine
2016-10-20 11:41:23 -07:00
b2f3f16f09 Sync docker/docker refs with files mistakenly edited in docker.github.io repo
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: 3b36f02c03ec050aa46f9a01cd2d6c60ffd93652
Component: engine
2016-10-20 10:51:30 -07:00
9f68513228 Modify the links for docker container commands
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: e5e1729698404bd1789b1d4d404fd899cb1ddf08
Component: engine
2016-10-20 22:52:20 +08:00
10784ca4ce Add Networks placeholder to ps --format
Passing {{.Networks}} to the format parameter will prompt ps to
display all the networks the container is connected to.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: a43d9bb9c399958e64deb5e827e6716ad1ef0e41
Component: engine
2016-10-20 07:41:56 -07:00
7fbcf96052 Merge pull request #24594 from jwendell/24355
Exec: Add ability to set environment variables
Upstream-commit: 1b677816f50d09650044a7dbda3807bddffdad8d
Component: engine
2016-10-20 13:26:48 +02:00
64bb155742 Merge pull request #27534 from yuexiao-wang/fix-link-image-repo
Update the link for sharing images via repositories
Upstream-commit: adaea58b205e8499c09b6ff35a912fd085ac890f
Component: engine
2016-10-19 20:37:22 -07:00
146d61be30 support insecure registry in configuration reload
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 582803f00addb597efbfc64a5143f2f848b76ae6
Component: engine
2016-10-20 07:54:31 +08:00
4fa4bc496e Update the link for sharing images via repositories
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: e1c849cc576cf2ee62fb91548aafb74f1a017d2c
Component: engine
2016-10-20 01:39:41 +08:00
5af5baf527 Merge pull request #27438 from yuexiao-wang/update-volume
Update the link for understand data volumes
Upstream-commit: 2bf4a39161d0280066459d1059afbeb20e4eec8d
Component: engine
2016-10-19 09:56:05 -07:00
74ef1fda6a Update the link for understand data volumes
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: b1c2d425e167e6f939a192c87a7a40f449f07e32
Component: engine
2016-10-20 01:25:59 +08:00
f6f92180d7 Merge pull request #23036 from yongtang/22471-daemon-shutdown-timeout-daemon
Add config parameter to change stop timeout during daemon shutdown
Upstream-commit: 4a4f028c47046d9b166d35c631ae794000385b70
Component: engine
2016-10-19 18:47:50 +02:00