Commit Graph

234 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
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
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
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
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
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
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
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
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
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
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
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
1c4c464a30 Fix typos found across repository
Signed-off-by: Justas Brazauskas <brazauskasjustas@gmail.com>
Upstream-commit: b91f98d9f1
Component: cli
2017-06-02 00:07:20 +00:00
cf2cd0632d Change authz plugin argument name
Signed-off-by: Liron Levin <liron@twistlock.com>
Upstream-commit: 53c1cb81c0
Component: cli
2017-06-02 00:07:20 +00:00
4c35bc9676 Fixing documentation comments by @thaJeztah
Signed-off-by: Dima Stopel <dima@twistlock.com>
Upstream-commit: a8a3c47ee5
Component: cli
2017-06-02 00:07:20 +00:00
dfdc43d2c4 Fixing documentation according to comments by @moxiegirl and @thaJeztah
Signed-off-by: Dima Stopel <dima@twistlock.com>
Upstream-commit: 00962f362b
Component: cli
2017-06-02 00:07:20 +00:00
83692c5c04 Adding authorization subsystem documentation
Signed-off-by: Dima Stopel <dima@twistlock.com>
Upstream-commit: 87f1223216
Component: cli
2017-06-02 00:07:20 +00:00
60efabba8f Update docs for addition of transfer manager
Closing the HTTP connection requesting a push or pull will cancel the
push or pull. This behavior also applies to the CLI.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: fa96356872
Component: cli
2017-06-02 00:07:19 +00:00
d617c7385c Check minimum kernel memory limit to be 4M
Fixes: #18405

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: d9278dd4a8
Component: cli
2017-06-02 00:07:19 +00:00
5dd1c0387f The docs now explain that images with repo:tag as <none>:<none> are dangling images.
Signed-off-by: Sambuddha Basu <sambuddhabasu1@gmail.com>
Upstream-commit: 93ce6fd9f5
Component: cli
2017-06-02 00:07:19 +00:00
d3e37fa710 docs: markdown and textual fixups in reference/run.md
This fixes markdown formatting, and formatting of tables;

 - Our markdown engine doesn't support spanning rows, so
   re-wrapped table contents.
 - Added a CSS-styles to prevent "code" blocks in tables
   from wrapping
 - The "logging drivers" table didn't have a header
 - Aligned table borders in source code for better readability.
 - Standardize on using `-it` in stead of -i -t or -ti
 - Some markup issues
 - Some minor textual fixups

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 7071c15b5f
Component: cli
2017-06-02 00:07:19 +00:00
f15205a41d newtork -> network (minor spelling correction)
...yeah, that was bugging me. :)

Signed-off-by: Chris Weyl <cweyl@alumni.drew.edu>
Upstream-commit: 66eef79e58
Component: cli
2017-06-02 00:07:19 +00:00
8c726d1e3f Add support for blkio read/write bps device
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Upstream-commit: 9480c4763d
Component: cli
2017-06-02 00:07:19 +00:00
d72d6e7f0b docs: fix weight-deivce option args
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Upstream-commit: 7880dcf5f2
Component: cli
2017-06-02 00:07:19 +00:00
3701e83b63 Add format flag to network inspect
…for consistency as docker inspect and docker volume inspect supports it too

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: c6162061d9
Component: cli
2017-06-02 00:07:19 +00:00
131de84a7e Address review comments.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: c5f725e1c7
Component: cli
2017-06-02 00:07:19 +00:00
d37fd961d4 Add docs and man page entry for --volume-driver
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
Upstream-commit: 22ce4b4448
Component: cli
2017-06-02 00:07:19 +00:00
372ae86505 Add NETWORK_NAME_or_ID value for --net= option
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Upstream-commit: deae0706ea
Component: cli
2017-06-02 00:07:19 +00:00
bb03409926 update order and address review notes
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 178a2cfe7c
Component: cli
2017-06-02 00:07:19 +00:00
476932a722 add examples in search.md
Signed-off-by: gwx296173 <gaojing3@huawei.com>
Upstream-commit: 01c09480dc
Component: cli
2017-06-02 00:07:19 +00:00
98ddc49784 Add OomScoreAdj to configure container oom killer preferences
libcontainer v0.0.4 introduces setting `/proc/self/oom_score_adj` to
better tune oom killing preferences for container process. This patch
simply integrates OomScoreAdj libcontainer's config option and adjust
the cli with this new option.

Signed-off-by: Antonio Murdaca <amurdaca@redhat.com>
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: e9287cd43a
Component: cli
2017-06-02 00:07:19 +00:00
16c00f11eb This patch adds --tmpfs as a option for mounting tmpfs on directories
It will Tar up contents of child directory onto tmpfs if mounted over

This patch will use the new PreMount and PostMount hooks to "tar"
up the contents of the base image on top of tmpfs mount points.

Signed-off-by: Dan Walsh <dwalsh@redhat.com>
Upstream-commit: 65120e8851
Component: cli
2017-06-02 00:07:18 +00:00
317ce91965 Deprecate -f flag from docker tag
Closes #9798

@maintainers please note that this is a change to the UX. We no longer
require the -f flag on `docker tag` to move a tag from an existing image.
However, this does make us more consistent across our commands,
see https://github.com/docker/docker/issues/9798 for the history.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: ecfc3613b2
Component: cli
2017-06-02 00:07:18 +00:00
00c64032bc Add docs for option --isolation
Add docs for `run`/`create`/`build` command option `isolation`

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 67eea4d814
Component: cli
2017-06-02 00:07:18 +00:00
1ce2809f7f Make discovery ttl and heartbeat configurable
Docker daemon uses kv-store as the host-discovery backend.
Discovery module tracks the liveness of a node through a simple
keepalive mechanism.  The keepalive mechanism depends on every
node performing heartbeat by registering itself with the discovery
module (via KV-Store Put operation). And for every Put operation,
the discovery module in all other nodes will receive a Watch
notification. That keeps the node alive.
Any node that fails to register itself within the TTL timer is
considered dead and removed from the discovery database.

The default timer (heartbeat = 20 seconds & ttl = 60 seconds)
works fine for small clusters.  But for large clusters, these
default timers are extremely aggressive and that causes high CPU
& most of the processing is spent managing the node discovery
and that impacts normal daemon operation.

Hence we need a way to make the discovery ttl and heartbeat
configurable.  As the cluster size grows, the user can change
these timers to make sure the daemon scales.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: c072458308
Component: cli
2017-06-02 00:07:18 +00:00
38c7b31652 Fixing the volume options doc
Fixes #15896
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
Upstream-commit: 4fbaeb5f25
Component: cli
2017-06-02 00:07:18 +00:00
a0e62d215b docs: fixups for plugin drivers in docker info
Plugin drivers were added to docker info in
https://github.com/docker/docker/pull/17300

but not added to the example output in the online
docs.

Also fixed mixed tabs/spaces in the API documentation.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 41afe87367
Component: cli
2017-06-02 00:07:18 +00:00
10ae101c34 Add more to tag's -f flag's help
Was noticed in #9798

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: a7eb9308d5
Component: cli
2017-06-02 00:07:18 +00:00
e3edcc1609 Add API change to docs
Add API change description to docs due to `docker network inspect`
returns different data structure.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 87ba148cab
Component: cli
2017-06-02 00:07:18 +00:00