2519f46550
Merge pull request #17700 from calavera/remove_lxc
...
Remove LXC support.
2015-11-05 15:22:37 -08:00
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
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
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
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
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
3c6962f22d
Merge pull request #17677 from fboudra/master
...
Remove yum cache to reduce image size
2015-11-05 11:16:40 -08:00
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
71db33738d
Merge pull request #17574 from Microsoft/10662-devicetool
...
Windows: Fix docker device tool
2015-11-05 13:05:28 +01:00
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
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
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
96b45e9216
Windows: Fix docker device tool
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-10-31 11:32:37 -07:00
985fe8857d
update go version for debs and rpms
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-10-29 17:04:38 -07:00
584bdaf5d9
Fix docker-device-tool
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-10-28 16:43:53 -07:00
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
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
b92fd9ff04
Merge pull request #17124 from vincentbernat/fix/zsh-option-stacking
...
zsh: enable option stacking
2015-10-27 01:39:04 +01:00
bffcb8226e
Merge pull request #17377 from LK4D4/remove_host_integration
...
Remove contrib/host-integration
2015-10-26 23:45:20 +01:00
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
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
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
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
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
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
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
7963807610
Fix repeatable options in zsh completion
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2015-10-24 16:38:41 +02:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
504d2a9212
Bash completion for restart policy `unless-stopped`
...
Signed-off-by: Harald Albers <github@albersweb.de>
2015-10-17 07:24:17 -07:00
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
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
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
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
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
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
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
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
3a713d91ce
bash completion: minor refactoring for consistency
...
Signed-off-by: Harald Albers <github@albersweb.de>
2015-10-16 12:41:09 +02:00
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
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
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
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
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
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
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
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
f255155f6b
Merge pull request #17057 from mavenugo/nls
...
Added `network` to docker --help and help cleanup
2015-10-15 11:00:43 -07:00
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
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
29714ee836
Add bash completion for `docker inspect --size`
...
Signed-off-by: Harald Albers <github@albersweb.de>
2015-10-14 17:34:56 +02:00
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
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
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
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
24174e8a84
Add zsh completion for 'docker network'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2015-10-12 12:06:12 +02:00
68de2d4834
Bash completion for `docker network`
...
Signed-off-by: Harald Albers <github@albersweb.de>
2015-10-11 11:07:48 -07:00
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
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
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
b4d6b23838
add size to inspect
...
Signed-off-by: Zhang Kun <zkazure@gmail.com>
2015-10-10 20:44:29 +08:00
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
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
a095f82877
Add bash completion for `--cluster-store-opt`
...
Signed-off-by: Harald Albers <github@albersweb.de>
2015-10-09 14:00:52 +02:00
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
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
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
67eb810a60
Merge pull request #16744 from runcom/fix-mam-commandline
...
Fix man and commandline docs
2015-10-04 22:28:19 +02:00
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
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
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
3f04ab2fc7
Add bash completion for `--no-legacy-registry`
...
Signed-off-by: Harald Albers <github@albersweb.de>
2015-10-04 06:49:42 -07:00
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
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
1c71c1995f
bash completion for `docker daemon --cluster-*`
...
Signed-off-by: Harald Albers <github@albersweb.de>
2015-09-28 11:23:23 +02:00
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
84b53c8d87
Merge pull request #14579 from hqhq/hq_add_softlimit
...
Add support for memory reservation
2015-09-24 12:11:36 -07:00
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
8d69e0eae0
Merge pull request #15915 from sdurrheimer/master
...
Zsh completion updates
2015-09-23 17:20:34 -04:00
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
d265f93f6e
fix zypper BS wrt interactive
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-09-23 04:48:06 -07:00
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
aa1780997f
Add support for memory reservation
...
Signed-off-by: qhuang <qhuang@10.0.2.15>
2015-09-23 14:02:45 +08:00
b0dc11127e
Merge pull request #16328 from jfrazelle/opensuse-rpms
...
add opensuse to rpm builder
2015-09-22 15:59:49 -07:00
Solomon Hykes
David Calavera
Tianon Gravi
Brian Goff
Julien Pervillé
Jess Frazelle
Stefan Berger
Antonio Murdaca
Asbjørn Enge
Fathi Boudra
Jessica Frazelle
John Howard
Alexander Morozov
Steve Durrheimer
Sebastiaan van Stijn
Vincent Demeester
Vincent Bernat
Tibor Vass
Denis Gladkikh
Harald Albers
Vincent Demeester
Madhu Venugopal
Qiang Huang
Lei Jitang
Zhang Kun
Viktor Stanchev
Antonio Murdaca
Ewa Czechowska
Matthias Rampke
qhuang