docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
18,578 Commits 21 Branches 28 Tags 813 MiB
Commit Graph

166 Commits

Author SHA1 Message Date
Jess Frazelle 84b53c8d87 Merge pull request #14579 from hqhq/hq_add_softlimit 
Add support for memory reservation
 2015-09-24 12:11:36 -07:00
Jess Frazelle a077c46d14 Merge pull request #16523 from coolljt0725/correct_help_message_of_docker_cp 
Docs: correct the description of docker cp
 2015-09-23 15:40:58 -07:00
Tibor Vass 8d69e0eae0 Merge pull request #15915 from sdurrheimer/master 
Zsh completion updates
 2015-09-23 17:20:34 -04:00
qhuang aa1780997f Add support for memory reservation 
Signed-off-by: qhuang <qhuang@10.0.2.15>
 2015-09-23 14:02:45 +08:00
Harald Albers 9d8f9943e9 Bash completion: avoid 'compopt: command not found' errors on Mac OS 
The shell builtin `compopt` is not available on the outdated bash
version 3.2.57 that ships with Mac OS.
It is used in Docker's bash completion to suppress trailing spaces
in advanced completions of hash map options, e.g. `--log-opt`.

If `compopt` is not available, the new behavior is to do nothing,
i.e. the user will have to delete the additional space.

Signed-off-by: Harald Albers <github@albersweb.de>
 2015-09-22 12:17:30 -07:00
David Calavera 108891069f Merge pull request #16400 from albers/completion-log-opt-tags 
bash completion: use generic `tag` log driver option
 2015-09-21 17:17:11 -07:00
Sally O'Malley e41753678d docker restarts running OR stopped containers, docs edit rm "running" 
Signed-off-by: Sally O'Malley <somalley@redhat.com>
 2015-09-20 09:16:27 -04:00
Lei Jitang ee6b81faf2 Docs: correct the description of docker cp 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-09-20 18:02:28 +08:00
Steve Durrheimer 07f1d68887 Catchup missing changes for the zsh completion 
- felixr/docker-zsh-completion@6ae6279: Add --privileged flag to docker exec command in zsh completion
 - felixr/docker-zsh-completion@259ea00: Remove -h help flag from subcommands in zsh completion
 - felixr/docker-zsh-completion@5f77b29: Add docker ps --format flag to zsh completion
 - felixr/docker-zsh-completion@a1f39f8: Add --config flag to zsh completion
 - felixr/docker-zsh-completion@6a503b4: Filter zsh completions of inspect command by --type
 - felixr/docker-zsh-completion@d286ccd: Add --ulimit flag to build command to zsh completion
 - felixr/docker-zsh-completion@bdc1261: Add support for kernel memory limit in zsh completion
 - felixr/docker-zsh-completion@c8ce164: Add docker volume command and subcommands in zsh completion
 - felixr/docker-zsh-completion@7f996bf: Add docker daemon command to zsh completion
 - felixr/docker-zsh-completion@4ccd292: Be more generic when parsing "docker ps" output.
 - felixr/docker-zsh-completion@cd0f1b9: Fix container completion by name
 - felixr/docker-zsh-completion@8bf9041: Use "docker ps --no-trunc" to build completion.
 - felixr/docker-zsh-completion@b721bbb: Only keep the last name for a running/stopped container
 - felixr/docker-zsh-completion@6791b3e: Fix "docker run --stop-signal" completion
 - felixr/docker-zsh-completion@961f628: Try some heuristics to determine the canonical container name

Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2015-09-19 12:03:55 +02:00
Harald Albers 5d6ca225d1 bash completion: use generic `tag` log driver option 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-09-18 16:20:05 +02:00
Tim Hockin 3d4685e258 Add support for DNS options 
Signed-off-by: Tim Hockin <thockin@google.com>
 2015-09-16 14:06:45 -07:00
Harald Albers 0a5aac1ff6 Fix bash completion when extglob is not set 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-09-16 18:17:40 +02:00
David Calavera 0e50d946a2 Signal to stop a container. 
Allow to set the signal to stop a container in `docker run`:
- Use `--stop-signal` with docker-run to set the default signal the container will use to exit.

Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-09-10 19:56:05 -04:00
Samuel Karp 3effe484e6 Add awslogs driver for Amazon CloudWatch Logs 
Signed-off-by: Samuel Karp <skarp@amazon.com>
 2015-09-09 13:52:40 -07:00
Harald Albers 57ab4a1a6c bash completion for `docker volume` 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-09-07 13:22:57 -07:00
Vincent Demeester 6ae2cb7ad1 Add docker ps --filter=… image completion 
I missed that on #15919, thanks @albers

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-09-01 08:47:02 +02:00
Vincent Demeester 672bae2dc0 Update shell completion on docker ps for ancestor 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-08-28 20:56:52 +02:00
David Calavera 88cacbf529 Merge pull request #15767 from hqhq/hq_fix_optional_comments 
Change all optional unit to [unit]
 2015-08-24 17:36:01 +02:00
David Calavera cb00396f61 Merge pull request #15332 from pugnascotia/master 
Make run and rmi bash completions configurable
 2015-08-24 10:49:01 +02:00
Qiang Huang 76a5fdc3d4 Change all optional unit to [unit] 
As suggested before, we should change every signal one.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-08-21 21:29:52 -07:00
Qiang Huang b6f1b4ad35 Add support for kernel memory limit 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-08-19 23:56:55 +08:00
Harald Albers 18381faee6 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>
 2015-08-18 09:17:29 +02:00
Sebastiaan van Stijn e1f3a5ad0a Merge pull request #14113 from dit4c/10348-exec-privileged 
Remerge of `docker exec --privileged` with better tests
 2015-08-16 00:20:41 +02:00
David Calavera 313b37129a Merge pull request #15525 from albers/completion-option-updates 
Updates to bash completion for docker run and docker daemon.
 2015-08-14 13:55:11 -07:00
Rory Hunter 60d97a4a63 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>
 2015-08-14 11:29:29 +01:00
Tim Dettrick 03f65b3d0d Revert "Revert "Add docker exec run a command in privileged mode"" 
This reverts commit 40b71adee3.

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

Signed-off-by: Tim Dettrick <t.dettrick@uq.edu.au>
 2015-08-13 16:36:44 +10:00
David Calavera d50881e446 Merge pull request #15449 from albers/completion-help 
Remove -h flag from completion and daemon reference
 2015-08-12 17:09:51 -07:00
Harald Albers e4d8a8e1ca Add storage options to bash completion 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-08-12 06:13:24 -07:00
Harald Albers 5c1ad6f90c Add options for the json-file logging driver to bash completion 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-08-12 04:39:29 -07:00
Harald Albers 644c158837 Update bash completion for `docker run` 
Also fixed sort order of options using `sort -d`

Signed-off-by: Harald Albers <github@albersweb.de>
 2015-08-12 04:38:55 -07:00
Harald Albers ceb11d9660 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>
 2015-08-11 07:30:58 -07:00
Harald Albers 5cee7e8116 Add missing storage drivers to bash completion 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-08-10 08:49:40 -07:00
Harald Albers c465ba7bde Add `docker ps --format` to bash completion 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-08-10 06:51:14 -07:00
Harald Albers b898111d3a Add `--config` to bash completion 
The custom configuration will also be used in docker invocations made
by the completion script itself, just like `-H`.

Signed-off-by: Harald Albers <github@albersweb.de>
 2015-08-03 19:03:43 +02:00
Harald Albers 69cde5a302 Filter completions of `docker inspect` by `--type` 
Completion now filters the images and containers by given
`--type`.

Signed-off-by: Harald Albers <github@albersweb.de>
 2015-08-01 08:36:00 -07:00
Harald Albers aab82c5c22 Fix completion of commands after a global option with arg 
Without this fix, `docker -l info ` would not complete the commands.

Signed-off-by: Harald Albers <github@albersweb.de>
 2015-07-31 20:16:33 +02:00
Harald Albers e0dad9a153 Add completion of global options to `docker daemon` 
It's a bit confusing: the "global options" are valid as "global options"
for all client commands (i.e. all but daemon).
Example: `docker --log-level info run`

For `docker daemon`, these "global options" are only valid as "command
options".
Example: `docker daemon --log-level info`

As command completion cannot tell which command the user is going to
type next, completion for the daemon command has to allow illegal
syntaxes like
`docker --log-level info daemon --log-level info`

Signed-off-by: Harald Albers <github@albersweb.de>
 2015-07-31 20:06:45 +02:00
Harald Albers 8cc8ee9254 Add `docker daemon` to bash completion 
Signed-off-by: Harald Albers <github@albersweb.de>
Signed-off-by: Tibor Vass <tibor@docker.com>
 2015-07-30 14:08:55 -04:00
Dieter Reuter 37169dadda Fix file mode for docker bash completion 
A bash completion file shouldn't have a executable bit set.
Just change file mode to 644 (instead of 755).

Signed-off-by: Dieter Reuter <dieter.reuter@me.com>
 2015-07-27 22:07:04 +02:00
Harald Albers de40f3997a Complete all known driver options if no log driver was specified 
Without this fix, `docker --log-opt ` would not complete anything
because the completions were driver specific.

Signed-off-by: Harald Albers <github@albersweb.de>
 2015-07-23 14:19:13 +02:00
Harald Albers 6de8dd1a6e Fix problem with = in completion of docker global options 
Without this fix, `docker --log-driver fluentd --log-opt fluentd-tag=b`
would complete `b` to `build`.
Completion of the commands has to be nailed to __docker_pos_first_nonflag

Signed-off-by: Harald Albers <github@albersweb.de>
 2015-07-23 13:52:06 +02:00
Lei 877dbbbde8 Add ulimit to docker build. 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-07-23 10:26:06 +08:00
Jessie Frazelle 052b23e290 Merge pull request #14770 from albers/completion-log-opt 
Bash completion for log drivers and their options
 2015-07-21 19:58:12 -07:00
Harald Albers d5aeb3398b Second level completions for --log-opt 
Advanced completion for some log driver options:
gelf-address, syslog-address, syslog-facility.

Signed-off-by: Harald Albers <github@albersweb.de>
 2015-07-21 08:25:14 +02:00
Harald Albers 38acec94c4 Completion: Add support for '=' in arguments to __docker_pos_first_nonflag 
This solves several problems that arise from the special treatment of
"=" in Bash.
The fix was required as some log drivers have options in a key=value
form. It also addresses the --option=value and the negated boolean syntax
(--boolean=false).

Note that this is not a general fix for these problems, it is limited to
the __docker_pos_first_nonflag function.

Signed-off-by: Harald Albers <github@albersweb.de>
 2015-07-20 21:22:56 +02:00
Harald Albers faa8b658e7 Driver-specific completions for --log-opt 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-07-20 20:24:01 +02:00
Harald Albers e09d0febe6 Add missing log drivers to bash completion 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-07-20 20:13:59 +02:00
Vincent Bernat 3a1596f0f5 zsh: update zsh completion for docker command 
zsh completion is updated with the content of
felixr/docker-zsh-completion.

 - felixr/docker-zsh-completion@a93e1cb7bd Fix completion of repositories with tags
 - felixr/docker-zsh-completion@590ea70596 Respect provided `--host` flag when invoking docker
 - felixr/docker-zsh-completion@6c557babaa Several cosmetic improvements
 - felixr/docker-zsh-completion@5b63cc591a Update completion for `inspect`
 - felixr/docker-zsh-completion@b7d8f2f7cc Order completions alphabetically
 - felixr/docker-zsh-completion@63f6a06224 Factor completion for `build`, `create` and `run`
 - felixr/docker-zsh-completion@ade49ee47f Enforce positional arguments being last
 - felixr/docker-zsh-completion@850b6b6d95 Update completion for build/commit/export/exec/history/import
 - felixr/docker-zsh-completion@01bfd8c075 Remove completion for `insert` and duplicate of `import`
 - felixr/docker-zsh-completion@c64a1d730a Update completion for `stats` to add `--no-stream` flag
 - felixr/docker-zsh-completion@5e81d78b52 Update completion for `log` to add `--since` flag
 - felixr/docker-zsh-completion@b3c146a1a2 Update completion for `run` to add `--group-add` flag
 - felixr/docker-zsh-completion@8d4f196ad8 Don't trigger expensive completion function for flags
 - felixr/docker-zsh-completion@bd5aaa124d Add completion for `--help` everywhere
 - felixr/docker-zsh-completion@3a67a0e8c4 Return appropriate status code on completion
 - felixr/docker-zsh-completion@4dfcb450ea Add Steve as a regular contributor.
 - felixr/docker-zsh-completion@996a1c6def Add completion for top-level flags
 - felixr/docker-zsh-completion@b6df75905f Ensure short/long option are not allowed twice
 - felixr/docker-zsh-completion@75b6a500a0 Complete repositories with tags only on repository match
 - felixr/docker-zsh-completion@5e6292135f Factorize completion of images/repositories/tags
 - felixr/docker-zsh-completion@1c504eb677 Handle repositories with ":"
 - felixr/docker-zsh-completion@0a05bf818b Update completion for `pause' and `unpause'
 - felixr/docker-zsh-completion@b3a63253e2 Containers name can include Swarm host

In summary:

 - Swarm support
 - Handling repositories with ":"
 - Rework how completion of images/repositories/tags work:
    - felixr/docker-zsh-completion@5e6292135f
    - felixr/docker-zsh-completion@75b6a500a0
    - felixr/docker-zsh-completion@a93e1cb7bd

The remaining changes are here to sync changes done in Docker repository
(mostly from PR #14074 and #14555, by @sdurrheimer). With some minor changes:

 - boolean flags don't complete their arguments (true/false)
 - reuse of `--host` argument is done with `$opt_arg` to avoid parsing
   error
 - build/create/run common options are factorized out
 - `--help` flag is handled differently
 - `pause` and `unpause` accepts several containers as far as I know, so
   the change is reverted
 - some more, but difficult to notice (more completion for some flags I think)

Some labels are reverted, mostly because I did the merge by copy/pasting
new options instead of modifying existing options.

This commit is partial. The way the `--help` option is handled triggered
a major change due to the way things are quoted. Those changes were
partially and programmaticaly reverted in this commit only to minimize
the changes to review. The next commit will restore the full changes.

Signed-off-by: Vincent Bernat <vincent@bernat.im>
 2015-07-20 14:25:48 +02:00
Jessie Frazelle 386f11a63d Merge pull request #14555 from sdurrheimer/master 
Zsh completion updates and improvements
 2015-07-15 10:40:41 -07:00
Jessie Frazelle cf09e435c8 Merge pull request #14608 from vincentbernat/fix/zsh-reviewers 
zsh: remove Vincent Bernat from reviewers for ZSH completion
 2015-07-14 07:08:06 -07:00