beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
23302 commits 14 branches 412 tags 338 MiB
Commit graph

1034 commits

Author SHA1 Message Date
Harald Albers
ce2cbde841 bash completion for docker daemon --cgroup-parent 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-01-05 09:29:37 -08:00
Steve Durrheimer
b5f6605ca2 Add zsh completion for 'docker daemon --cgroup-parent' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2016-01-05 07:41:34 +01:00
Jess Frazelle
fa57eedff4 Merge pull request #19002 from jfrazelle/update-test-images 
cleanup test images
 2016-01-04 10:24:30 -08:00
Harald Albers
2134d38935 Compute plugin list in bash completion for docker daemon --authz-plugin 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-01-02 14:53:10 -08:00
Jessica Frazelle
327421d1df
add more seccomp profile tests 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-12-30 17:30:44 -08:00
Jessica Frazelle
ae54e39c80
fix libseccomp where version < 2.2.1 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-12-28 21:30:49 -08:00
David Calavera
78ce43bad8 Merge pull request #18780 from jfrazelle/seccomp-default 
set default seccomp profile
 2015-12-28 16:46:30 -08:00
Jess Frazelle
8b68853ef5 Merge pull request #18937 from cbalducci/patch-1 
[mkimage-alpine.sh] Additional repo and container cleanup
 2015-12-28 12:51:31 -08:00
Jessica Frazelle
a48fe62384
add default seccomp profile tests 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-12-28 10:26:48 -08:00
Jess Frazelle
00362f8ea2 Merge pull request #18923 from albers/completion-network-ls--filter 
bash completion for `docker network ls --filter`
 2015-12-28 10:16:17 -08:00
Jess Frazelle
206046f0ba Merge pull request #18807 from FlorinAsavoaie/master 
New features in mkimage-yum.sh script
 2015-12-28 09:09:33 -08:00
cristiano balducci
7fa40ef513 Additional repo and container cleanup 
- Added support for adding custom repo (defaults to community)
- Added cleanup of the test container (--rm)
- Added --text to grep in apkv() to avoid "Binary file matches" output on Fedora

Signed-off-by: Cristiano Balducci <cristiano.balducci@gmail.com>
 2015-12-28 14:11:56 +01:00
Harald Albers
f2ba1e4d80 bash completion for docker network ls --filter 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-12-27 09:28:19 -08:00
Thomas Sjögren
602498d1b0 add /bin/tar to apparmor profile 
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
 2015-12-23 18:11:16 +01:00
Harald Albers
f03695efc1 remove --format from bash completion for docker network rm 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-12-22 11:35:41 -08:00
David Calavera
5b913de5e6 Merge pull request #18847 from albers/completion-rename-functions 
Better function names in bash completion
 2015-12-22 08:43:08 -08:00
Harald Albers
e715daab3d Better function names in bash completion 
The new names make it easier to distinguish between helper functions and
functions that actually perform completion by modifying the global COMPOPT
variable.

Signed-off-by: Harald Albers <github@albersweb.de>
 2015-12-22 13:38:02 +01:00
oyld
bbbc01b86e Fix syntax error in init script 
Signed-off-by: oyld <oyld0210@163.com>
 2015-12-22 04:00:00 -08:00
Sebastiaan van Stijn
312c82677b Merge pull request #15879 from Mashimiao/add-support-blkio_throtte_iops 
Add support for blkio read/write iops device
 2015-12-21 23:45:18 +01:00
Vincent Demeester
eff810aed6 Merge pull request #18809 from thaJeztah/EOL-ubuntu-15.04-vivid 
Remove Ubuntu 15.04 (Vivid) from DEB build for 1.10 as it will be EOL
 2015-12-21 22:02:18 +01:00
David Calavera
88c4d4a943 Merge pull request #18828 from albers/completion-plugins 
Use computed plugin lists in bash completion
 2015-12-21 09:57:48 -08:00
Alexander Morozov
42460b6772 Merge pull request #17692 from vdemeester/images-format 
Add --format support to images command
 2015-12-21 09:57:29 -08:00
Harald Albers
2033c09705 Use computed plugin lists in bash completion 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-12-21 18:30:23 +01:00
Vincent Demeester
34a3c3cacf Add --format support to images command 
- rename `api/client/ps` to `api/client/formatter`
- add a a image formatter

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-12-21 17:38:07 +01:00
Boaz Shuster
60b4db7eb1 Change the quiet flag behavior in the build command 
Right now, the quiet (-q, --quiet) flag ignores the output
generated from within the container.

However, it ought to be quiet in a way that all kind
of diagnostic output should be ignored, unless the build
process fails.

This patch makes the quiet flag behave in the following way:
 1. If the build process succeeds, stdout contains the image ID
    and stderr is empty.
 2. If the build process fails, stdout is empty and stderr
    has the error message and the diagnostic output of that process.

If the quiet flag is not set, then everything goes to stdout
and error messages, if there are any, go to stderr.

Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
 2015-12-21 16:38:50 +02:00
Ma Shimiao
843084b08b Add support for blkio read/write iops device 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
 2015-12-21 09:14:49 +08:00
Sebastiaan van Stijn
325b1f35ae Remove Ubuntu 15.04 (Vivid) from DEB build as it will be EOL 
Ubuntu 15.04 (Vivid) will be EOL'd in January,
so we should remove it from our builds in the
Docker 1.10 release.

For information about the EOL data, see:
https://wiki.ubuntu.com/Releases

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2015-12-20 16:00:53 +01:00
Florin Asavoaie
c8badcbd26 New features in mkimage-yum.sh script 
Added -g and -p options for the contrib/mkimage-yum.sh script to allow generating images with the dependencies you want. I use this because I generate images where I only need "glibc" with its dependencies or "java-1.8.0-openjdk-headless" and so on. This makes sure that I don't get a lot of bogus packages from the Core group.

Possible usages now include sudo ./mkimage-yum.sh -y yum.conf -g '' -p java-1.8.0-openjdk-headless.

Also changed the "test" at the end to add --rm parameter to docker run so it doesn't leave a junk container and use bash to echo "success" in case you don't get coreutils in your dependencies tree.

Signed-off-by: Florin Asavoaie <florin.asavoaie@gmail.com>
 2015-12-20 14:20:30 +02:00
Sebastiaan van Stijn
a08c955e30 Remove Fedora 21 from RPM build as it is EOL 
Fedora 21 is EOL'd as of December 1st, 2015.

Announcement:
https://lists.fedoraproject.org/pipermail/announce/2015-November/003296.html

Fedora 21 will reach end of life on 2015-12-01, and no further updates
will be pushed out after that time. Additionally, with the recent
release of Fedora 23, no new packages will be added to the Fedora 21
collection.

Please see https://fedoraproject.org/wiki/DNF_system_upgrade for more
information on upgrading from Fedora 21 to a newer release.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2015-12-20 00:42:17 +01:00
Jessica Frazelle
7ddf4214a6
remove oracle linux 6 for time being 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-12-15 16:34:41 -08:00
Harald Albers
069fe81fa6 bash completion for docker daemon --authz-plugin 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-12-14 13:25:45 -08:00
Steve Durrheimer
4ba173630a Fix small missing equal sign for 'docker daemon --cluster-store-opt' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2015-12-14 21:20:49 +01:00
Steve Durrheimer
76844d786b Add zsh completion for 'docker daemon --authz-plugin' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2015-12-14 21:16:54 +01:00
manchoz
824ae85632 Add support for Arch Linux ARM. (Close #16695) 
Signed-off-by: Giampaolo Mancini <giampaolo@trampolineup.com>

Switch to "case"

Signed-off-by: Giampaolo Mancini <giampaolo@trampolineup.com>

Support multiple ARM architectures

Signed-off-by: Giampaolo Mancini <giampaolo@trampolineup.com>

Add check for ArchLinuxARM Keyring

Signed-off-by: Giampaolo Mancini <giampaolo@trampolineup.com>

mkimage-arch.sh: Fix for merging

Signed-off-by: Giampaolo Mancini <giampaolo@trampolineup.com>
 2015-12-13 19:48:40 +01:00
Justas Brazauskas
927b334ebf Fix typos found across repository 
Signed-off-by: Justas Brazauskas <brazauskasjustas@gmail.com>
 2015-12-13 18:04:12 +02:00
Tibor Vass
cd648dce3a Merge pull request #18242 from jfrazelle/i-have-no-idea 
Remove ipc rule in docker-engine apparmor profile
 2015-12-11 11:23:41 +01:00
Sebastiaan van Stijn
8cd356630a Merge pull request #18142 from ekuric/mkimage 
mkimage-yum.sh to support dnf
 2015-12-11 02:27:13 +01:00
David Calavera
31a31adf7e Merge pull request #18459 from Microsoft/jjh/winci-bash4fix 
Windows CI Fix: Allow bash v4
 2015-12-10 08:58:32 -08:00
Harald Albers
d7c9ae60e6 Improve bash completion for docker network disconnect 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-12-07 09:55:00 +01:00
John Howard
c07e79fa8a Windows CI Fix: Allow bash v4 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-12-06 14:40:29 -08:00
Jess Frazelle
87a614ed55 Merge pull request #17989 from jfrazelle/initial-seccomp-support 
Phase 1: Initial seccomp support
 2015-12-05 08:33:58 -08:00
Alexander Morozov
23f00624a1 Merge pull request #18408 from tonistiigi/disable-systemd-timeout 
Disable timeout for systemd
 2015-12-04 12:34:19 -08:00
Sebastiaan van Stijn
cb6a1a6042 Merge pull request #14466 from Mashimiao/add-support-blkio_throtte_bps 
Add support for blkio read/write bps device
 2015-12-04 12:29:58 +01:00
Sebastiaan van Stijn
605c56295f Merge pull request #18384 from Mashimiao/weight-device-docs-fix 
docs: fix blkio-weight-device option args
 2015-12-04 12:04:23 +01:00
Ma Shimiao
cc0e407e17 docs: fix weight-deivce option args 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
 2015-12-04 09:28:35 +08:00
Ma Shimiao
3f15a055e5 Add support for blkio read/write bps device 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
 2015-12-04 09:26:03 +08:00
Jessica Frazelle
b7b707af2e
update go version 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-12-03 16:37:13 -08:00
Jessica Frazelle
ec6d3392f1
hacky workaround for dockerinit static binary needing libseccomp.a for debs and rpms 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-12-03 16:30:51 -08:00
Jessica Frazelle
cde9e8bc83
update packagers.md and kernel config check 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-12-03 16:30:50 -08:00
Jessica Frazelle
ae76f7e23e
update bash completion for seccomp 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-12-03 16:30:49 -08:00
Jessica Frazelle
255004ef33
update debs/rpms for seccomp 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-12-03 16:20:05 -08:00
Phil Estes
4d849619d4 Merge pull request #17481 from vdemeester/17446-network-inspect-format 
Add format flag to network inspect
 2015-12-03 16:16:04 -05:00
Tonis Tiigi
eff5e6498f Disable timeout for systemd 
With content addressability update starting upgraded
daemon for the first time can take a long time if
graph dir was not prepared with a migration tool before.
This avoids systemd timeouts while the migration is
taking place.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2015-12-03 13:15:31 -08:00
Sebastiaan van Stijn
ee3e07d359 Merge pull request #18301 from wenchma/doc_update_for_net 
Add NETWORK_NAME_or_ID value for --net= option
 2015-12-02 22:36:01 +01:00
Vincent Demeester
295c27388d Add format flag to network inspect 
…for consistency as docker inspect and docker volume inspect supports it too

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-12-02 22:32:10 +01:00
Arnaud Porterie
8f1f53f735 Merge pull request #16277 from runcom/add-oom-score-adj 
Add OomScoreAdj
 2015-12-02 11:49:51 -08:00
Dan Walsh
b3e527dfd2 This patch adds --tmpfs as a option for mounting tmpfs on directories 
It will Tar up contents of child directory onto tmpfs if mounted over

This patch will use the new PreMount and PostMount hooks to "tar"
up the contents of the base image on top of tmpfs mount points.

Signed-off-by: Dan Walsh <dwalsh@redhat.com>
 2015-12-02 10:06:59 -05:00
Wen Cheng Ma
08328cb703 Add NETWORK_NAME_or_ID value for --net= option 
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
 2015-12-02 22:49:35 +08:00
Phil Estes
da0c9286a9 Merge pull request #18315 from jfrazelle/change-frozen-image-v2 
update download-frozen-image.sh to v2 registry
 2015-12-01 17:12:00 -05:00
Jessica Frazelle
359d0c247f
update download-frozen-image.sh to v2 registry 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-12-01 13:16:42 -08:00
David Calavera
94997e56a9 Merge pull request #18211 from Djelibeybi/master 
Updated LICENSE file
 2015-11-30 14:37:29 -08:00
Jess Frazelle
e852959fad Merge pull request #18178 from jfrazelle/apparmor-we-meet-again 
Fix docker-default profile handing signals
 2015-11-30 11:34:34 -08:00
Jessica Frazelle
f8db9a09e0
check version for docker-default aa profile 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-11-30 10:18:12 -08:00
Antonio Murdaca
d3af7f283d Add OomScoreAdj to configure container oom killer preferences 
libcontainer v0.0.4 introduces setting `/proc/self/oom_score_adj` to
better tune oom killing preferences for container process. This patch
simply integrates OomScoreAdj libcontainer's config option and adjust
the cli with this new option.

Signed-off-by: Antonio Murdaca <amurdaca@redhat.com>
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2015-11-30 11:19:04 +01:00
Jessica Frazelle
68c9ebdf1f
Remove ipc rule in docker-engine apparmor profile 
On a ubuntu 15.04 machine with apparmor_parser version 2.10 I get
```
Syntax Error: Unknown line found in file:
/etc/apparmor.d/docker-engine line: 26
```
when running `aa-complain /etc/apparmor.d/docker-engine`.

It's super weird because ipc is documented in the apparmor manual, but it
doesnt seem to be working at all. Tested on a few servers.

Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-11-25 11:32:00 -08:00
Avi Miller
09b7af9095 Updated LICENSE file to match selinux-policy and the license in the docker-engine-selinux.spec file. 
Signed-off-by: Avi Miller <avi.miller@oracle.com>
 2015-11-25 11:53:01 +11:00
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
Stefan Berger
6079d9d6a3
Policy extensions for user namespaces and docker exec 
A few additions to the policy when running with user namespaces enabled
and when running 'docker exec'.

Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
 2015-11-23 15:19:45 -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
Elvir Kuric
5c329633d7 mkimage-yum.sh to support dnf 
included changes @tianon proposed in #17362

Signed-off-by: Elvir Kuric <elvirkuric@gmail.com>
 2015-11-21 13:06:27 +01: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
Steve Durrheimer
230313b1c5 Add splunk log driver to zsh completion 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2015-10-24 13:49:27 +02:00
Denis Gladkikh
1f1dbf312d Add Splunk logging driver #16207 
Allow to send Splunk logs using Http Event Collector

Signed-off-by: Denis Gladkikh <denis@gladkikh.email>
 2015-10-23 13:37:53 -07:00
Vincent Demeester
a2e5bbe640 Merge pull request #17306 from albers/completion-log-driver-options 
bash completion for log driver options `env` and `labels`
 2015-10-23 21:28:40 +02:00
Harald Albers
d0c019850c bash completion for log driver options env and labels 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-10-23 10:55:47 +02:00
Steve Durrheimer
cb93fefa40 Zsh completion for 'docker network inspect' multiple networks 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2015-10-23 08:13:33 +02:00
David Calavera
4816626f3e Merge pull request #17270 from albers/completion-network-ids 
bash completion can be configured to complete network IDs
 2015-10-22 13:37:38 -07:00
Harald Albers
1598500df8 bash completion can be configured to complete network IDs 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-10-22 18:58:34 +02:00
Harald Albers
10e485b386 bash completion for docker network inspect supports multiple networks 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-10-22 17:53:17 +02:00
Tianon Gravi
4786ac1ffe Merge pull request #17153 from albers/completion-cp-args 
[Fix 17029] docker cp completion not correct
 2015-10-21 14:58:11 -07:00
Tibor Vass
3957368eff Merge pull request #17149 from albers/completion-network-ipam 
bash completion for new `docker network create` options
 2015-10-20 15:54:05 -04:00
Tibor Vass
081edfed32 Merge pull request #17150 from sdurrheimer/zsh-completion-network-driver-option 
Add zsh completion for 'docker network create -o --opt'
 2015-10-20 15:48:12 -04:00
Jessica Frazelle
c39689ca70
add dh-apparmor & apparmor to deb builder dockerfiles 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-10-19 16:15:22 -07:00
Jessica Frazelle
8cf89245f5
change default docker-engine profile to a template based on apparmor_parser version 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-10-19 16:15:18 -07:00
Jess Frazelle
c766bcdc73 Merge pull request #17135 from albers/completion-restart-unless-stopped 
Bash completion for restart policy `unless-stopped`
 2015-10-19 15:26:16 -07:00
Harald Albers
c71c7f4b4f bash completion for docker cp supports copying both ways 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-10-18 08:24:02 -07:00
Steve Durrheimer
6447abfc35 Add zsh completion for 'docker network create -o --opt' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2015-10-18 15:09:59 +02:00
Harald Albers
5013a2fbd6 bash completion for new docker network create options 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-10-18 05:42:23 -07:00
Harald Albers
2d44ed6d64 bash completion: support for dm.use_deferred_* options 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-10-18 04:42:17 -07:00
Harald Albers
504d2a9212 Bash completion for restart policy unless-stopped 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-10-17 07:24:17 -07:00
Vincent Demeester
d1064bd441 Deprecate -c cli short variant flag in docker cli 
- build
- create

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-10-17 00:05:34 +02:00
Tibor Vass
e23d834a01 Merge pull request #17106 from albers/completion-import 
Add missing options to bash completion for `docker import`
 2015-10-16 14:28:14 -07:00
Tibor Vass
b1bab9e1e7 Merge pull request #17107 from albers/completion-build 
Add missing options to bash completion for `docker build`
 2015-10-16 14:27:51 -07:00
Steve Durrheimer
b34aa69e8f Zsh completion : all --<option>= flag values may be given in the next argument 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2015-10-16 21:18:27 +02:00
Sebastiaan van Stijn
ccf5b60c6f Merge pull request #17098 from sdurrheimer/zsh-completion-import-message 
Add zsh completion for 'docker import -m --message'
 2015-10-16 11:36:46 -07:00
Brian Goff
08a43b8b3b Merge pull request #17101 from sdurrheimer/zsh-completion-deprecate-run-dash-c-option 
Deprecate 'docker run -c' option in zsh completion
 2015-10-16 11:40:02 -04:00
Brian Goff
30b945fac9 Merge pull request #17099 from sdurrheimer/zsh-completion-restart-unless-stopped 
Add zsh completion for 'unless-stopped' restart policy
 2015-10-16 11:37:27 -04:00
Harald Albers
b0315375f8 Add missing options to bash completion for docker import 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-10-16 12:42:12 +02:00
Harald Albers
3a713d91ce bash completion: minor refactoring for consistency 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-10-16 12:41:09 +02:00
Harald Albers
28c66b0491 Add missing options to bash completion for docker build 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-10-16 12:40:55 +02:00
Steve Durrheimer
96a09ea77c Add zsh completion for 'docker import -m --message' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2015-10-16 10:14:42 +02:00
Steve Durrheimer
89e0990224 Add zsh completion for 'docker build --build-arg' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2015-10-16 08:48:12 +02:00
Steve Durrheimer
c37c9df18a Deprecate 'docker run -c' option in zsh completion 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2015-10-16 08:37:16 +02:00
Steve Durrheimer
cb2bd8bcec Add zsh completion for 'unless-stopped' restart policy 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2015-10-16 08:30:56 +02:00
Jess Frazelle
ebfed4d474 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
 2015-10-15 13:48:39 -07:00
Steve Durrheimer
a00c0d795d 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>
 2015-10-15 21:40:50 +02:00
Steve Durrheimer
080a906aac Remove '-n -l --latest' options from 'docker network ls' in zsh completion 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2015-10-15 21:12:31 +02:00
David Calavera
f255155f6b Merge pull request #17057 from mavenugo/nls 
Added `network` to docker --help and help cleanup
 2015-10-15 11:00:43 -07:00
Madhu Venugopal
46f7ab3585 Added network to docker --help and help cleanup 
Fixes https://github.com/docker/docker/issues/16909

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-10-15 03:10:39 -07:00
Qiang Huang
42d643af55 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>
 2015-10-15 14:02:18 +08:00
Harald Albers
29714ee836 Add bash completion for docker inspect --size 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-10-14 17:34:56 +02:00
Vincent Demeester
ce607916e9 Merge pull request #15796 from azurezk/add-size-to-inspect 
add container size info to inspect
 2015-10-13 23:16:10 +02:00
Jess Frazelle
3fc75c9739 Merge pull request #16922 from albers/completion-network 
[Fix #16919] Add bash completion for `docker network`
 2015-10-13 11:25:54 -07:00
Vincent Demeester
151564d39b Merge pull request #16904 from vikstrous/fish_completion_bug 
fix fish completion wrong image names bug
 2015-10-12 20:42:24 +02:00
Vincent Demeester
0b122dc55b Merge pull request #16914 from coolljt0725/add_userns_check 
Add user namespace check to check-chonfig.sh
 2015-10-12 20:39:46 +02:00
Steve Durrheimer
24174e8a84 Add zsh completion for 'docker network' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2015-10-12 12:06:12 +02:00
Harald Albers
68de2d4834 Bash completion for docker network 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-10-11 11:07:48 -07:00
Harald Albers
e4bf5cff49 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>
 2015-10-11 11:07:33 -07:00
Lei Jitang
d475c4ddc1 Add user namespace check to check-chonfig.sh 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-10-11 17:26:34 +08:00
Steve Durrheimer
ae31aa10ab Add zsh completion for '--cluster-store-opt' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2015-10-10 16:42:01 +02:00
Zhang Kun
b4d6b23838 add size to inspect 
Signed-off-by: Zhang Kun <zkazure@gmail.com>
 2015-10-10 20:44:29 +08:00
Viktor Stanchev
4d746658cc fix fish completion; wrong image names bug; close #16672 
Signed-off-by: Viktor Stanchev <me@viktorstanchev.com>
 2015-10-10 00:55:09 -07:00
Jess Frazelle
e5f7fdccfb Merge pull request #16788 from stefanberger/apparmor_policy_1.9 
contrib: Adjustments to AppArmor docker engine policy for docker 1.9
 2015-10-09 20:15:06 -07:00
Harald Albers
a095f82877 Add bash completion for --cluster-store-opt 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-10-09 14:00:52 +02:00
Stefan Berger
f5be0821cf 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>
 2015-10-08 10:08:53 -04:00
Jessica Frazelle
c559d8ebf7
change flag name to better follow the other flags that start with disable; 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-10-07 10:16:37 -07:00
Steve Durrheimer
883fe220ec Add zsh completion for 'docker daemon --no-legacy-registry' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2015-10-05 08:31:00 +02:00
Sebastiaan van Stijn
67eb810a60 Merge pull request #16744 from runcom/fix-mam-commandline 
Fix man and commandline docs
 2015-10-04 22:28:19 +02:00
Vincent Demeester
4843323a46 Merge pull request #16751 from albers/completion--no-legacy-registry 
Add bash completion for `docker daemon --no-legacy-registry`
 2015-10-04 22:13:51 +02:00
Antonio Murdaca
14e8898648 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>
 2015-10-04 21:22:27 +02:00
Tianon Gravi
e6ca006d86 Merge pull request #16561 from ai-traders/restart_on_debian 
#16560 Add timeout to `sudo service docker stop` on sysvinit
 2015-10-04 11:25:59 -07:00
Harald Albers
3f04ab2fc7 Add bash completion for --no-legacy-registry 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-10-04 06:49:42 -07:00
Vincent Demeester
825f1a7e28 Merge pull request #16629 from sdurrheimer/cluster-options-zsh-completion 
Add zsh completion for --cluster-store and --cluster-advertise
 2015-09-30 20:48:25 +01:00
Steve Durrheimer
c576310b6f Add zsh completion for --cluster-store and --cluster-advertise options for docker daemon 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2015-09-28 15:13:42 +02:00
Harald Albers
1c71c1995f bash completion for docker daemon --cluster-* 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-09-28 11:23:23 +02:00
Ewa Czechowska
5c94a9e800 #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>
 2015-09-24 19:41:32 +00:00
Jess Frazelle
84b53c8d87 Merge pull request #14579 from hqhq/hq_add_softlimit 
Add support for memory reservation
 2015-09-24 12:11:36 -07:00
Jess Frazelle
a077c46d14 Merge pull request #16523 from coolljt0725/correct_help_message_of_docker_cp 
Docs: correct the description of docker cp
 2015-09-23 15:40:58 -07:00
Tibor Vass
8d69e0eae0 Merge pull request #15915 from sdurrheimer/master 
Zsh completion updates
 2015-09-23 17:20:34 -04:00
Jess Frazelle
ce092ed08e Merge pull request #16521 from matthiasr/fix/syvinit-debian/basename-on-boot 
Do not try to guess "docker" in Debian SysV init script
 2015-09-23 13:46:19 -07:00
Jessica Frazelle
d265f93f6e
fix zypper BS wrt interactive 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-09-23 04:48:06 -07:00
Matthias Rampke
01c5cfcc56 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>
 2015-09-23 11:27:34 +00:00
qhuang
aa1780997f Add support for memory reservation 
Signed-off-by: qhuang <qhuang@10.0.2.15>
 2015-09-23 14:02:45 +08:00
David Calavera
b0dc11127e Merge pull request #16328 from jfrazelle/opensuse-rpms 
add opensuse to rpm builder
 2015-09-22 15:59:49 -07:00
Harald Albers
9d8f9943e9 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>
 2015-09-22 12:17:30 -07:00
David Calavera
108891069f Merge pull request #16400 from albers/completion-log-opt-tags 
bash completion: use generic `tag` log driver option
 2015-09-21 17:17:11 -07:00
Sally O'Malley
e41753678d docker restarts running OR stopped containers, docs edit rm "running" 
Signed-off-by: Sally O'Malley <somalley@redhat.com>
 2015-09-20 09:16:27 -04:00
Lei Jitang
ee6b81faf2 Docs: correct the description of docker cp 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-09-20 18:02:28 +08:00
Steve Durrheimer
07f1d68887 Catchup missing changes for the zsh completion 
- felixr/docker-zsh-completion@6ae6279: Add --privileged flag to docker exec command in zsh completion
 - felixr/docker-zsh-completion@259ea00: Remove -h help flag from subcommands in zsh completion
 - felixr/docker-zsh-completion@5f77b29: Add docker ps --format flag to zsh completion
 - felixr/docker-zsh-completion@a1f39f8: Add --config flag to zsh completion
 - felixr/docker-zsh-completion@6a503b4: Filter zsh completions of inspect command by --type
 - felixr/docker-zsh-completion@d286ccd: Add --ulimit flag to build command to zsh completion
 - felixr/docker-zsh-completion@bdc1261: Add support for kernel memory limit in zsh completion
 - felixr/docker-zsh-completion@c8ce164: Add docker volume command and subcommands in zsh completion
 - felixr/docker-zsh-completion@7f996bf: Add docker daemon command to zsh completion
 - felixr/docker-zsh-completion@4ccd292: Be more generic when parsing "docker ps" output.
 - felixr/docker-zsh-completion@cd0f1b9: Fix container completion by name
 - felixr/docker-zsh-completion@8bf9041: Use "docker ps --no-trunc" to build completion.
 - felixr/docker-zsh-completion@b721bbb: Only keep the last name for a running/stopped container
 - felixr/docker-zsh-completion@6791b3e: Fix "docker run --stop-signal" completion
 - felixr/docker-zsh-completion@961f628: Try some heuristics to determine the canonical container name

Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2015-09-19 12:03:55 +02:00
Harald Albers
5d6ca225d1 bash completion: use generic tag log driver option 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-09-18 16:20:05 +02:00
Tim Hockin
3d4685e258 Add support for DNS options 
Signed-off-by: Tim Hockin <thockin@google.com>
 2015-09-16 14:06:45 -07:00
Harald Albers
0a5aac1ff6 Fix bash completion when extglob is not set 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-09-16 18:17:40 +02:00
Jessica Frazelle
b0d4e9d1ba
add opensuse to rpm builder 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-09-15 16:18:19 -07:00