centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-04-12 14:25:46 +07:00
Code Issues Packages Projects Releases Wiki Activity
17,801 Commits 57 Branches 28 Tags
eb7b2ed6bbe3fbef588116d362ce595d6e35fc43
Commit Graph

144 Commits

Author SHA1 Message Date
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
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
Steve Durrheimer
91a2d9cc7d Several cosmetic improvements in zsh completion 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2015-07-14 11:34:33 +02:00
Steve Durrheimer
12f67141f9 Zsh completion update for the following commits: 
- Add fluentd logging driver to zsh completion #12876
- Add inspect --type flag to zsh completion #13187
- Respect -H option in zsh completion #13195
- Fix number of argument limit for pause and unpause in zsh completion

Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2015-07-14 11:32:26 +02:00
Vincent Bernat
5dbb217bcb zsh: remove Vincent Bernat from reviewers for ZSH completion 
Signed-off-by: Vincent Bernat <vincent@bernat.im>
 2015-07-13 23:15:16 +02:00
Mrunal Patel
d77d0268eb Adds documentation for additional groups. 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
 2015-07-13 14:47:28 -04:00
Harald Albers
ea26b38784 Add some missing events to bash completion 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-07-07 09:04:15 +02:00
Shishir Mahajan
2cb74e6915 Flag Addition: --type flag added for docker inspect command 
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
 2015-07-01 12:14:01 -04:00
Steve Durrheimer
b2cc6f1b47 Update the zsh completion 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2015-06-21 17:33:07 +02:00
Harald Albers
b2832dffe5 Update bash completion for 1.7.0 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-05-29 12:42:59 +02:00
Jessica Frazelle
40b71adee3 Revert "Add docker exec run a command in privileged mode" 
This reverts commit 72a500e9e5.

Signed-off-by: Jessica Frazelle <princess@docker.com>

Conflicts:
	daemon/execdriver/native/exec.go
	integration-cli/docker_cli_exec_test.go
	runconfig/exec.go
 2015-05-26 14:12:16 -07:00
Tianon Gravi
f74d9b8672 Merge pull request #13195 from albers/completion-custom-host 
respect -H in bash completion
 2015-05-20 17:31:16 -07:00
Shishir Mahajan
8b2c6cb072 root dir for execdriver (/var/run/docker) should be configurable 
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
 2015-05-15 09:30:36 -04:00
Harald Albers
db5b4a2a69 respect -H in bash completion 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-05-13 13:39:25 -07:00
Ahmet Alp Balkan
cb9a6b9aed Add --since argument to docker logs cmd 
Added --since argument to `docker logs` command. Accept unix
timestamps and shows logs only created after the specified date.

Default value is 0 and passing default value or not specifying
the value in the request causes parameter to be ignored (behavior
prior to this change).

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
 2015-05-10 20:42:14 +00:00
Ma Shimiao
dccb8b5c33 add cpu.cfs_period_us support 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
 2015-05-09 10:02:46 +08:00
Tibor Vass
91fb4d672a Merge pull request #10766 from cpuguy83/stats_pull_once 
Allow pulling stats once and disconnecting.
 2015-05-04 22:28:01 -07:00
Brian Goff
f3023a93d1 Allow pulling stats once and disconnecting. 
Adds a `stream` query param to the stats API which allows API users to
only collect one stats entry and disconnect instead of keeping the
connection alive to stream more stats.

Also adds a `--no-stream` flag to `docker stats` which does the same

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-05-04 10:49:13 -04:00
Tianon Gravi
380b873752 Only complete repos with "docker pull -a" 
With this, `docker pull deb<tab>` will show all `debian:*` tags, as before, but `docker pull -a deb<tab>` will complete directly to just `debian`. 👍

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2015-05-01 10:04:24 -06:00
Jessica Frazelle
d4bbbe58dd Add docs for --exec-opt and setting native.cgroupdriver. 
update man pages.
update bash completion.

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)
 2015-04-27 17:04:28 -07:00
Lei Jitang
5f4fb8be00 Add cpu cfs quota to build 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-04-24 08:54:08 +08:00
Lei Jitang
dcc50e1d59 Add support cpu cfs quota 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-04-20 08:16:47 -07:00
Lei Jitang
72a500e9e5 Add docker exec run a command in privileged mode 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-04-11 11:26:37 +08:00
Lei Jitang
2cce4791b0 Add -u|--user flag to docker exec for running command as a different user 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-04-11 11:04:24 +08:00