49068064e4
dont try to install journald driver on wheezy
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 6c2b014d5e3d4a6eb37df0edc1fc552b05406ede
Component: engine
2016-02-04 16:22:23 +01:00
a2042aca33
Merge pull request #19886 from AndrewGuenther/185160-init-socket-fix
...
Wait to fire start event until socket is created
Upstream-commit: d47812dd1d1de206e29a644e125a0a0f28655c6c
Component: engine
2016-02-03 17:38:52 -08:00
a9dee671aa
Add some basic bash completion for seccomp values
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: 75aa7dbe4f24cd8ac293f304f0d556c90200eea0
Component: engine
2016-02-03 13:48:34 -08:00
455910471d
fix opensuse rpm
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 1cbd77262987d821a675f51da1213c7bf171e05b
Component: engine
2016-02-03 10:34:17 -08:00
198aabc470
Merge pull request #19894 from samneirinck/powershell-support
...
Add powershell completion support
Upstream-commit: 6bde64ab2d320cececa09bc8e9f8258fc59a7e4a
Component: engine
2016-02-02 13:50:45 -05:00
7d1db1c269
Merge pull request #19851 from hqhq/hq_remove_libseccompa
...
Cleanup libseccomp.a hack since dockerinit is gone
Upstream-commit: 63ad7df2aa935a56c7ef0ac4d43d48a5e8315499
Component: engine
2016-02-02 09:52:35 -08:00
fb14e6604b
Allow disabling of colored Docker logs via daemon flag.
...
Signed-off-by: Vincent Woo <me@vincentwoo.com >
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 87a450a37f0e934b67c90fbcdbff28459216e332
Component: engine
2016-02-01 16:19:18 -05:00
65de1378f5
Wait to fire start event until socket is created
...
Previously, this check only worked if no host was specified and was
hard coded to check for "/var/run/docker.sock"
This change generalizes that check and captures any specified socket
and waits for it to be created.
Caveat: This will only check the first socket specified, but it is an
improvement over none at all.
Fixes #185160
Signed-off-by: Andrew Guenther <guenther.andrew.j@gmail.com >
Upstream-commit: 9f401254bd8e097ef30a3bc5de5576de08bc979a
Component: engine
2016-02-01 08:40:26 -08:00
1cef2c9b92
Add powershell completion support
...
Initial version of powershell tab completion. It completes
commands and container names.
Signed-off-by: Sam Neirinck <sam@samneirinck.com >
Upstream-commit: 3b35a5b604a56b5505c1e9cf79b4ccf9f2a9ef8f
Component: engine
2016-02-01 17:12:15 +01:00
959dbfed52
Cleanup libseccomp.a hack since dockerinit is gone
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: a605d641d76609c886ff454219a75578c95e8eb1
Component: engine
2016-01-30 16:17:13 +08:00
ddc8de8326
Merge pull request #18176 from hypriot/17802-build-first-debian-package-for-arm
...
add support for building first ARM-based debian package
Upstream-commit: e23f24bbbd33d90b27475dcf2652c412705dbfa8
Component: engine
2016-01-29 13:26:20 -08:00
d37bf00209
update bash completions for push and pull
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: c40f487c5c744a1a1c87b41002507a13ccffa918
Component: engine
2016-01-29 10:14:36 -08:00
9512e36135
add support for building first ARM debian package
...
Signed-off-by: Govinda Fichtner <govinda.fichtner@googlemail.com >
Upstream-commit: 7b31ed432ee2fa95938d64dc76c982e52cd00330
Component: engine
2016-01-29 00:21:17 +01:00
f5e575363e
Improve bash completion for users and groups
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 0e5ea96fa6241bdd10e174cf553d57daaf96c234
Component: engine
2016-01-28 09:48:47 -08:00
d551cc0b90
bash completion for journald tag support
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 11fe3edacbbba2633bc044ec044377febbd7d759
Component: engine
2016-01-28 08:41:37 +01:00
42e15b6834
Improve bash completion for docker volume ls -f dangling
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: a381efcf39ef7f82b1496a4bbaf42df096d91bc5
Component: engine
2016-01-27 09:32:14 +01:00
46738c170b
Merge pull request #19736 from albers/completion-network-rm-custom
...
Let bash completion for `docker network rm` only complete custom networks
Upstream-commit: 805a107df4c43e5fd20dce7d716001290d7b2840
Component: engine
2016-01-27 09:07:47 +01:00
92c9319930
Merge pull request #19671 from calavera/volume-dangling
...
Make volume dangling filter return only used volumes with `dangling=false`.
Upstream-commit: 146e49b039c59107cc31de734f0bf5d4604c04d9
Component: engine
2016-01-26 17:01:20 -05:00
71c71e17c6
Fix bash completion for docker volume ls --dangling=false.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 9e2b63e0aeec264a65c9684fe825e857c3e272d6
Component: engine
2016-01-26 14:29:37 -05:00
dcca310e82
Let bash completion for docker network rm only complete custom networks
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 0e1bfdd43eeebe02402e9b1bb4ef995084c13676
Component: engine
2016-01-26 10:57:38 -08:00
682d79bd90
bash completion for docker daemon --userns-remap
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 62f366490b87457e1fb52a09405691cc18787a2e
Component: engine
2016-01-26 10:24:47 -08:00
4edafc3bc1
*: purge dockerinit from source code
...
dockerinit has been around for a very long time. It was originally used
as a way for us to do configuration for LXC containers once the
container had started. LXC is no longer supported, and /.dockerinit has
been dead code for quite a while. This removes all code and references
in code to dockerinit.
Signed-off-by: Aleksa Sarai <asarai@suse.com >
Upstream-commit: 4357ed4a7363a1032edf93cf03232953c805184f
Component: engine
2016-01-26 23:47:02 +11:00
09854fa6a5
Change the way we install from backports in the deb builder (to force deps too)
...
Also, add "libsystemd-journal-dev" to the explicit list (which is what prompted the change in how we install).
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: 722fac7a730e16c65ccd60ce5d1d7924dd6520bf
Component: engine
2016-01-25 14:49:05 -08:00
40d356e759
Merge pull request #19655 from sdurrheimer/zsh-completion-cp-follow-link
...
Add zsh completion for 'docker cp -L --follow-link'
Upstream-commit: 9211fc36a95c0a05a3dffd95b287044394f8ebc0
Component: engine
2016-01-25 09:28:26 -05:00
f507b64609
Merge pull request #19657 from sdurrheimer/zsh-completion-new-syslog-over-tls-options
...
Add zsh completion for new 'docker daemon --log-opt syslog-tls-ca-cer…
Upstream-commit: 5719dca1d7a4aab0abbb8bd7a4d6e09c65c678ea
Component: engine
2016-01-25 01:21:57 -08:00
ff47be87f4
Add zsh completion for new 'docker daemon --log-opt syslog-tls-ca-cert syslog-tls-cert syslog-tls-key syslog-tls-skip-verify' options
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: b3cd453b8447d3d30457f3cbe6839e0b85110a02
Component: engine
2016-01-25 08:21:15 +01:00
1e5a8b2ec5
Add zsh completion for new 'docker daemon --cluster-store-opt discovery.heartbeat discovery.ttl kv.path' options
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 995d1d09ce37c4bdf67fa6dbef6e572a23f866f6
Component: engine
2016-01-25 08:14:46 +01:00
6a3a8f6686
Add zsh completion for 'docker cp -L --follow-link'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 490ea6961ca1288ccd6165503164e3231dbbf947
Component: engine
2016-01-25 08:09:30 +01:00
10870eb164
Merge pull request #19643 from albers/completion-nospace
...
fix minor bash completion issue on OSX (compopt)
Upstream-commit: 714587196b4673f1a9522b39de3db975e6cf293e
Component: engine
2016-01-24 20:58:33 -05:00
41c9949d2d
Merge pull request #19641 from albers/completion-syslog-tls
...
bash completion for syslog over TLS log driver
Upstream-commit: 84e4fb8b0a703e617dc2f50755f704ec71621712
Component: engine
2016-01-24 22:14:54 +01:00
e966ad634b
Merge pull request #19636 from albers/completion-daemon--cluster-store-opt
...
bash completion for new `--cluster-store-opt` values
Upstream-commit: 0764706dcc63b198449a6d912c965ee6f9fb3a9d
Component: engine
2016-01-24 22:12:37 +01:00
639668eac5
Merge pull request #19642 from albers/completion-tag-f
...
Remove completion for `docker tag -f`
Upstream-commit: 460f4914576041c031fd77e9f46a6238d2415563
Component: engine
2016-01-24 22:10:23 +01:00
09d191ea15
Merge pull request #19633 from albers/completion-ps-filter-dead
...
bash completion for `docker ps --filter status=dead`
Upstream-commit: a3cfdb5a31c3475894f9104215c138cf4cb3679e
Component: engine
2016-01-24 22:04:56 +01:00
0024a75aeb
Merge pull request #19632 from albers/completion-cp--follow-link
...
bash completion for `docker cp --follow-link`
Upstream-commit: 672ca818692a58c7a4f645b8751a4e104f781ed4
Component: engine
2016-01-24 22:04:26 +01:00
d7e8559cae
fix minor bash completion issue on OSX (compopt)
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 6b28e1bbe21b25384c069b99a0b79af3fea17869
Component: engine
2016-01-24 10:28:36 -08:00
993f03d460
remove zsh completion for docker tag -f
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 1bd5424c388e3039196af94b0f1c417a0959c81c
Component: engine
2016-01-24 10:11:18 -08:00
bbd9d34853
remove bash completion for docker tag -f
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 59754c4bd8903d29131e59384067a18dc5b91876
Component: engine
2016-01-24 10:07:04 -08:00
1769947174
bash completion for syslog over TLS log driver
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 6723c8aa26a4265ae3005360cf4e6f37e5442b45
Component: engine
2016-01-24 09:34:30 -08:00
6a9503b811
bash completion for --cluster-store-opt kv.path discovery.{heartbeat,ttl}
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 17eb18899e7a29605c63d71c503ab343af4924b3
Component: engine
2016-01-24 07:24:12 -08:00
32228ff936
bash completion for docker images -f dangling=false
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 7f345f2ec4400bf0ac582f9a39a840173257e98b
Component: engine
2016-01-24 06:36:04 -08:00
666db2e939
bash completion for docker ps --filter status=dead
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 0f654bb5eb4643cb9fa59f6f12d02db2d2520ddb
Component: engine
2016-01-24 05:57:57 -08:00
80f1938271
bash completion for docker cp --follow-link
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 7b3058b864b04ee1e51a64e945d0a76dc5b387a6
Component: engine
2016-01-24 05:39:52 -08:00
a0bfe06203
Merge pull request #19598 from tianon/pkg-config
...
Add pkg-config to our Debian build environment
Upstream-commit: b3af1d52427384db5a841678d29935654c904f5f
Component: engine
2016-01-22 17:33:43 -08:00
6c723b5a0d
Add pkg-config to our RPM build environment
...
While hack/make.sh checks for systemd headers using pkg-config, we
forgot to ensure that they were there in the images that we use for
building binaries for RPM-based distributions. Add the right packages
to the generate.sh that we use for them, and update the copies of the
generated files that we carry in the source tree.
Notes: Fedora, CentOS, and Oracle Linux put the pkg-config command in
the "pkgconfig" package, while OpenSUSE calls the package "pkg-config".
The systemd-devel package, like systemd, is not in Oracle Linux 6.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com >
Upstream-commit: 7d4f52ec6bd8058cc55860cf5ff1a81a3fbe8f9d
Component: engine
2016-01-22 18:46:07 -05:00
885cd6977a
Add pkg-config to our Debian build environment
...
This is used in `hack/make.sh` for detecting various dependencies such as `libsystemd-journal` -- without this, our packages don't support pulling logs back out of journald. 😢
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: 9ac671f79e46ac3e05cc9531739d8f39d8da34c7
Component: engine
2016-01-22 15:22:04 -08:00
69dd6d149a
Add a note to /etc/default/docker noting that it does not apply to systemd
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: 90e33640b883134be0fc7d526d2ba45aa6eef70f
Component: engine
2016-01-22 07:35:02 -08:00
eb8e91aac7
Merge pull request #19541 from albers/completion-events
...
Support new events in bash completion
Upstream-commit: 7aef3112692d115ac1fdd60ec06cb501c21ef1fc
Component: engine
2016-01-21 18:40:54 +01:00
87ce057060
Refactor handling of key specific subcompletions
...
The currently used idiom for handling key specific subcompletions
did not work here: behind `docker event -f type=network `, the completion
of networks triggered. The expected behaviour is not to complete
anything here.
In order to limit the scope of the corresponding PR, the new idiom is
currently only used in `docker events --filter`.
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: ab01b6f38578a97546a4d7bfaa305ef33ea96e63
Component: engine
2016-01-21 14:24:31 +01:00
b27d4760e3
Support new events in bash completion
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: fcc035848f7edc395e814af559fe0be42c3552a6
Component: engine
2016-01-21 13:57:35 +01:00
bc39a3fed6
Merge pull request #19377 from jfrazelle/cleanup-build-rpm-deb
...
Cleanup build rpm deb
Upstream-commit: 5537a92e450ea56e2002f83ff50bb70fdb2cc25e
Component: engine
2016-01-20 23:58:33 -08:00
