Commit Graph

837 Commits

Author SHA1 Message Date
034997662b Remove PortMapping from container NetworkSettings
Signed-off-by: Antonio Murdaca <runcom@linux.com>
Upstream-commit: 1c26392626
Component: cli
2017-06-02 00:07:07 +00:00
5c0a31aa05 Add docker ps --filter=… image completion
I missed that on #15919, thanks @albers

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 1cf99bf127
Component: cli
2017-06-02 00:07:07 +00:00
d3348772c2 Warning message for lvm devmapper running on top of loopback devices
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
Upstream-commit: d5394a0d5f
Component: cli
2017-06-02 00:07:07 +00:00
14dfc30977 Update shell completion on docker ps for ancestor
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 8387eacede
Component: cli
2017-06-02 00:07:07 +00:00
b36315741b ubuntu-14-10-x64 is not a valid image on digital ocean
Signed-off-by: Jordan Jennings <jjn2009@gmail.com>
Upstream-commit: d05294bae4
Component: cli
2017-06-02 00:07:07 +00:00
f286f8afde Add 'ancestor' ps filter for image
Makes it possible to filter containers by image, using
--filter=ancestor=busybox and get all the container running busybox
image and image based on busybox (to the bottom).

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 67f663c7bf
Component: cli
2017-06-02 00:07:07 +00:00
41371def9d Added note about process interaction with container in detached mode
Signed-off-by: Dharmit Shah <shahdharmit@gmail.com>

Added note about process interaction with container in detached mode

Signed-off-by: Dharmit Shah <shahdharmit@gmail.com>
Upstream-commit: 23effb34d7
Component: cli
2017-06-02 00:07:07 +00:00
2b021a1765 Update filtering chapters on ps/images references
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 898614f30a
Component: cli
2017-06-02 00:07:07 +00:00
ccd9b5c29e Builder counts from 1
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 6d275805ad
Component: cli
2017-06-02 00:07:07 +00:00
fb53625655 Add volume API/CLI
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 1f10226bfd
Component: cli
2017-06-02 00:07:07 +00:00
53111401ba adding message option to the import subcommand
Signed-off-by: Taylor Jones <monitorjbl@gmail.com>
Upstream-commit: f4060b1f65
Component: cli
2017-06-02 00:07:07 +00:00
3eda380217 Update plugins.md
Add Convoy to Docker plugin list.

Signed-off-by: Sheng Yang <sheng.yang@rancher.com>
Upstream-commit: a5f2ecff80
Component: cli
2017-06-02 00:07:07 +00:00
fe402d05bb Copy edits for typos
Signed-off-by: Ed Costello <epc@epcostello.com>
Upstream-commit: a5c18a853e
Component: cli
2017-06-02 00:07:07 +00:00
74c0fd37cc Add unless-stopped restart policy
Fixes #11008

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: df39b0146b
Component: cli
2017-06-02 00:07:07 +00:00
ff311ecafd explain how to make it work on awazon ec2.
Signed-off-by: Klein Florian <florian.klein@free.fr>
Upstream-commit: e1733b4db6
Component: cli
2017-06-02 00:07:07 +00:00
a302fd9a45 Change all optional unit to [unit]
As suggested before, we should change every signal one.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: b243bbed9c
Component: cli
2017-06-02 00:07:07 +00:00
0ae8a6bd4d Revert "Fix broken links at plugins documentation"
This reverts commit 354147df012dd35f82e59e3511d9be4fc7610352.

Signed-off-by: Álex González <agonzalezro@gmail.com>
Upstream-commit: 445e4600f2
Component: cli
2017-06-02 00:07:07 +00:00
e076ea4c2f Fix broken links at plugins documentation
Signed-off-by: Álex González <agonzalezro@gmail.com>
Upstream-commit: b64dba4262
Component: cli
2017-06-02 00:07:07 +00:00
7528eacd46 Make run and rmi bash completions configurable
Allow the user to configure how Docker's bash completion works for the
"events", "history", "inspect", "run", "rmi" and "save" commands through the
following environment variables:

DOCKER_COMPLETION_SHOW_IMAGE_IDS
  "none" - Show names only (default)
  "non-intermediate" - Show names and ids, but omit intermediate image IDs
  "all" - Show names and ids, including intermediate image IDs

DOCKER_COMPLETION_SHOW_TAGS
  "yes" - include tags in completion options (default)
  "no"  - don't include tags in completion options

Fixes #9474.

Signed-off-by: Rory Hunter <roryhunter2@gmail.com>
Upstream-commit: e7d0fd2b23
Component: cli
2017-06-02 00:07:06 +00:00
1386a1809c Add support for kernel memory limit
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 5731775665
Component: cli
2017-06-02 00:07:06 +00:00
0d081855af specify the docker run --rm action
Signed-off-by: He Simei <hesimei@zju.edu.cn>
Upstream-commit: 90cf0587f1
Component: cli
2017-06-02 00:07:06 +00:00
57f4813b6b fix format man-commit
Signed-off-by: Sally O'Malley <somalley@redhat.com>
Upstream-commit: 91502290a5
Component: cli
2017-06-02 00:07:06 +00:00
ecd5fc0b6e add -H to SYNOPSIS man-history
Signed-off-by: Sally O'Malley <somalley@redhat.com>
Upstream-commit: 1c26439cbb
Component: cli
2017-06-02 00:07:06 +00:00
2fafbcba32 Add gists provided by Mary
This adds the example gists, provided by Mary Anthony,
also fixes a link to the old /terms/

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 27b1ab4116
Component: cli
2017-06-02 00:07:06 +00:00
64d754f612 run.md: --expose does NOT override Dockerfile EXPOSE
run.md states that the operator can override all defaults set in the Dockerfile, and explicitly says that `--expose` overrides the `EXPOSE` instruction. Neither of these are true. An `EXPOSE` instruction cannot be overridden, `--expose` can only add additional exposed ports.

This change fixes the instructions, and also takes the liberty of crisping up the grammar and phrasing in a place or two.

Signed-off-by: Spencer Brown <spencer@spencerbrown.org>
Upstream-commit: a419da588f
Component: cli
2017-06-02 00:07:06 +00:00
3376746a0c add weight to daemon page so it renders in order
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
Upstream-commit: 4ddb2c2a8d
Component: cli
2017-06-02 00:07:06 +00:00
83978ae0df add missing instruction
Signed-off-by: bin liu <liubin0329@gmail.com>
Upstream-commit: 08481e81ca
Component: cli
2017-06-02 00:07:06 +00:00
cf8e51051f Add format description in run doc
And only set false to --oom-kill-disable, we just need the default
value to show.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 1219ef846c
Component: cli
2017-06-02 00:07:06 +00:00
c1c4fe18cf Adding support to publish on custom host port ranges
Signed-off-by: Don Kjer <don.kjer@gmail.com>

Changing vendor/src/github.com/docker/libnetwork to match lindenlab/libnetwork custom-host-port-ranges-1.7 branch
Upstream-commit: 49acf8c522
Component: cli
2017-06-02 00:07:06 +00:00
30c6af4269 fix SYNOPSIS alphabetical order man-create
Signed-off-by: Sally O'Malley <somalley@redhat.com>
Upstream-commit: 7c7faab3d2
Component: cli
2017-06-02 00:07:06 +00:00
374c800384 remove references to 'source repository'
- rewrite intro to Dockerfile reference usage section to remove
   references to 'source repository'
- Closes #14714
- Fixes:  #8648
- Updating with Seb's comments

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: e0d42a679c
Component: cli
2017-06-02 00:07:06 +00:00
73a2904d6e Updating hashcode links to commands
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 58a37fe8cf
Component: cli
2017-06-02 00:07:06 +00:00
22fab2f19a reference/run: Some editorial changes
Based on the suggestions from @moxiegirl, some changes to make the wording more clear.

Signed-off-by: Kai Blin <kai@samba.org>
Upstream-commit: eb1d7c01a2
Component: cli
2017-06-02 00:07:06 +00:00
622db7d10b reference/run: Add some articles
Signed-off-by: Kai Blin <kai@samba.org>
Upstream-commit: 33e158b9fc
Component: cli
2017-06-02 00:07:06 +00:00
143c265b75 reference/run: Add a paragraph break
Signed-off-by: Kai Blin <kai@samba.org>
Upstream-commit: d4b510c608
Component: cli
2017-06-02 00:07:06 +00:00
99a3735fd0 reference/run: Clarify the use of numeric UIDs
it is possible to pass an UID that has not been created inside the container, clarify this in the docs.
This should fix issue #14795

Signed-off-by: Kai Blin <kai@samba.org>
Upstream-commit: 7cc23c78c0
Component: cli
2017-06-02 00:07:06 +00:00
519334c5f4 add documentation clarifying behavior of VOLUME instruction
Signed-off-by: Patrick Hemmer <patrick.hemmer@gmail.com>
Upstream-commit: d3dae7f652
Component: cli
2017-06-02 00:07:05 +00:00
20d188cf61 Fix bash completion for log driver options
This option was incorrectly ported to the new `daemon` subcommand
structure.

Beside the obvious effect that completion of `docker daemon --log-opt`
did not work, this also caused completion of `docker` and `docker xxx`
to fail on macs with

> bash: words: bad array subscript

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 8d6fd1542f
Component: cli
2017-06-02 00:07:05 +00:00
5a08821360 Fixing docs to remove references to links under terms/
Removed terms/ directory

Signed-off-by: Dharmit Shah <shahdharmit@gmail.com>
Upstream-commit: 56632110e0
Component: cli
2017-06-02 00:07:05 +00:00
74afd8bfe2 typo man-inspect
Signed-off-by: Sally O'Malley <somalley@redhat.com>
Upstream-commit: f2f1c6eb79
Component: cli
2017-06-02 00:07:05 +00:00
05097b2cf9 Updated test to check for exec --privileged side-effects
Also improving documentation for same feature as part of
docker/docker#14113 docs review.

Signed-off-by: Tim Dettrick <t.dettrick@uq.edu.au>
Upstream-commit: e577c15cec
Component: cli
2017-06-02 00:07:05 +00:00
229ae40481 Revert "Revert "Add docker exec run a command in privileged mode""
This reverts commit 40b71adee390e9c06471b89ed845132b4ec80177.

Original commit (for which this is effectively a rebased version) is
72a500e9e5929b038816d8bd18d462a19e571c99 and was provided by Lei Jitang
<leijitang@huawei.com>.

Signed-off-by: Tim Dettrick <t.dettrick@uq.edu.au>
Upstream-commit: d0fa83e285
Component: cli
2017-06-02 00:07:05 +00:00
6a133e788e Add info on how to build experimental binaries
..also update the text that says "TO.BE.DETERMINED" to the actual URL
where the experimental nightlies are published.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
Upstream-commit: 47f2d2bc86
Component: cli
2017-06-02 00:07:05 +00:00
3db9619f22 Add storage options to bash completion
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: cefc964f4c
Component: cli
2017-06-02 00:07:05 +00:00
ee38886f4e Add options for the json-file logging driver to bash completion
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 0f17194e5f
Component: cli
2017-06-02 00:07:05 +00:00
1467924768 Update bash completion for docker run
Also fixed sort order of options using `sort -d`

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: a287253ec5
Component: cli
2017-06-02 00:07:05 +00:00
8f5fcbdfc7 fix link
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
Upstream-commit: 0ce172b578
Component: cli
2017-06-02 00:07:05 +00:00
913a4fa94d Fix #8048 : make docker images repository:tag work
Make command like "docker images ubuntu:14.04" work and filter out the
image with the given tag.

Closes #8048.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: a395c4af01
Component: cli
2017-06-02 00:07:05 +00:00
32fd4e2f42 Remove -h flag from completion and daemon reference
All docker subcommands support `-h` as an alias for `--help`
unless they have `-h` aliased to something else like `docker run`,
which uses `-h` for `--hostname`.

`-h` is not included in the help messages of the commands, though.

It ist visible in
* reference: only in `docker daemon` reference,
  see output of `grep -Rse --help=false docs`
* man pages: only in `docker` man page
  see output of `grep -RF '**-h**' man`

For consistency reasons, this commit removes `-h` as an alias for
`--help` from the reference page, man page and the bash completion.

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 91300d7db0
Component: cli
2017-06-02 00:07:05 +00:00
b0c12747dd Add missing storage drivers to bash completion
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 9fafadf6fc
Component: cli
2017-06-02 00:07:05 +00:00