40fe606d4e
Merge pull request #17098 from sdurrheimer/zsh-completion-import-message
...
Add zsh completion for 'docker import -m --message'
Upstream-commit: ccf5b60c6f291da16d3857ac9bfddb1d8407e7be
Component: engine
2015-10-16 11:36:46 -07:00
6d17273149
Merge pull request #17101 from sdurrheimer/zsh-completion-deprecate-run-dash-c-option
...
Deprecate 'docker run -c' option in zsh completion
Upstream-commit: 08a43b8b3b68273fcc84cd7f04419a103dcad76a
Component: engine
2015-10-16 11:40:02 -04:00
e3c27b1293
Merge pull request #17099 from sdurrheimer/zsh-completion-restart-unless-stopped
...
Add zsh completion for 'unless-stopped' restart policy
Upstream-commit: 30b945fac958ccf1f9bbed45c2433c1ebcdf6f08
Component: engine
2015-10-16 11:37:27 -04:00
551d7de4db
Add zsh completion for 'docker import -m --message'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 96a09ea77cc4d8f80be4bd3e382688223e8c5c7e
Component: engine
2015-10-16 10:14:42 +02:00
ef552b72f9
Add zsh completion for 'docker build --build-arg'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 89e0990224f520f8772da4872dd277bae2c1287f
Component: engine
2015-10-16 08:48:12 +02:00
9a4b26a580
Deprecate 'docker run -c' option in zsh completion
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: c37c9df18a2fc3c34be3d8d21dae16553c8d4633
Component: engine
2015-10-16 08:37:16 +02:00
5f8debf9b3
Add zsh completion for 'unless-stopped' restart policy
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: cb2bd8bcec38a597208209f0fb52593f3b6844a4
Component: engine
2015-10-16 08:30:56 +02:00
24ba438ab4
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
Upstream-commit: ebfed4d474489bfa8b0d16f6628c1e28388d8ea3
Component: engine
2015-10-15 13:48:39 -07:00
de9c63d909
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 >
Upstream-commit: a00c0d795dcba112262d3dd297247259f9b50488
Component: engine
2015-10-15 21:40:50 +02:00
d24169e5d2
Remove '-n -l --latest' options from 'docker network ls' in zsh completion
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 080a906aac1760922a2791e86dc10190600c9f7c
Component: engine
2015-10-15 21:12:31 +02:00
2a30cdb717
Merge pull request #17057 from mavenugo/nls
...
Added `network` to docker --help and help cleanup
Upstream-commit: f255155f6b2e2205b9d644c663f2c8fb1570d4fe
Component: engine
2015-10-15 11:00:43 -07:00
7b66bab8fb
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: 46f7ab35854151ac054bf04f2bb7b344374b6d02
Component: engine
2015-10-15 03:10:39 -07:00
fb276a0432
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 >
Upstream-commit: 42d643af55a1a6e1a2262cb0e97fbe82589af40d
Component: engine
2015-10-15 14:02:18 +08:00
cce0231be7
Add bash completion for docker inspect --size
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 29714ee836fa263143986de8dc04bbf821277eab
Component: engine
2015-10-14 17:34:56 +02:00
019ffb819f
Merge pull request #15796 from azurezk/add-size-to-inspect
...
add container size info to inspect
Upstream-commit: ce607916e9b4e294e66188bbaf50acaa86e3909f
Component: engine
2015-10-13 23:16:10 +02:00
6ed533b627
Merge pull request #16922 from albers/completion-network
...
[Fix #16919 ] Add bash completion for `docker network`
Upstream-commit: 3fc75c97399676ae2ac6e667a517ecee640d9138
Component: engine
2015-10-13 11:25:54 -07:00
ae4ea17577
Merge pull request #16904 from vikstrous/fish_completion_bug
...
fix fish completion wrong image names bug
Upstream-commit: 151564d39b5df4d428a4709e20b0e9eaac89f6ad
Component: engine
2015-10-12 20:42:24 +02:00
2151d5fbfe
Merge pull request #16914 from coolljt0725/add_userns_check
...
Add user namespace check to check-chonfig.sh
Upstream-commit: 0b122dc55bfebaa167f63fd8d010d0c7b1e87c99
Component: engine
2015-10-12 20:39:46 +02:00
2ede0b7338
Add zsh completion for 'docker network'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 24174e8a84082ca8ac337858db311a6f39699f3e
Component: engine
2015-10-12 12:06:12 +02:00
1018cbd343
Bash completion for docker network
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 68de2d48341fa7c2acd441429bb30fc50f875e24
Component: engine
2015-10-11 11:07:48 -07:00
51395cbbce
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 >
Upstream-commit: e4bf5cff49a152794b924d9cf4d6cee605f2d73a
Component: engine
2015-10-11 11:07:33 -07:00
a9b61f95aa
Add user namespace check to check-chonfig.sh
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: d475c4ddc1b8a3a15a10c20c4ec4e15f642d71e4
Component: engine
2015-10-11 17:26:34 +08:00
e49a07f95b
Add zsh completion for '--cluster-store-opt'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: ae31aa10abae62f95443ca610b0bae2662973776
Component: engine
2015-10-10 16:42:01 +02:00
9375e8c909
add size to inspect
...
Signed-off-by: Zhang Kun <zkazure@gmail.com >
Upstream-commit: b4d6b23838bb7d8436a1966fc3ef3ade83544d58
Component: engine
2015-10-10 20:44:29 +08:00
c06269ae99
fix fish completion; wrong image names bug; close #16672
...
Signed-off-by: Viktor Stanchev <me@viktorstanchev.com >
Upstream-commit: 4d746658cced59cdbcc2e045d8ed931f782ef1dd
Component: engine
2015-10-10 00:55:09 -07:00
da342b53ce
Merge pull request #16788 from stefanberger/apparmor_policy_1.9
...
contrib: Adjustments to AppArmor docker engine policy for docker 1.9
Upstream-commit: e5f7fdccfba05fa3d72374b31497e73a46c60471
Component: engine
2015-10-09 20:15:06 -07:00
109ae801cf
Add bash completion for --cluster-store-opt
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: a095f82877cd3ab7e49526715259a86b47c996f4
Component: engine
2015-10-09 14:00:52 +02:00
ea88988c20
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 >
Upstream-commit: f5be0821cfc583f187f7e91865c987d78321670c
Component: engine
2015-10-08 10:08:53 -04:00
3ba7e5f650
change flag name to better follow the other flags that start with disable;
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: c559d8ebf7df5f7b7cb912c34e2f9056fa1b32e5
Component: engine
2015-10-07 10:16:37 -07:00
29630cd41d
Add zsh completion for 'docker daemon --no-legacy-registry'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 883fe220ec0016922cf769f6ff8b7f85d9994d82
Component: engine
2015-10-05 08:31:00 +02:00
72f4bc7137
Merge pull request #16744 from runcom/fix-mam-commandline
...
Fix man and commandline docs
Upstream-commit: 67eb810a604905df0a33ce20085c8aeddfb0171a
Component: engine
2015-10-04 22:28:19 +02:00
356a51b97e
Merge pull request #16751 from albers/completion--no-legacy-registry
...
Add bash completion for `docker daemon --no-legacy-registry`
Upstream-commit: 4843323a46dc5aa101a111a35fcce6eacfad5bd0
Component: engine
2015-10-04 22:13:51 +02:00
b51b5af287
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 >
Upstream-commit: 14e8898648909379f37049828e103ba1c97f253b
Component: engine
2015-10-04 21:22:27 +02:00
373a4e79bb
Merge pull request #16561 from ai-traders/restart_on_debian
...
#16560 Add timeout to `sudo service docker stop` on sysvinit
Upstream-commit: e6ca006d8634a0fa9c6eb655aa9c872b84c5e438
Component: engine
2015-10-04 11:25:59 -07:00
e3177a2c43
Add bash completion for --no-legacy-registry
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 3f04ab2fc773a89f2ff465d995d10793a67f23a2
Component: engine
2015-10-04 06:49:42 -07:00
906e8ce80c
Merge pull request #16629 from sdurrheimer/cluster-options-zsh-completion
...
Add zsh completion for --cluster-store and --cluster-advertise
Upstream-commit: 825f1a7e286699d3f4bc03e657fd37f8a7a68aed
Component: engine
2015-09-30 20:48:25 +01:00
e7ae7ea3cd
Add zsh completion for --cluster-store and --cluster-advertise options for docker daemon
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: c576310b6f11c22c1372d1aa214d4c2efdbc7d7f
Component: engine
2015-09-28 15:13:42 +02:00
ca41ef5d58
bash completion for docker daemon --cluster-*
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 1c71c1995fd9989c3d3c6a06e0dfdfe39c32a206
Component: engine
2015-09-28 11:23:23 +02:00
b32a8c3c1d
#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 >
Upstream-commit: 5c94a9e800ed4f2e43f472b214f699c22fd7e2fe
Component: engine
2015-09-24 19:41:32 +00:00
58c0f4ebe8
Merge pull request #14579 from hqhq/hq_add_softlimit
...
Add support for memory reservation
Upstream-commit: 84b53c8d87c0ab887209a51e54fad60a591e737a
Component: engine
2015-09-24 12:11:36 -07:00
24584ca8a3
Merge pull request #16523 from coolljt0725/correct_help_message_of_docker_cp
...
Docs: correct the description of docker cp
Upstream-commit: a077c46d140ade9b78d81c66fe4b752e6ea25f13
Component: engine
2015-09-23 15:40:58 -07:00
72d0228543
Merge pull request #15915 from sdurrheimer/master
...
Zsh completion updates
Upstream-commit: 8d69e0eae06a741c8887af12d09461e89b950515
Component: engine
2015-09-23 17:20:34 -04:00
97e65cfb4f
Merge pull request #16521 from matthiasr/fix/syvinit-debian/basename-on-boot
...
Do not try to guess "docker" in Debian SysV init script
Upstream-commit: ce092ed08e9fb762d76501e9b99c132142bdaf6b
Component: engine
2015-09-23 13:46:19 -07:00
95826bd037
fix zypper BS wrt interactive
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: d265f93f6e9f6232b957592bba9a25fbc426a8c9
Component: engine
2015-09-23 04:48:06 -07:00
871fe73c24
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 >
Upstream-commit: 01c5cfcc5629e1d90a50a8447f9712fa6ff49f48
Component: engine
2015-09-23 11:27:34 +00:00
4f3fe3187a
Add support for memory reservation
...
Signed-off-by: qhuang <qhuang@10.0.2.15>
Upstream-commit: aa1780997f42a3fbe3a7f9c7be2b8a5092b9b7c1
Component: engine
2015-09-23 14:02:45 +08:00
26c6a8d526
Merge pull request #16328 from jfrazelle/opensuse-rpms
...
add opensuse to rpm builder
Upstream-commit: b0dc11127ef4fc20261ccc0db03a16b17f7f91c4
Component: engine
2015-09-22 15:59:49 -07:00
7e4c20cd08
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 >
Upstream-commit: 9d8f9943e99b87aa637921bbf582a767cbab6cf1
Component: engine
2015-09-22 12:17:30 -07:00
dbbb1621a8
Merge pull request #16400 from albers/completion-log-opt-tags
...
bash completion: use generic `tag` log driver option
Upstream-commit: 108891069f60a535ca6397b388145bd188dc8263
Component: engine
2015-09-21 17:17:11 -07:00
4168ba7ed4
docker restarts running OR stopped containers, docs edit rm "running"
...
Signed-off-by: Sally O'Malley <somalley@redhat.com >
Upstream-commit: e41753678d5ffd6c505f1984943bc36d34e134bb
Component: engine
2015-09-20 09:16:27 -04:00
Sebastiaan van Stijn
Brian Goff
Steve Durrheimer
Jess Frazelle
David Calavera
Madhu Venugopal
Qiang Huang
Harald Albers
Vincent Demeester
Lei Jitang
Zhang Kun
Viktor Stanchev
Stefan Berger
Jessica Frazelle
Antonio Murdaca
Tianon Gravi
Ewa Czechowska
Tibor Vass
Matthias Rampke
qhuang
Sally O'Malley