Commit Graph

128 Commits

Author SHA1 Message Date
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
c1135453ba Enhance docker network rm to delete multi net
This commit enhance `docker network rm` command to allow user to delete
multi networks at the same time.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 007df1d494
Component: cli
2017-06-02 00:07:18 +00:00
6d7ca0ef19 Fixes found by docs validation tool
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: d63c19c4ea
Component: cli
2017-06-02 00:07:18 +00:00
3b49273779 Add '-L' option for cp
Fixes #16555

Original docker `cp` always copy symbol link itself instead of target,
now we provide '-L' option to allow docker to follow symbol link to real
target.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 92d0c4bc45
Component: cli
2017-06-02 00:07:18 +00:00
6dc1204713 modifying docker --since and --until to support nanoseconds and time zones
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
Upstream-commit: 0eb79491dd
Component: cli
2017-06-02 00:07:18 +00:00
c182950c75 Re-implement --before and --since as options for --filter
* This commit will mark --before and --since as deprecated, but leave their behavior
  unchanged until they are removed, then re-implement them as options for --filter.

* And update the related docs.

* Update the integration tests.

Fixes issue #17716

Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Upstream-commit: 562c2df97d
Component: cli
2017-06-02 00:07:18 +00:00
4000ade31b Addition of "--shm-size" to which size of /dev/shm is changed.
- Optional "--shm-size=" was added to the sub-command(run, create,and build).
- The size of /dev/shm in the container can be changed
  when container is made.
- Being able to specify is a numerical value that applies number,
  b, k, m, and g.
- The default value is 64MB, when this option is not set.
- It deals with both native and lxc drivers.

Signed-off-by: NIWA Hideyuki <niwa.hiedyuki@jp.fujitsu.com>
Upstream-commit: fa2f024bc6
Component: cli
2017-06-02 00:07:18 +00:00
928e9e0c9a Small changes to storage driver/commands ref
Entering V's comments

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: cd4fc83dd1
Component: cli
2017-06-02 00:07:17 +00:00
fd7016c7a6 Use fs cgroups by default
Our implementation of systemd cgroups is mixture of systemd api and
plain filesystem api. It's hard to keep it up to date with systemd and
it already contains some nasty bugs with new versions. Ideally it should
be replaced with some daemon flag which will allow to set parent systemd
slice.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 941952972e
Component: cli
2017-06-02 00:07:17 +00:00
01bd0ad8c4 Fix a small typo in volume_inspect.md
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 3317b8b16d
Component: cli
2017-06-02 00:07:17 +00:00
9c2296cf9c Add pkg/parsers/architecture and pkg/platform
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 8ab8a0f3c5
Component: cli
2017-06-02 00:07:17 +00:00
e68ca3e6e8 /info: Add keys Architecture, OSType
- introduces Swarm-relevant keys, see #13634
  - docs updated

Signed-off-by: Olle Jonsson <olle.jonsson@gmail.com>
Upstream-commit: 1de6fda301
Component: cli
2017-06-02 00:07:17 +00:00
3f98c82117 fix doc
Signed-off-by: Zhang Kun <zkazure@gmail.com>

fix doc

Signed-off-by: Zhang Kun <zkazure@gmail.com>
Upstream-commit: e71bd977cf
Component: cli
2017-06-02 00:07:17 +00:00
3804fbd740 Add support for blkio.weight_device
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Upstream-commit: e303d6cc9f
Component: cli
2017-06-02 00:07:17 +00:00
29e36723a8 docker-login man/doc add security info
Signed-off-by: Sally O'Malley <somalley@redhat.com>
Upstream-commit: d6bac18914
Component: cli
2017-06-02 00:07:17 +00:00
16da59f6de docs: fix link to "run reference"
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: e1f83cb82b
Component: cli
2017-06-02 00:07:16 +00:00
e5cbd3704c more notary documentation
Signed-off-by: Viktor Stanchev <me@viktorstanchev.com>
Upstream-commit: cfe0fadee2
Component: cli
2017-06-02 00:07:16 +00:00
c6af22c130 Include xfsprogs in build environment.
devmapper uses xfs by default now. So include xfsprogs in build
environment. Also update docs to reflect the new default.

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: 555f500ab4
Component: cli
2017-06-02 00:07:16 +00:00
2a910ab5a6 Windows: Add default isolation exec driver option
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 52f5fdafc1
Component: cli
2017-06-02 00:07:16 +00:00
8be9d4f383 Fixing wrong volume doc format
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
Upstream-commit: 161b465e47
Component: cli
2017-06-02 00:07:16 +00:00
3222bcadf4 Allow docker stats without arguments
This patch adds the ability to run `docker stats` w/o arguments and get
statistics for all running containers by default. Also add a new
`--all` flag to list statistics for all containers (like `docker ps`).
New running containers are added to the list as they show up also.
Add integration tests for this new behavior.
Docs updated accordingly. Fix missing stuff in man/commandline
reference for `docker stats`.

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 4668b6ed6c
Component: cli
2017-06-02 00:07:16 +00:00
50fbc6f6bd Remove exec-driver global daemon option.
Each platform has only a driver now.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: f9b805f16f
Component: cli
2017-06-02 00:07:15 +00:00
5ab60b10fd Remove LXC support.
The LXC driver was deprecated in Docker 1.8.
Following the deprecation rules, we can remove a deprecated feature
after two major releases. LXC won't be supported anymore starting on Docker 1.10.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: c5ed875bd9
Component: cli
2017-06-02 00:07:15 +00:00
831fc32309 Windows: Add isolation to ps filter
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: b6c711690c
Component: cli
2017-06-02 00:07:15 +00:00
39ae201697 fix documentation inconsistency for volume create
the example command uses `/world` but the description refers to `/src`

Signed-off-by: Harold Cooper <hrldcpr@gmail.com>
Upstream-commit: e793642ac9
Component: cli
2017-06-02 00:07:15 +00:00
6e6828db93 Fixing ZooKeeper and some other nits Nathan found
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 7e68b5f73b
Component: cli
2017-06-02 00:07:15 +00:00
8050e305f6 First pass at consolidating
Removing old networking.md
Updating dockernetworks.md with images
Adding information on network plugins
Adding blurb about links to docker networking
Updating the working documentation
Adding Overlay Getting Started
Downplaying links by removing refs/examples, adding refs/examples for network.
Updating getting started to reflect networks not links
Pulling out old network material
Updating per discussion with Madhu to add Default docs section
Updating with bridge default
Fix bad merge
Updating with new cluster-advertise behavior
Update working and NetworkSettings examples
Correcting example for default bridge discovery behavior
Entering comments
Fixing broken Markdown Syntax
Updating with comments
Updating all the links

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 02a859b9f3
Component: cli
2017-06-02 00:07:15 +00:00
986b7e312c Update kill.md
Added Note to show users that signals will not propagate to the container if the preferred exec form isn't used.

Signed-off-by: Eric Rosenberg <ehaydenr@gmail.com>
Upstream-commit: 05242a4c60
Component: cli
2017-06-02 00:07:15 +00:00
b0b9294f03 Updating network commands: adding man pages
Adding Related information blocks
Final first draft pass: ready for review
Review comments
Entering comments from the gang
Updating connect to include paused

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 4985b20ea1
Component: cli
2017-06-02 00:07:15 +00:00
e16c15092c Add ability to add multiple tags with docker build
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
Upstream-commit: 9d9976ae3a
Component: cli
2017-06-02 00:07:14 +00:00
565f5031db docs: fix storage driver options list
This fixes the indentation of the storage driver
options list.

Also wraps/reformats some examples to prevent
horizontal scrollbars on the rendered HTML

Fixes #17140

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 91e898094f
Component: cli
2017-06-02 00:07:13 +00:00
80cce1f5ce Deprecate -c cli short variant flag in docker cli
- build
- create

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 4c506e1df7
Component: cli
2017-06-02 00:07:13 +00:00
de10af7bd7 Added network to docker --help and help cleanup
Fixes https://github.com/docker/docker/issues/16909

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 3a779b2995
Component: cli
2017-06-02 00:07:13 +00:00
e15d2f0090 use Server Version
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: dd1d35285b
Component: cli
2017-06-02 00:07:13 +00:00
eaf51eb079 Improve the way we deliver Examples in command line. (Add descriptive titles)
Signed-off-by: Jian Zhang <zhangjian.fnst@cn.fujitsu.com>
Upstream-commit: c897310c29
Component: cli
2017-06-02 00:07:13 +00:00
9a66bfc2e3 add size to inspect
Signed-off-by: Zhang Kun <zkazure@gmail.com>
Upstream-commit: de3e44577a
Component: cli
2017-06-02 00:07:12 +00:00
5b54323be8 volume create error on conflict option
Signed-off-by: Kun Zhang <zkazure@gmail.com>
Upstream-commit: eb960e4eb7
Component: cli
2017-06-02 00:07:12 +00:00
26c4f55b5c Add CMD and EXPOSE instruction example
Signed-off-by: Mihuleacc Sergiu <mihuleac.sergiu@gmail.com>
Upstream-commit: 2af4a1ef4b
Component: cli
2017-06-02 00:07:12 +00:00
f6c311219b Document updates for cluster-store-opt
This updates the docs for the daemon based on the new cluster-store-opt
for TLS support.

Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
Upstream-commit: f10d93f394
Component: cli
2017-06-02 00:07:12 +00:00
fb5c95b1a3 Default the tcp port to 2376 if tls is on, and 2375 if not
Refactor so that the Host flag validation doesn't destroy the user's input,
and then post process the flags when we know the TLS options

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 0095e6fc23
Component: cli
2017-06-02 00:07:12 +00:00
d4f3c46baf Enabled GitHub Flavored Markdown
GitHub flavored markdown is now supported for links and images. Also, ran LinkChecker and FileResolver. Yay!
Fixes from Spider check
Output for docker/docker now goes into engine directory

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: e641a0f363
Component: cli
2017-06-02 00:07:12 +00:00
49b87bae2e Sync with remote API
Signed-off-by: Luca Marturana <lucamarturana@gmail.com>

Sync also container events

Signed-off-by: Luca Marturana <lucamarturana@gmail.com>

Sync also man page

Signed-off-by: Luca Marturana <lucamarturana@gmail.com>
Upstream-commit: f8a62fd1c5
Component: cli
2017-06-02 00:07:11 +00:00
ccc6356be8 Add TLS support for discovery backend
This leverages recent additions to libkv enabling client
authentication via TLS so the discovery back-end can be locked
down with mutual TLS.  Example usage:

    docker daemon [other args] \
        --cluster-advertise 192.168.122.168:2376 \
        --cluster-store etcd://192.168.122.168:2379 \
        --cluster-store-opt kv.cacertfile=/path/to/ca.pem \
        --cluster-store-opt kv.certfile=/path/to/cert.pem \
        --cluster-store-opt kv.keyfile=/path/to/key.pem

Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
Upstream-commit: 323fb21864
Component: cli
2017-06-02 00:07:11 +00:00
36d10565e6 update dockernetwork.md and network api
Signed-off-by: Deng Guangxing <dengguangxing@huawei.com>
Upstream-commit: b923d8af3e
Component: cli
2017-06-02 00:07:11 +00:00
f33e7e36a6 Fixing issues in command ordering. Adding index.md
Adjust bullets
Entering Seb's comments

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: d45666f869
Component: cli
2017-06-02 00:07:11 +00:00
ae63a50726 Networking API and UX documentation
More doc updates will follow

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: da80c0929a
Component: cli
2017-06-02 00:07:11 +00:00
40051ff694 change flag name to better follow the other flags that start with disable;
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 0afb6cc862
Component: cli
2017-06-02 00:07:11 +00:00
606d386d6d devmapper: Provide option to enabled deferred device deletion
Provide a command line option dm.use_deferred_deletion to enable deferred
device deletion feature. By default feature will be turned off.

Not sure if there is much value in deferred deletion being turned on
without deferred removal being turned on. So for now, this feature can
be enabled only if deferred removal is on.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: fba8aeb14b
Component: cli
2017-06-02 00:07:11 +00:00
9eb4fc2912 Update documentation on the revert on env validation
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 2a36a93d04
Component: cli
2017-06-02 00:07:11 +00:00