fe4028f4f6
Merge pull request #17334 from sdurrheimer/zsh-completion-log-options
...
Add zsh completion for log options
Upstream-commit: 346d195f6a8ed5217cb859ed1a6673eeb840e21d
Component: engine
2015-11-17 15:53:31 -08:00
cbf9321ca8
Merge pull request #17891 from splunk/splunk-logger-support-for-tag-env-labels
...
Allow configurable metadata for Splunk log driver
Upstream-commit: a3065fa48f889ef438a7d7339ebc8fe01aca10dd
Component: engine
2015-11-16 10:11:27 -08:00
02d6078f37
bash completion for docker {run,create} --volume-driver
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: d411c47139e9a6d94c54bfb4052e7d12bf4295f0
Component: engine
2015-11-15 09:53:22 -08:00
8d0649a213
correct ltdl for centos
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 41619f4a902927767d149524b45d23ab9569636b
Component: engine
2015-11-14 08:50:58 -08:00
08e6893ada
update debs/rpms for pkcs11 yubikey things
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: cf4c3da725e5c923b637a0dbea3d20064286f008
Component: engine
2015-11-13 13:20:53 -08:00
c0d8796b26
Merge pull request #13959 from Mashimiao/add-support-blkio_weight_device
...
Add support for blkio.weight_device
Upstream-commit: 812a1c149a4a6db09eb59af29bed2713821e696e
Component: engine
2015-11-12 20:42:13 +01:00
bba768bb09
Allow configurable metadata for Splunk log driver
...
Add support of `tag`, `env` and `labels` for Splunk logging driver.
Removed from message `containerId` as it is the same as `tag`.
Signed-off-by: Denis Gladkikh <denis@gladkikh.email >
Upstream-commit: 26855c780184c528446957bd77821c6f4c74b343
Component: engine
2015-11-12 06:36:51 -08:00
64b4b99455
Add zsh completion for log options
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 76fe00c859745bfc9c128b951ab7575fe370b7f2
Component: engine
2015-11-12 09:53:35 +01:00
860252559c
Add zsh completion for 'docker {run,create} --volume-driver'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 8446a5c88bd744df7f7468ec7eb8d8dee4e7c7e9
Component: engine
2015-11-12 08:35:32 +01:00
5c10a00d00
Merge pull request #17807 from albers/completion-network-yes
...
Align configuration of bash completion with existing values
Upstream-commit: ee8aadbdd98c81d35e6072d4c1dc19cf1e79919e
Component: engine
2015-11-11 20:01:27 +00:00
1a0735060a
Add support for blkio.weight_device
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
Upstream-commit: 0fbfa1449d917ee0778266139d6035fb0782f7c2
Component: engine
2015-11-11 23:06:36 +08:00
5474215e49
Merge pull request #17806 from albers/fix-17768
...
Fix bash completion on systems where extglob is not set
Upstream-commit: d575d1e0944d5b245b7b21f46015346209f4a70e
Component: engine
2015-11-10 21:32:23 +00:00
e9d65a16e5
Add zsh completion for 'docker stats --all -a'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: ba2a5a420d6adf5ab7cd861d1c263dc8b74c7773
Component: engine
2015-11-10 08:47:46 +01:00
77d68ba99d
bash completion for docker stats --all
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: ee13fc5b2f15ae5b4a8c1a6ee23355e6463e2b48
Component: engine
2015-11-09 16:27:13 +01:00
63a8bacd69
Fix bash completion on systems where extglob is not set
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 211e3b0df67d17989c7aff63d1a0098ad61f07a3
Component: engine
2015-11-08 22:31:16 -08:00
576351b40d
Align configuration of bash completion with existing values
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 8311db14fc2b71b5fd67f23527c3fd09a3addc85
Component: engine
2015-11-08 09:35:48 -08:00
d04d1fe56b
Fix missing -d flag in docker.fish
...
Signed-off-by: Guilhem Lettron <guilhem@lettron.fr >
Upstream-commit: 4a3cd881721ff7986fcdc3544e67b66a259c2ca6
Component: engine
2015-11-06 11:53:17 +01:00
13125ff6b4
Merge pull request #17700 from calavera/remove_lxc
...
Remove LXC support.
Upstream-commit: 2519f465501657c24ecd13b8e53964b6c2f1a78d
Component: engine
2015-11-05 15:22:37 -08:00
f427a47755
Remove exec-driver global daemon option.
...
Each platform has only a driver now.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 157b66ad390902ef6f5b51b3f76d5177eacac81b
Component: engine
2015-11-05 17:09:58 -05:00
ef88e7ace2
Remove LXC support.
...
The LXC driver was deprecated in Docker 1.8.
Following the deprecation rules, we can remove a deprecated feature
after two major releases. LXC won't be supported anymore starting on Docker 1.10.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 3b5fac462d21ca164b3778647420016315289034
Component: engine
2015-11-05 17:09:57 -05:00
0962f376e6
Merge pull request #17731 from PerfectMemory/upstart-start-on-filesystem
...
Update upstart init script to start on filesystem (not only on local ones).
Upstream-commit: 6417c53c5ac4a066a0743c595e53c599a21c1e7e
Component: engine
2015-11-05 13:51:07 -08:00
bbe8f4c04c
Merge pull request #17678 from asbjornenge/tm_syntax_updates
...
Added ARG instruction and aligned with src repo
Upstream-commit: 8de3d630add946e97d2a1e4895de1b7691b0b842
Component: engine
2015-11-05 16:30:19 -05:00
266b690d59
Update upstart init script to start on filesystem (not only on local ones).
...
Signed-off-by: Julien Pervillé <julien.perville@perfect-memory.com >
Upstream-commit: 6f83dd22a36b57fdc75bd2b6cbce7572b0695f99
Component: engine
2015-11-05 20:38:52 +01:00
e5389225be
Merge pull request #17677 from fboudra/master
...
Remove yum cache to reduce image size
Upstream-commit: 3c6962f22d60e1afd43ebbf87ff5586f16131011
Component: engine
2015-11-05 11:16:40 -08:00
60f7222f3f
More Rules for AppArmor
...
This patch addresses the following AppArmor complains:
type=AVC msg=audit(1445537397.873:547): apparmor="ALLOWED" operation="mount"
info="failed srcname match" error=-13 profile="/usr/bin/docker"
name="/.pivot_root602836504/" pid=11512 comm="exe" flags="rw, rprivate"
type=AVC msg=audit(1445537265.325:502): apparmor="ALLOWED"
operation="file_lock" profile="/usr/bin/docker"
name="/var/lib/docker/network/files/local-kv.db" pid=9574 comm="docker"
requested_mask="k" denied_mask="k" fsuid=0 ouid=0
Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com >
Upstream-commit: 02411987ffc696e867ac202e79c82ac97b3ae69a
Component: engine
2015-11-05 11:06:18 -05:00
281fcbcfb6
Merge pull request #17574 from Microsoft/10662-devicetool
...
Windows: Fix docker device tool
Upstream-commit: 71db33738d681ab7855998e414d426fcc26f16ea
Component: engine
2015-11-05 13:05:28 +01:00
2d427f2dc5
Added ARG instruction and aligned with src repo
...
Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net > (github: asbjornenge)
Upstream-commit: 8d7459140701006fb8e3a0550872ce55c43bcec0
Component: engine
2015-11-05 10:56:07 +01:00
aeaa07bfd4
Remove yum cache to reduce image size
...
mkimage-yum.sh has a lot in common with mkimage-rinse.sh, including extra
files clean up. Sync with mkimage-rinse.sh by removing yum cache to reduce
the image size.
Minor changes to reduce also the delta/diff and make it easier to sync with
mkimage-rinse.sh script.
Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org >
Upstream-commit: 3e9fc478aebee8d4c3dd96e150e6af450dfe9350
Component: engine
2015-11-04 07:19:09 +02:00
57e4556453
add fedora 23 for all the crazies who already want it
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 45788bb62d6dcdc5b429b5ba10216d2af0402119
Component: engine
2015-11-03 14:01:55 -08:00
65fd5ee0c9
Windows: Fix docker device tool
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 96b45e9216252863f1a4c89218877e8354030aba
Component: engine
2015-10-31 11:32:37 -07:00
5502018bf5
update go version for debs and rpms
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 985fe8857d6670e5a484237a8c8ccdde66a39013
Component: engine
2015-10-29 17:04:38 -07:00
7a5788a9d4
Fix docker-device-tool
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 584bdaf5d92d1f8beda602493c90c389d6b82b47
Component: engine
2015-10-28 16:43:53 -07:00
e752bdf012
update dockerfile to use dnf because i hate the warning
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: b8891a32d13724bb992d9e8aca4777a32334371e
Component: engine
2015-10-27 10:25:39 -07:00
9c9f207191
Fix missing double quote in zsh completion
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: e46445e844bca26775f88b3075d227f8e867a22a
Component: engine
2015-10-27 10:50:45 +01:00
8832da6b74
Merge pull request #17124 from vincentbernat/fix/zsh-option-stacking
...
zsh: enable option stacking
Upstream-commit: b92fd9ff0499deb7303557ef8163f0661361a8c0
Component: engine
2015-10-27 01:39:04 +01:00
9b6c8de881
Merge pull request #17377 from LK4D4/remove_host_integration
...
Remove contrib/host-integration
Upstream-commit: bffcb8226e400bf945bd233a7ecdf44cad2bb3ac
Component: engine
2015-10-26 23:45:20 +01:00
641ecc1ebd
Merge pull request #17002 from jfrazelle/apparmor-check-version-on-deb-install
...
apparmor check version on deb install
Upstream-commit: 9312a738d84e880bf4635ba4b7729b3c2e017fbc
Component: engine
2015-10-26 22:44:11 +01:00
9d52fef685
zsh: allow option stacking for short options without arguments
...
This enables Zsh to understand commands like "docker run -it
ubuntu". However, by enabling this, this also makes Zsh completes
"docker run -u<tab>" with "docker run -uapprox" which is not valid. The
users have to put the space or the equal sign themselves before trying
to complete.
Therefore, this behavior is disabled by default. To enable it:
zstyle ':completion:*:*:docker:*' option-stacking yes
zstyle ':completion:*:*:docker-*:*' option-stacking yes
Signed-off-by: Vincent Bernat <vincent@bernat.im >
Upstream-commit: 402caa94d23ea3ad47f814fc1414a93c5c8e7e58
Component: engine
2015-10-26 21:58:59 +01:00
fc2e9f4e02
zsh: allow short options to specify their arguments with "="
...
This is allowed by Docker and helps the completion to not get confused
when a user uses this notation. This will also help to enable stacking
of short options since Zsh needs that to not stack options with
arguments.
Signed-off-by: Vincent Bernat <vincent@bernat.im >
Upstream-commit: 8ac32d900a6d1cd20e9585d012b0be414507e727
Component: engine
2015-10-26 21:58:59 +01:00
f73c11178a
Remove contrib/host-integration
...
It's outdated and unused.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 0dec8091a23dcb877b4a881face936fb0689420c
Component: engine
2015-10-26 13:18:50 -07:00
15bb74c0cb
Merge pull request #17134 from sdurrheimer/zsh-completion-build-multi-tag
...
Add zsh completion for 'docker build' multi tags
Upstream-commit: 74b9d89648ffe55ca5b7f0d67cf28ff6bc404f36
Component: engine
2015-10-26 19:05:23 +01:00
80d5075264
Merge pull request #17333 from sdurrheimer/zsh-completion-fix-repeatable-options
...
Fix repeatable options in zsh completion
Upstream-commit: 7e275cf0e5e1edff77ce9b159e995e03f6ac3371
Component: engine
2015-10-26 12:43:21 -04:00
f5dc31b651
Add zsh completion for 'docker build' multi tags
...
+ Fix some others multi options
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: cc77fc3cb27c90568857c80d08787806d35aa5c8
Component: engine
2015-10-24 16:41:22 +02:00
02bb7042cb
Fix repeatable options in zsh completion
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 796380761007a0d0087b41b1ee0d76fd6a7a6e20
Component: engine
2015-10-24 16:38:41 +02:00
a34e3f32e2
Add splunk log driver to zsh completion
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 230313b1c5cced44dd5ead776b2f62b55358222d
Component: engine
2015-10-24 13:49:27 +02:00
7a1aba432f
Add Splunk logging driver #16207
...
Allow to send Splunk logs using Http Event Collector
Signed-off-by: Denis Gladkikh <denis@gladkikh.email >
Upstream-commit: 1f1dbf312ddc299bdad408ce3d6b71f4f5993652
Component: engine
2015-10-23 13:37:53 -07:00
4fb18756d8
Merge pull request #17306 from albers/completion-log-driver-options
...
bash completion for log driver options `env` and `labels`
Upstream-commit: a2e5bbe6409d1e639ed18ea2679b44da6bcd7332
Component: engine
2015-10-23 21:28:40 +02:00
46ae794f08
bash completion for log driver options env and labels
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: d0c019850c988735727723d04bfd82771fe650f8
Component: engine
2015-10-23 10:55:47 +02:00
8a2663e8ae
Zsh completion for 'docker network inspect' multiple networks
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: cb93fefa402c57986567a2a16afe0f49a3338b82
Component: engine
2015-10-23 08:13:33 +02:00
14cf75b797
Merge pull request #17270 from albers/completion-network-ids
...
bash completion can be configured to complete network IDs
Upstream-commit: 4816626f3e84ef6452ecfed9d79ae537273bde31
Component: engine
2015-10-22 13:37:38 -07:00
