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
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
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
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