Commit Graph

1102 Commits

Author SHA1 Message Date
d48486e53f Add docker network connect/disconnect to non-running container
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: b5843f62f8
Component: cli
2017-06-02 00:07:23 +00:00
20429a2b3a Fix ambassador script based on SvenDowideit/dockerfiles#37
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
Upstream-commit: 5142d3a669
Component: cli
2017-06-02 00:07:23 +00:00
0ef899dd2d Add zsh completion for 'docker {build,create,run} --isolation'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 97d56a6cd8
Component: cli
2017-06-02 00:07:23 +00:00
cc265bc249 Add zsh completion for 'docker {build,create,run} --shm-size
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 323f35256b
Component: cli
2017-06-02 00:07:23 +00:00
3d71c1c6de Add zsh completion for 'docker {create,run,update} --memory-reservation'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: c7b9b776ad
Component: cli
2017-06-02 00:07:23 +00:00
c723655c6c Add zsh completion for 'docker update' + refactoring of common options between 'build', 'create', 'run', 'update'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: a8e9d1e263
Component: cli
2017-06-02 00:07:23 +00:00
8599a275e8 bash completion for docker {build,create,run} --shm-size
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: caa120d3ca
Component: cli
2017-06-02 00:07:22 +00:00
3ed7f4e30c Before that change, etcd and zookeeper would fail to instantiate
the discovery without the key being already there in the store or
created beforehand and implicitely by a 'swarm join'.

Signed-off-by: Alexandre Beslic <abronan@docker.com>
Signed-off-by: Victor Vieux <vieux@docker.com>

This PR allows to configure the discovery path using the
--discovery-opt flag (with "kv.path=path/to/nodes"). We
can point to "docker/nodes" and use the docker discovery.

If docker instances are advertising to the cluster using
the `--cluster-advertise` flag, the swarm join command
becomes unnecessary.

Signed-off-by: Alexandre Beslic <abronan@docker.com>
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 06f084a8ec
Component: cli
2017-06-02 00:07:22 +00:00
6778fba09c Allow user to choose the IP address for the container
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 0a3c040a07
Component: cli
2017-06-02 00:07:22 +00:00
25b77d7797 man page fix: remove -e/--exec-drive=native related description
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
Upstream-commit: fcd2860045
Component: cli
2017-06-02 00:07:22 +00:00
c04863fa82 Choose default-cgroup parent by cgroup driver
It's "/docker" for cgroupfs and "system.slice" for systemd.

Fix #19140

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 6a6c99d7fe
Component: cli
2017-06-02 00:07:22 +00:00
c4420f7568 Add docs for volume plugin ls/get
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: f06e5cb692
Component: cli
2017-06-02 00:07:22 +00:00
79867c6e60 bash completion for docker update
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: effe34067f
Component: cli
2017-06-02 00:07:22 +00:00
4e1591323a Updated docs for consolidated list of REX-Ray providers
This commit includes the correct project link and also
includes a consolidated list of drivers that are supported.

Signed-off-by: Clinton Kitson <clintonskitson@gmail.com>
Upstream-commit: 2ea504510c
Component: cli
2017-06-02 00:07:22 +00:00
97f4d44222 bash completion for docker daemon --cgroup-parent
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 3b7695959d
Component: cli
2017-06-02 00:07:22 +00:00
1b6d288f2e bash completion for --isolation
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 442d408fc7
Component: cli
2017-06-02 00:07:22 +00:00
f8de85734f docs: add note to volume-plugins
The /var/lib/docker directory is reserved for
docker, and should not be touched by plugins.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: d8f50e5dd1
Component: cli
2017-06-02 00:07:22 +00:00
3b64be09f1 Add zsh completion for 'docker daemon --cgroup-parent'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: b65475f61a
Component: cli
2017-06-02 00:07:22 +00:00
c4bdac84f8 Add ability to set cgroup parent for all containers
Fix #18022

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 61295a1ec8
Component: cli
2017-06-02 00:07:22 +00:00
009feff794 Add filter by event type and documentation.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 5e85f62dbc
Component: cli
2017-06-02 00:07:22 +00:00
a8ec34a0cc Fix pid=host example in documentation
The existing example didn't illustrate how to
install strace in the container. In addition,
the rhel7 image used is no longer public (and maintained)
so not a good image to use in the example.

This updates the example to use htop (strace is
not working without disabling apparmor for the container)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 31ad32c879
Component: cli
2017-06-02 00:07:22 +00:00
7c4710c371 Implement configurable detach key
Implement configurable detach keys (for `attach`, exec`, `run` and
`start`) using the client-side configuration

- Adds a `--detach-keys` flag to `attach`, `exec`, `run` and `start`
  commands.
- Adds a new configuration field (in `~/.docker/config.json`) to
  configure the default escape keys for docker client.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 18eb9f2e64
Component: cli
2017-06-02 00:07:22 +00:00
a9559666fc Creating a man page for the configuration file
Signed-off-by: Mary Anthony <mary@docker.com>

Adding comments. Fixing bit in daemon

Signed-off-by: Mary Anthony <mary@docker.com>

Arrrgggh

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 351710a2bb
Component: cli
2017-06-02 00:07:22 +00:00
dbf53e1491 Improvement for docker subcommand's help messages
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Upstream-commit: 636ffcc028
Component: cli
2017-06-02 00:07:22 +00:00
635afa8762 Compute plugin list in bash completion for docker daemon --authz-plugin
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 9a63a5cdd6
Component: cli
2017-06-02 00:07:21 +00:00
640cd614ed Update integration tests when container and image have same name
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Upstream-commit: 6bfda2dbbc
Component: cli
2017-06-02 00:07:21 +00:00
587a8700a0 Fix docs for memory-swap
Fixes: #18894

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: b87dd1342f
Component: cli
2017-06-02 00:07:21 +00:00
4377e8e7da Fix typo in daemon storage-driver docs
Signed-off-by: Thomas Swift <tgs242@gmail.com>
Upstream-commit: 2d406c4058
Component: cli
2017-06-02 00:07:21 +00:00
c7196f1df6 bash completion for docker network ls --filter
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: c8195c7cd5
Component: cli
2017-06-02 00:07:21 +00:00
79fb54f431 Implemet docker update command
It's used for updating properties of one or more containers, we only
support resource configs for now. It can be extended in the future.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 3f44418168
Component: cli
2017-06-02 00:07:21 +00:00
001436e214 remove =false from options that default to false in the docs
This re-aligns the docs with what the cmd line now does.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 421578fbd4
Component: cli
2017-06-02 00:07:21 +00:00
ba1c78537a Add filter for network ls to hide predefined net
Add filter support for `network ls` to hide predefined network,
then user can use "docker network rm `docker network ls -f type=custom`"
to delete a bundle of userdefined networks.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: ed4cf608e2
Component: cli
2017-06-02 00:07:21 +00:00
6751d5384e remove --format from bash completion for docker network rm
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: a36ca600a0
Component: cli
2017-06-02 00:07:21 +00:00
9d5a5ba719 Update link for Weave Net plugin docs
Signed-off-by: Ilya Dmitrichenko <errordeveloper@gmail.com>
Upstream-commit: c8ba44360f
Component: cli
2017-06-02 00:07:21 +00:00
318570eaba Better function names in bash completion
The new names make it easier to distinguish between helper functions and
functions that actually perform completion by modifying the global COMPOPT
variable.

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: c227b6ac11
Component: cli
2017-06-02 00:07:21 +00:00
7b918f92d1 Add support for blkio read/write iops device
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Upstream-commit: 499d634f32
Component: cli
2017-06-02 00:07:21 +00:00
94dadfbef1 Use computed plugin lists in bash completion
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 57a8c59820
Component: cli
2017-06-02 00:07:21 +00:00
736589dc45 Add --format support to images command
- rename `api/client/ps` to `api/client/formatter`
- add a a image formatter

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 1e3c5bbe15
Component: cli
2017-06-02 00:07:21 +00:00
00547ff6cf Change the quiet flag behavior in the build command
Right now, the quiet (-q, --quiet) flag ignores the output
generated from within the container.

However, it ought to be quiet in a way that all kind
of diagnostic output should be ignored, unless the build
process fails.

This patch makes the quiet flag behave in the following way:
 1. If the build process succeeds, stdout contains the image ID
    and stderr is empty.
 2. If the build process fails, stdout is empty and stderr
    has the error message and the diagnostic output of that process.

If the quiet flag is not set, then everything goes to stdout
and error messages, if there are any, go to stderr.

Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
Upstream-commit: fbb25d42f0
Component: cli
2017-06-02 00:07:21 +00:00
45d5c529e5 Update restart description
add a note around restart policies only working in detached mode

Signed-off-by: Aidan Feldman <aidan.feldman@gmail.com>

Update restart description with Mary's comments.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 4620840d57
Component: cli
2017-06-02 00:07:21 +00:00
ddaab301eb docs: userguide: labels-custom-metadsata.md: update syntax for emtpy value labels
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 8008a57ffb
Component: cli
2017-06-02 00:07:21 +00:00
6bc3ef36d5 Explain 'json' function a bit better
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
Upstream-commit: 1b77149fd4
Component: cli
2017-06-02 00:07:20 +00:00
0224aaea75 docs: extend: authorization.md: add a note about confidential stuff in Err
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: e5b94ba3ef
Component: cli
2017-06-02 00:07:20 +00:00
898c408fdb authZ: more fixes
- fix naming and formatting
- provide more context when erroring auth
- do not capitalize errors
- fix wrong documentation
- remove ugly remoteError{}

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: d00b518979
Component: cli
2017-06-02 00:07:20 +00:00
32503bfb53 Fix typo error and update index
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Upstream-commit: 752b902123
Component: cli
2017-06-02 00:07:20 +00:00
033ad3c0cc pkg: authorization: add Err to tweak response status code
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: e79f2fcc21
Component: cli
2017-06-02 00:07:20 +00:00
dcace8d27d Add a DOCKER_API_VERSION env var
Closes: #11486

Just for @ahmetalpbalkan  :-)

Fixed some comment formatting too while in there.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 8b3b2571d7
Component: cli
2017-06-02 00:07:20 +00:00
f4d9e49a60 Updated REX-Ray plugin platform support.
REX-Ray added Google Compute Engine support: https://github.com/emccode/rexray/issues/113

Signed-off-by: Ray Tsang <rayt@google.com>
Upstream-commit: 5e6c121c37
Component: cli
2017-06-02 00:07:20 +00:00
fdbc2abdeb docs: extend: plugins_volume.md: Err default to empty string
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 5ea58b57cb
Component: cli
2017-06-02 00:07:20 +00:00
d0accd62d9 Add capability to specify mount propagation per volume
Allow passing mount propagation option shared, slave, or private as volume
property.

For example.
docker run -ti -v /root/mnt-source:/root/mnt-dest:slave fedora bash

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: b2cbaa03af
Component: cli
2017-06-02 00:07:20 +00:00