Commit graph

2142 commits

Author SHA1 Message Date
Brian Goff
08a43b8b3b Merge pull request #17101 from sdurrheimer/zsh-completion-deprecate-run-dash-c-option
Deprecate 'docker run -c' option in zsh completion
2015-10-16 11:40:02 -04:00
Brian Goff
30b945fac9 Merge pull request #17099 from sdurrheimer/zsh-completion-restart-unless-stopped
Add zsh completion for 'unless-stopped' restart policy
2015-10-16 11:37:27 -04:00
Harald Albers
b0315375f8 Add missing options to bash completion for docker import
Signed-off-by: Harald Albers <github@albersweb.de>
2015-10-16 12:42:12 +02:00
Harald Albers
3a713d91ce bash completion: minor refactoring for consistency
Signed-off-by: Harald Albers <github@albersweb.de>
2015-10-16 12:41:09 +02:00
Harald Albers
28c66b0491 Add missing options to bash completion for docker build
Signed-off-by: Harald Albers <github@albersweb.de>
2015-10-16 12:40:55 +02:00
Steve Durrheimer
96a09ea77c Add zsh completion for 'docker import -m --message'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2015-10-16 10:14:42 +02:00
Steve Durrheimer
89e0990224 Add zsh completion for 'docker build --build-arg'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2015-10-16 08:48:12 +02:00
Steve Durrheimer
c37c9df18a Deprecate 'docker run -c' option in zsh completion
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2015-10-16 08:37:16 +02:00
Steve Durrheimer
cb2bd8bcec Add zsh completion for 'unless-stopped' restart policy
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2015-10-16 08:30:56 +02:00
Jess Frazelle
ebfed4d474 Merge pull request #17082 from sdurrheimer/zsh-completion-remove-network-ls-old-options
Remove 'docker network ls -n -l --latest' options from in zsh completion
2015-10-15 13:48:39 -07:00
Steve Durrheimer
a00c0d795d Add zsh completion for '--ipam-driver --subnet --ip-range --gateway --aux-address' for 'docker network create'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2015-10-15 21:40:50 +02:00
Steve Durrheimer
080a906aac Remove '-n -l --latest' options from 'docker network ls' in zsh completion
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2015-10-15 21:12:31 +02:00
David Calavera
f255155f6b Merge pull request #17057 from mavenugo/nls
Added `network` to docker --help and help cleanup
2015-10-15 11:00:43 -07:00
Madhu Venugopal
46f7ab3585 Added network to docker --help and help cleanup
Fixes https://github.com/docker/docker/issues/16909

Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-10-15 03:10:39 -07:00
Qiang Huang
42d643af55 Bump Go to 1.4.3 for builder
We already bumped this for Dockerfile, should keep build environment
consistent with that.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-10-15 14:02:18 +08:00
Harald Albers
29714ee836 Add bash completion for docker inspect --size
Signed-off-by: Harald Albers <github@albersweb.de>
2015-10-14 17:34:56 +02:00
Vincent Demeester
ce607916e9 Merge pull request #15796 from azurezk/add-size-to-inspect
add container size info to inspect
2015-10-13 23:16:10 +02:00
Jess Frazelle
3fc75c9739 Merge pull request #16922 from albers/completion-network
[Fix #16919] Add bash completion for `docker network`
2015-10-13 11:25:54 -07:00
Vincent Demeester
151564d39b Merge pull request #16904 from vikstrous/fish_completion_bug
fix fish completion wrong image names bug
2015-10-12 20:42:24 +02:00
Vincent Demeester
0b122dc55b Merge pull request #16914 from coolljt0725/add_userns_check
Add user namespace check to check-chonfig.sh
2015-10-12 20:39:46 +02:00
Steve Durrheimer
24174e8a84 Add zsh completion for 'docker network'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2015-10-12 12:06:12 +02:00
Harald Albers
68de2d4834 Bash completion for docker network
Signed-off-by: Harald Albers <github@albersweb.de>
2015-10-11 11:07:48 -07:00
Harald Albers
e4bf5cff49 Refactor bash completion: pull out subcommand parsing
`docker network` is the second command with subcommands.

This refactoring pulls out parsing and processing of subcommands
from `docker volume` completion and thus makes its logic available
for other commands.

Also enables `__docker_pos_first_nonflag` for subcommand completion.

Signed-off-by: Harald Albers <github@albersweb.de>
2015-10-11 11:07:33 -07:00
Lei Jitang
d475c4ddc1 Add user namespace check to check-chonfig.sh
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-10-11 17:26:34 +08:00
Steve Durrheimer
ae31aa10ab Add zsh completion for '--cluster-store-opt'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2015-10-10 16:42:01 +02:00
Zhang Kun
b4d6b23838 add size to inspect
Signed-off-by: Zhang Kun <zkazure@gmail.com>
2015-10-10 20:44:29 +08:00
Viktor Stanchev
4d746658cc fix fish completion; wrong image names bug; close #16672
Signed-off-by: Viktor Stanchev <me@viktorstanchev.com>
2015-10-10 00:55:09 -07:00
Jess Frazelle
e5f7fdccfb Merge pull request #16788 from stefanberger/apparmor_policy_1.9
contrib: Adjustments to AppArmor docker engine policy for docker 1.9
2015-10-09 20:15:06 -07:00
Harald Albers
a095f82877 Add bash completion for --cluster-store-opt
Signed-off-by: Harald Albers <github@albersweb.de>
2015-10-09 14:00:52 +02:00
Stefan Berger
f5be0821cf contrib: Adjustments to AppArmor docker engine policy for docker 1.9
This patch contains a few extensions for the AppArmor docker engine
policy for docker 1.9.

Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
2015-10-08 10:08:53 -04:00
Jessica Frazelle
c559d8ebf7
change flag name to better follow the other flags that start with disable;
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-10-07 10:16:37 -07:00
Steve Durrheimer
883fe220ec Add zsh completion for 'docker daemon --no-legacy-registry'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2015-10-05 08:31:00 +02:00
Sebastiaan van Stijn
67eb810a60 Merge pull request #16744 from runcom/fix-mam-commandline
Fix man and commandline docs
2015-10-04 22:28:19 +02:00
Vincent Demeester
4843323a46 Merge pull request #16751 from albers/completion--no-legacy-registry
Add bash completion for `docker daemon --no-legacy-registry`
2015-10-04 22:13:51 +02:00
Antonio Murdaca
14e8898648 Fix man and commandline docs
- missing help option in `docs/reference/commandline/*.md` (some files
  have it, the other I fixed didn't)
- missing `[OPTIONS]` in Usage description
- missing options
- formatting
- start/stop idempotence

Signed-off-by: Antonio Murdaca <amurdaca@redhat.com>
2015-10-04 21:22:27 +02:00
Tianon Gravi
e6ca006d86 Merge pull request #16561 from ai-traders/restart_on_debian
#16560 Add timeout to `sudo service docker stop` on sysvinit
2015-10-04 11:25:59 -07:00
Harald Albers
3f04ab2fc7 Add bash completion for --no-legacy-registry
Signed-off-by: Harald Albers <github@albersweb.de>
2015-10-04 06:49:42 -07:00
Vincent Demeester
825f1a7e28 Merge pull request #16629 from sdurrheimer/cluster-options-zsh-completion
Add zsh completion for --cluster-store and --cluster-advertise
2015-09-30 20:48:25 +01:00
Steve Durrheimer
c576310b6f Add zsh completion for --cluster-store and --cluster-advertise options for docker daemon
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2015-09-28 15:13:42 +02:00
Harald Albers
1c71c1995f bash completion for docker daemon --cluster-*
Signed-off-by: Harald Albers <github@albersweb.de>
2015-09-28 11:23:23 +02:00
Ewa Czechowska
5c94a9e800 #16560 Add timeout to sudo service docker stop on sysvinit
Add 10 seconds timeout when running `sudo service docker stop`. This is
especially needed when running `sudo service docker restart`. Otherwise,
`restart` results in exitstatus 1, because `start` has nothing to do.

Signed-off-by: Ewa Czechowska <ewa@ai-traders.com>
2015-09-24 19:41:32 +00:00
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
Jess Frazelle
ce092ed08e Merge pull request #16521 from matthiasr/fix/syvinit-debian/basename-on-boot
Do not try to guess "docker" in Debian SysV init script
2015-09-23 13:46:19 -07:00
Jessica Frazelle
d265f93f6e
fix zypper BS wrt interactive
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-09-23 04:48:06 -07:00
Matthias Rampke
01c5cfcc56 Do not try to guess "docker" in Debian SysV init script
On boot, the init script is invoked from `/etc/rcN.d/S20docker` (where N
is the runlevel). Consequently, the init script tried to find the
defaults at `/etc/defaults/S20docker` and the binary at
`/usr/bin/S20docker`. This causes the docker daemon to fail at boot with
the error

    /usr/bin/S20docker not present or not executable

Starting it manually works because it invokes `/etc/init.d/docker` which
has the correct basename.

Fix this by hardcoding "docker" as the base name.

Signed-off-by: Matthias Rampke <mr@soundcloud.com>
2015-09-23 11:27:34 +00: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
David Calavera
b0dc11127e Merge pull request #16328 from jfrazelle/opensuse-rpms
add opensuse to rpm builder
2015-09-22 15:59:49 -07: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