Tianon Gravi
ae1fadeb96
Merge pull request #17714 from mikedougherty/cs-release-fixes
...
Fixes for release scripts
2015-11-23 19:47:10 -08:00
Mike Dougherty
a15b67b1af
Fixes for release scripts:
...
Add a flag to allow keeping bundles around (helps with CI)
Fix several problems in repo make targets
* quote DOCKER_EXPERIMENTAL variable
* pass-through arguments for gpg provided to dpkg-sig are now quoted
properly, so passphrases with shell-interpolated symbols can be used
* when determining deb suites, don't rely on 'origin' to be
github.com/docker/docker
Fix some issues with deb repository creation from scratch
* Don't add empty components to the repository configuration as they
will cause failure when generating.
Add old docker-engine-cs name to package conflicts
Signed-off-by: Mike Dougherty <mike.dougherty@docker.com>
2015-11-23 17:15:54 -08:00
Rui Lopes
ca94adc7c1
mkimage-arch: remove the test container after run
...
Signed-off-by: Rui Lopes <rgl@ruilopes.com>
2015-11-22 11:49:54 +00:00
David Calavera
33d9ae358c
Merge pull request #18055 from vincentbernat/fix/zsh-invalid-cache
...
zsh: ensure we have enough commands to store in the cache
2015-11-18 10:36:32 +01:00
Vincent Bernat
8105a3a366
zsh: remove lxc-related completion
...
LXC support has been deprecated and the related completion has been
removed in #17700 but was added back in #17334 .
Signed-off-by: Vincent Bernat <vincent@bernat.im>
2015-11-18 08:13:03 +01:00
Vincent Bernat
61564bcb5f
zsh: ensure we have enough commands to store in the cache
...
Otherwise, the cache would be invalid and won't be refreshed soon. This
can happen when the user has the completion installed before docker is
installed.
Signed-off-by: Vincent Bernat <vincent@bernat.im>
2015-11-18 08:08:43 +01:00
Alexander Morozov
346d195f6a
Merge pull request #17334 from sdurrheimer/zsh-completion-log-options
...
Add zsh completion for log options
2015-11-17 15:53:31 -08:00
Alexander Morozov
a3065fa48f
Merge pull request #17891 from splunk/splunk-logger-support-for-tag-env-labels
...
Allow configurable metadata for Splunk log driver
2015-11-16 10:11:27 -08:00
Harald Albers
d411c47139
bash completion for docker {run,create} --volume-driver
...
Signed-off-by: Harald Albers <github@albersweb.de>
2015-11-15 09:53:22 -08:00
Jessica Frazelle
41619f4a90
correct ltdl for centos
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-11-14 08:50:58 -08:00
Jessica Frazelle
cf4c3da725
update debs/rpms for pkcs11 yubikey things
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-11-13 13:20:53 -08:00
Vincent Demeester
812a1c149a
Merge pull request #13959 from Mashimiao/add-support-blkio_weight_device
...
Add support for blkio.weight_device
2015-11-12 20:42:13 +01:00
Denis Gladkikh
26855c7801
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>
2015-11-12 06:36:51 -08:00
Steve Durrheimer
76fe00c859
Add zsh completion for log options
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2015-11-12 09:53:35 +01:00
Steve Durrheimer
8446a5c88b
Add zsh completion for 'docker {run,create} --volume-driver'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2015-11-12 08:35:32 +01:00
Sebastiaan van Stijn
ee8aadbdd9
Merge pull request #17807 from albers/completion-network-yes
...
Align configuration of bash completion with existing values
2015-11-11 20:01:27 +00:00
Ma Shimiao
0fbfa1449d
Add support for blkio.weight_device
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2015-11-11 23:06:36 +08:00
Sebastiaan van Stijn
d575d1e094
Merge pull request #17806 from albers/fix-17768
...
Fix bash completion on systems where extglob is not set
2015-11-10 21:32:23 +00:00
Steve Durrheimer
ba2a5a420d
Add zsh completion for 'docker stats --all -a'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2015-11-10 08:47:46 +01:00
Harald Albers
ee13fc5b2f
bash completion for docker stats --all
...
Signed-off-by: Harald Albers <github@albersweb.de>
2015-11-09 16:27:13 +01:00
Harald Albers
211e3b0df6
Fix bash completion on systems where extglob is not set
...
Signed-off-by: Harald Albers <github@albersweb.de>
2015-11-08 22:31:16 -08:00
Harald Albers
8311db14fc
Align configuration of bash completion with existing values
...
Signed-off-by: Harald Albers <github@albersweb.de>
2015-11-08 09:35:48 -08:00
Guilhem Lettron
4a3cd88172
Fix missing -d
flag in docker.fish
...
Signed-off-by: Guilhem Lettron <guilhem@lettron.fr>
2015-11-06 11:53:17 +01:00
Solomon Hykes
2519f46550
Merge pull request #17700 from calavera/remove_lxc
...
Remove LXC support.
2015-11-05 15:22:37 -08:00
David Calavera
157b66ad39
Remove exec-driver global daemon option.
...
Each platform has only a driver now.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-11-05 17:09:58 -05:00
David Calavera
3b5fac462d
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>
2015-11-05 17:09:57 -05:00
Tianon Gravi
6417c53c5a
Merge pull request #17731 from PerfectMemory/upstart-start-on-filesystem
...
Update upstart init script to start on filesystem (not only on local ones).
2015-11-05 13:51:07 -08:00
Brian Goff
8de3d630ad
Merge pull request #17678 from asbjornenge/tm_syntax_updates
...
Added ARG instruction and aligned with src repo
2015-11-05 16:30:19 -05:00
Julien Pervillé
6f83dd22a3
Update upstart init script to start on filesystem (not only on local ones).
...
Signed-off-by: Julien Pervillé <julien.perville@perfect-memory.com>
2015-11-05 20:38:52 +01:00
Jess Frazelle
3c6962f22d
Merge pull request #17677 from fboudra/master
...
Remove yum cache to reduce image size
2015-11-05 11:16:40 -08:00
Stefan Berger
02411987ff
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>
2015-11-05 11:06:18 -05:00
Antonio Murdaca
71db33738d
Merge pull request #17574 from Microsoft/10662-devicetool
...
Windows: Fix docker device tool
2015-11-05 13:05:28 +01:00
Asbjørn Enge
8d74591407
Added ARG instruction and aligned with src repo
...
Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net> (github: asbjornenge)
2015-11-05 10:56:07 +01:00
Fathi Boudra
3e9fc478ae
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>
2015-11-04 07:19:09 +02:00
Jessica Frazelle
45788bb62d
add fedora 23 for all the crazies who already want it
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-11-03 14:01:55 -08:00
John Howard
96b45e9216
Windows: Fix docker device tool
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-10-31 11:32:37 -07:00
Jessica Frazelle
985fe8857d
update go version for debs and rpms
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-10-29 17:04:38 -07:00
Alexander Morozov
584bdaf5d9
Fix docker-device-tool
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-10-28 16:43:53 -07:00
Jessica Frazelle
b8891a32d1
update dockerfile to use dnf because i hate the warning
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-10-27 10:25:39 -07:00
Steve Durrheimer
e46445e844
Fix missing double quote in zsh completion
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2015-10-27 10:50:45 +01:00
Sebastiaan van Stijn
b92fd9ff04
Merge pull request #17124 from vincentbernat/fix/zsh-option-stacking
...
zsh: enable option stacking
2015-10-27 01:39:04 +01:00
Vincent Demeester
bffcb8226e
Merge pull request #17377 from LK4D4/remove_host_integration
...
Remove contrib/host-integration
2015-10-26 23:45:20 +01:00
Sebastiaan van Stijn
9312a738d8
Merge pull request #17002 from jfrazelle/apparmor-check-version-on-deb-install
...
apparmor check version on deb install
2015-10-26 22:44:11 +01:00
Vincent Bernat
402caa94d2
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>
2015-10-26 21:58:59 +01:00
Vincent Bernat
8ac32d900a
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>
2015-10-26 21:58:59 +01:00
Alexander Morozov
0dec8091a2
Remove contrib/host-integration
...
It's outdated and unused.
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-10-26 13:18:50 -07:00
Sebastiaan van Stijn
74b9d89648
Merge pull request #17134 from sdurrheimer/zsh-completion-build-multi-tag
...
Add zsh completion for 'docker build' multi tags
2015-10-26 19:05:23 +01:00
Tibor Vass
7e275cf0e5
Merge pull request #17333 from sdurrheimer/zsh-completion-fix-repeatable-options
...
Fix repeatable options in zsh completion
2015-10-26 12:43:21 -04:00
Steve Durrheimer
cc77fc3cb2
Add zsh completion for 'docker build' multi tags
...
+ Fix some others multi options
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2015-10-24 16:41:22 +02:00
Steve Durrheimer
7963807610
Fix repeatable options in zsh completion
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2015-10-24 16:38:41 +02:00