052b23e290
Merge pull request #14770 from albers/completion-log-opt
...
Bash completion for log drivers and their options
2015-07-21 19:58:12 -07:00
162ae444af
Merge pull request #14677 from vincentbernat/fix/zsh-completion-update-4
...
zsh: update zsh completion for docker command
2015-07-21 19:56:03 -07:00
380959dd68
Merge pull request #14609 from ewindisch/apparmor-policy
...
Move AppArmor policy to contrib & deb packaging
2015-07-21 08:48:02 -07:00
80d99236c1
Move AppArmor policy to contrib & deb packaging
...
The automatic installation of AppArmor policies prevents the
management of custom, site-specific apparmor policies for the
default container profile. Furthermore, this change will allow
a future policy for the engine itself to be written without demanding
the engine be able to arbitrarily create and manage AppArmor policies.
- Add deb package suggests for apparmor.
- Ubuntu postinst use aa-status & fix policy path
- Add the policies to the debian packages.
- Add apparmor tests for writing proc files
Additional restrictions against modifying files in proc
are enforced by AppArmor. Ensure that AppArmor is preventing
access to these files, not simply Docker's configuration of proc.
- Remove /proc/k?mem from AA policy
The path to mem and kmem are in /dev, not /proc
and cannot be restricted successfully through AppArmor.
The device cgroup will need to be sufficient here.
- Load contrib/apparmor during integration tests
Note that this is somewhat dirty because we
cannot restore the host to its original configuration.
However, it should be noted that prior to this patch
series, the Docker daemon itself was loading apparmor
policy from within the tests, so this is no dirtier or
uglier than the status-quo.
Signed-off-by: Eric Windisch <eric@windisch.us>
2015-07-21 11:05:53 -04:00
d5aeb3398b
Second level completions for --log-opt
...
Advanced completion for some log driver options:
gelf-address, syslog-address, syslog-facility.
Signed-off-by: Harald Albers <github@albersweb.de>
2015-07-21 08:25:14 +02:00
18ca5d7c0e
Remove reference to CENTOS6 from generate script
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-07-21 01:21:33 +02:00
38acec94c4
Completion: Add support for '=' in arguments to __docker_pos_first_nonflag
...
This solves several problems that arise from the special treatment of
"=" in Bash.
The fix was required as some log drivers have options in a key=value
form. It also addresses the --option=value and the negated boolean syntax
(--boolean=false).
Note that this is not a general fix for these problems, it is limited to
the __docker_pos_first_nonflag function.
Signed-off-by: Harald Albers <github@albersweb.de>
2015-07-20 21:22:56 +02:00
faa8b658e7
Driver-specific completions for --log-opt
...
Signed-off-by: Harald Albers <github@albersweb.de>
2015-07-20 20:24:01 +02:00
e09d0febe6
Add missing log drivers to bash completion
...
Signed-off-by: Harald Albers <github@albersweb.de>
2015-07-20 20:13:59 +02:00
3a1596f0f5
zsh: update zsh completion for docker command
...
zsh completion is updated with the content of
felixr/docker-zsh-completion.
- felixr/docker-zsh-completion@a93e1cb7bd Fix completion of repositories with tags
- felixr/docker-zsh-completion@590ea70596 Respect provided `--host` flag when invoking docker
- felixr/docker-zsh-completion@6c557babaa Several cosmetic improvements
- felixr/docker-zsh-completion@5b63cc591a Update completion for `inspect`
- felixr/docker-zsh-completion@b7d8f2f7cc Order completions alphabetically
- felixr/docker-zsh-completion@63f6a06224 Factor completion for `build`, `create` and `run`
- felixr/docker-zsh-completion@ade49ee47f Enforce positional arguments being last
- felixr/docker-zsh-completion@850b6b6d95 Update completion for build/commit/export/exec/history/import
- felixr/docker-zsh-completion@01bfd8c075 Remove completion for `insert` and duplicate of `import`
- felixr/docker-zsh-completion@c64a1d730a Update completion for `stats` to add `--no-stream` flag
- felixr/docker-zsh-completion@5e81d78b52 Update completion for `log` to add `--since` flag
- felixr/docker-zsh-completion@b3c146a1a2 Update completion for `run` to add `--group-add` flag
- felixr/docker-zsh-completion@8d4f196ad8 Don't trigger expensive completion function for flags
- felixr/docker-zsh-completion@bd5aaa124d Add completion for `--help` everywhere
- felixr/docker-zsh-completion@3a67a0e8c4 Return appropriate status code on completion
- felixr/docker-zsh-completion@4dfcb450ea Add Steve as a regular contributor.
- felixr/docker-zsh-completion@996a1c6def Add completion for top-level flags
- felixr/docker-zsh-completion@b6df75905f Ensure short/long option are not allowed twice
- felixr/docker-zsh-completion@75b6a500a0 Complete repositories with tags only on repository match
- felixr/docker-zsh-completion@5e6292135f Factorize completion of images/repositories/tags
- felixr/docker-zsh-completion@1c504eb677 Handle repositories with ":"
- felixr/docker-zsh-completion@0a05bf818b Update completion for `pause' and `unpause'
- felixr/docker-zsh-completion@b3a63253e2 Containers name can include Swarm host
In summary:
- Swarm support
- Handling repositories with ":"
- Rework how completion of images/repositories/tags work:
- felixr/docker-zsh-completion@5e6292135f
- felixr/docker-zsh-completion@75b6a500a0
- felixr/docker-zsh-completion@a93e1cb7bd
The remaining changes are here to sync changes done in Docker repository
(mostly from PR #14074 and #14555 , by @sdurrheimer). With some minor changes:
- boolean flags don't complete their arguments (true/false)
- reuse of `--host` argument is done with `$opt_arg` to avoid parsing
error
- build/create/run common options are factorized out
- `--help` flag is handled differently
- `pause` and `unpause` accepts several containers as far as I know, so
the change is reverted
- some more, but difficult to notice (more completion for some flags I think)
Some labels are reverted, mostly because I did the merge by copy/pasting
new options instead of modifying existing options.
This commit is partial. The way the `--help` option is handled triggered
a major change due to the way things are quoted. Those changes were
partially and programmaticaly reverted in this commit only to minimize
the changes to review. The next commit will restore the full changes.
Signed-off-by: Vincent Bernat <vincent@bernat.im>
2015-07-20 14:25:48 +02:00
af5fb9b7d0
remove centos6 from rpm builder
...
Signed-off-by: Jessica Frazelle <princess@docker.com>
2015-07-19 14:30:48 -07:00
4a5fd6c0f9
add tianon's suites.sh file
...
Signed-off-by: Jessica Frazelle <princess@docker.com>
2015-07-15 12:48:49 -07:00
386f11a63d
Merge pull request #14555 from sdurrheimer/master
...
Zsh completion updates and improvements
2015-07-15 10:40:41 -07:00
cf09e435c8
Merge pull request #14608 from vincentbernat/fix/zsh-reviewers
...
zsh: remove Vincent Bernat from reviewers for ZSH completion
2015-07-14 07:08:06 -07:00
91a2d9cc7d
Several cosmetic improvements in zsh completion
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2015-07-14 11:34:33 +02:00
12f67141f9
Zsh completion update for the following commits:
...
- Add fluentd logging driver to zsh completion #12876
- Add inspect --type flag to zsh completion #13187
- Respect -H option in zsh completion #13195
- Fix number of argument limit for pause and unpause in zsh completion
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2015-07-14 11:32:26 +02:00
5dbb217bcb
zsh: remove Vincent Bernat from reviewers for ZSH completion
...
Signed-off-by: Vincent Bernat <vincent@bernat.im>
2015-07-13 23:15:16 +02:00
d77d0268eb
Adds documentation for additional groups.
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2015-07-13 14:47:28 -04:00
0badebe734
Merge pull request #14426 from albers/completion-events
...
Add some missing events to bash completion
2015-07-13 10:05:36 -07:00
f18c4f23cc
Change generate.sh so that the yum command for packages remains generic across distros.
...
Signed-off-by: Avi Miller <avi.miller@oracle.com>
2015-07-10 07:34:47 +10:00
0117330ae7
Add support for building docker-engine RPM on Oracle Linux 7.
...
Signed-off-by: Avi Miller <avi.miller@oracle.com>
2015-07-08 16:12:19 +10:00
16f8afb451
Merge pull request #14369 from maximkulkin/14123-dockerize-disk-with-non-en-locale
...
Fix dockerize-disk.sh working in non-en locale
2015-07-07 17:51:29 -07:00
ea26b38784
Add some missing events to bash completion
...
Signed-off-by: Harald Albers <github@albersweb.de>
2015-07-07 09:04:15 +02:00
76a853de6e
fix rpms
...
Signed-off-by: Jessica Frazelle <princess@docker.com>
2015-07-06 14:14:26 -07:00
8630ad1530
Fix dockerize-disk.sh working in non-en locale
...
One part of script relies on messages that are
output by some system tool. In non-en locale
those messages get localized which breaks the
script.
This patch enforces en locale for that system
tool.
Signed-off-by: Maxim Kulkin <maxim.kulkin@gmail.com>
2015-07-02 16:08:12 -07:00
2cb74e6915
Flag Addition: --type flag added for docker inspect command
...
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
2015-07-01 12:14:01 -04:00
b2cc6f1b47
Update the zsh completion
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2015-06-21 17:33:07 +02:00
748814a97a
Merge pull request #13935 from asbjornenge/tm_syntax_updates
...
TM syntax updates
2015-06-15 16:12:22 -07:00
3f11e05db2
Merge pull request #13942 from calavera/fix_unshare_mount_regression
...
Fix regression bind mounting shared.
2015-06-15 11:25:35 -07:00
d8592eaff8
Revert "contrib/init: unshare mount namespace for inits"
...
This reverts commit b6569b6b82
2015-06-15 10:35:17 -07:00
dfec4a48c7
Various cleanups added to asbjornenge/Docker.tmbundle (by the TM maintainer) and support for the LABEL instruction
...
Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net> (github: asbjornenge)
2015-06-15 00:04:05 +02:00
ac8cbf4952
Updated TextMate install instruction - this bundle is not included in TM 😄 :rocket
...
Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net> (github: asbjornenge)
2015-06-15 00:02:10 +02:00
cd44018856
Carry of PR #13520
...
Removinig files
Signed-off-by: Mary Anthony <mary@docker.com>
2015-06-13 09:27:30 -07:00
eacae64bd8
Moving man pages out of docs
...
Adding in other areas per comments
Updating with comments; equalizing generating man page info
Updating with duglin's comments
Doug is right here again;fixing.
Signed-off-by: Mary Anthony <mary@docker.com>
2015-06-10 13:43:35 -07:00
969cb545ae
Merge pull request #13546 from hqhq/hq_checkconfig_rescount
...
Don't check RESOURCE_COUNTERS in new kernel
2015-06-08 14:43:17 -07:00
dbf5e36fd6
Fix docs URL in systemd service file.
...
Fixes #13799 .
Signed-off-by: Eric-Olivier Lamey <eo@lamey.me>
2015-06-08 10:21:43 +00:00
8bfc8102be
Don't check RESOURCE_COUNTERS in new kernel
...
Closes : #13543
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-06-03 17:26:39 +08:00
d96ca04f24
Merge pull request #13601 from tianon/precise
...
Finally add precise/12.04 as a build-deb target
2015-05-29 14:35:07 -07:00
4d9191e15d
Merge pull request #13604 from tianon/vim-embedded-shell
...
Add embedded shell script highlight to vim syntax
2015-05-29 14:17:07 -07:00
e02744404d
Adjust vim ftdetect to match "Dockerfile", "dockerfile", and "Dockerfile.*" which are all reasonably safe to assume "this is a Dockerfile"
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-05-29 13:46:51 -07:00
62d3b1bf2e
Add embedded shell script highlight to vim syntax
...
This highlights `RUN`, `CMD`, and `ENTRYPOINT` lines using shell highlighting. It doesn't bother detecting the JSON forms, but that's OK because JSON arrays highlight pretty reasonably with shell highlights. :)
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-05-29 13:39:37 -07:00
98180b8954
Finally add precise/12.04 as a build-deb target
...
Ubuntu Precise has a number of warts that made it non-trivial to add initially, but I've managed to work through some of them and come up with a working build. Two important parts to note are that it has neither the `btrfs` nor the `devicemapper` graphdriver backends since `btrfs-tools` and `libdevmapper-dev` in the precise repositories are too ancient for them to even compile.
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-05-29 12:55:58 -07:00
b2832dffe5
Update bash completion for 1.7.0
...
Signed-off-by: Harald Albers <github@albersweb.de>
2015-05-29 12:42:59 +02:00
f99a962742
Merge pull request #13539 from tianon/deb-ubuntu-wily
...
Add Ubuntu Wily (15.10) as a build-deb target
2015-05-28 11:01:27 -07:00
0256bbdebb
Merge pull request #13039 from stevenbrichards/13031-Upstart
...
Fix check for upstart not detecting properly
2015-05-28 10:38:55 -07:00
e5ff643aed
Fixes #13031 - Check for upstart or init is not detecting properly
...
This will now properly check whether /etc/init.d/docker or service docker is
invoking the script and respond to the user accordingly.
Signed-off-by: Steven Richards <steven@axiomzen.co>
2015-05-28 09:52:05 -07:00
38c77ba876
Add Ubuntu Wily (15.10) as a build-deb target
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-05-28 01:06:11 -07:00
96903c837f
Add fedora:22 to our rpm targets
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-05-28 01:01:45 -07:00
40b71adee3
Revert "Add docker exec run a command in privileged mode"
...
This reverts commit 72a500e9e5
2015-05-26 14:12:16 -07:00
6cc4cf7c0c
Add BRIDGE_NETFILTER to check-config.sh
...
It is needed to use network with --userland-proxy=false and for
--icc=false
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-05-22 10:46:55 -07:00
Jessie Frazelle
Alexander Morozov
Eric Windisch
Harald Albers
Sebastiaan van Stijn
Vincent Bernat
Jessica Frazelle
Steve Durrheimer
Mrunal Patel
Avi Miller
Maxim Kulkin
Shishir Mahajan
Michael Crosby
David Calavera
Asbjørn Enge
Mary Anthony
Tianon Gravi
Eric-Olivier Lamey
Qiang Huang
Steven Richards
Alexander Morozov