docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
21,098 Commits 25 Branches 28 Tags 827 MiB
Commit Graph

888 Commits

Author SHA1 Message Date
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
Nalin Dahyabhai e611a189cb Add log reading to the journald log driver 
If a logdriver doesn't register a callback function to validate log
options, it won't be usable.  Fix the journald driver by adding a dummy
validator.

Teach the client and the daemon's "logs" logic that the server can also
supply "logs" data via the "journald" driver.  Update documentation and
tests that depend on error messages.

Add support for reading log data from the systemd journal to the
journald log driver.  The internal logic uses a goroutine to scan the
journal for matching entries after any specified cutoff time, formats
the messages from those entries as JSONLog messages, and stuffs the
results down a pipe whose reading end we hand back to the caller.

If we are missing any of the 'linux', 'cgo', or 'journald' build tags,
however, we don't implement a reader, so the 'logs' endpoint will still
return an error.

Make the necessary changes to the build setup to ensure that support for
reading container logs from the systemd journal is built.

Rename the Jmap member of the journald logdriver's struct to "vars" to
make it non-public, and to make it easier to tell that it's just there
to hold additional variable values that we want journald to record along
with log data that we're sending to it.

In the client, don't assume that we know which logdrivers the server
implements, and remove the check that looks at the server.  It's
redundant because the server already knows, and the check also makes
using older clients with newer servers (which may have new logdrivers in
them) unnecessarily hard.

When we try to "logs" and have to report that the container's logdriver
doesn't support reading, send the error message through the
might-be-a-multiplexer so that clients which are expecting multiplexed
data will be able to properly display the error, instead of tripping
over the data and printing a less helpful "Unrecognized input header"
error.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com> (github: nalind)
 2015-09-11 16:50:03 -04:00
Tianon Gravi f9e5a693ed Merge pull request #16194 from yosifkit/fix-nuke 
Fix nuke script
 2015-09-11 10:26:22 -07:00
David Calavera 3781cde61f Add `STOPSIGNAL` instruction to dockerfiles. 
This way, images creators can set the exit signal their programs use.

Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-09-10 19:56:05 -04:00
David Calavera 0e50d946a2 Signal to stop a container. 
Allow to set the signal to stop a container in `docker run`:
- Use `--stop-signal` with docker-run to set the default signal the container will use to exit.

Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-09-10 19:56:05 -04:00
Joe Ferguson d2e9f6c0c1 Fix nuke script to remove from end of path 
Signed-off-by: Joe Ferguson <joe@infosiftr.com>
 2015-09-09 15:34:05 -07:00
Samuel Karp 3effe484e6 Add awslogs driver for Amazon CloudWatch Logs 
Signed-off-by: Samuel Karp <skarp@amazon.com>
 2015-09-09 13:52:40 -07:00
Harald Albers 57ab4a1a6c bash completion for `docker volume` 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-09-07 13:22:57 -07:00
Jessica Frazelle e38a9ecef6 fix release branch in suites.sh 
we changed the naming scheme of the release branch

Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-09-03 15:48:02 -07:00
Tianon Gravi a5eec723f8 Swap "ubuntu-debootstrap" for just "ubuntu" 
See https://github.com/docker-library/official-images/pull/982#issuecomment-133207587.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2015-09-01 14:03:49 -07:00
David Calavera dd49002055 Merge pull request #15958 from vdemeester/14570-contrib-completion-image 
Add docker ps --filter=… ancestor image bash completion
 2015-09-01 12:16:52 +02:00
Vincent Demeester 6ae2cb7ad1 Add docker ps --filter=… image completion 
I missed that on #15919, thanks @albers

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-09-01 08:47:02 +02:00
David Calavera 166412e529 Merge pull request #15827 from williamh/fix-openrc-script 
Fix openrc script
 2015-08-31 20:32:00 +02:00
David Calavera d6a94fbf22 Merge pull request #15919 from vdemeester/14570-contrib-completion 
Update shell completion on docker ps for ancestor
 2015-08-31 09:58:05 +02:00
Jessica Frazelle 8fe675d799 add selinux-policy and docker-engine-selinux rpm 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-08-28 17:54:04 -07:00
Jessica Frazelle 42d8fe6105 add build deps for selinux-policy/selinux-policy-devel 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-08-28 17:43:30 -07:00
Vincent Demeester 672bae2dc0 Update shell completion on docker ps for ancestor 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-08-28 20:56:52 +02:00
Jessica Frazelle bd06432ba3 cleanup and fix btrfs subvolume recursion deletion 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-08-25 13:00:41 -07:00
William Hubbs e3772538c0 Fix OpenRC init script 
The shebang for OpenRC init scripts is now #!/sbin/openrc-run, and we
can also use the default start and stop functions built into OpenRC.

Signed-off-by: William Hubbs <w.d.hubbs@gmail.com>
 2015-08-25 12:02:01 -05:00
William Hubbs 1c0c68b18f Drop execute bit from openrc init script 
Signed-off-by: William Hubbs <w.d.hubbs@gmail.com>
 2015-08-25 12:00:54 -05:00
Jessie Frazelle ebe27cb34c Merge pull request #14868 from jeffminard-ck/rhel-init-detect-failure 
Allow RHEL init script to detect daemon start pid failure
 2015-08-24 14:24:36 -07:00
David Calavera 88cacbf529 Merge pull request #15767 from hqhq/hq_fix_optional_comments 
Change all optional unit to [unit]
 2015-08-24 17:36:01 +02:00
David Calavera cb00396f61 Merge pull request #15332 from pugnascotia/master 
Make run and rmi bash completions configurable
 2015-08-24 10:49:01 +02:00
Qiang Huang 76a5fdc3d4 Change all optional unit to [unit] 
As suggested before, we should change every signal one.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-08-21 21:29:52 -07:00
Jessie Frazelle c5733e6a20 Merge pull request #15366 from rvesse/sysvinit-redhat-silent-fail 
Fix silent failure in RedHat sysvinit script
 2015-08-21 14:54:25 -07:00
Jessie Frazelle 9bd8a9b66b Merge pull request #14006 from hqhq/hq_add_kmem_limit 
Add support for kernel memory limit
 2015-08-21 14:34:27 -07:00
Jessie Frazelle 616950b030 Merge pull request #15687 from coolljt0725/add_blk_dev_throttling_to_check_config 
Add CONFIG_BLK_DEV_THROTTLING to check-config.sh
 2015-08-21 13:48:28 -07:00
Jessica Frazelle ee1304a35e fedora 20 is EOL remove from rpm builder 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-08-21 11:01:18 -07:00
Qiang Huang b6f1b4ad35 Add support for kernel memory limit 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-08-19 23:56:55 +08:00
Lei Jitang cbb69531a8 Add CONFIG_BLK_DEV_THROTTLING to check-config.sh 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-08-19 15:11:04 +08:00
Harald Albers 18381faee6 Fix bash completion for log driver options 
This option was incorrectly ported to the new `daemon` subcommand
structure.

Beside the obvious effect that completion of `docker daemon --log-opt`
did not work, this also caused completion of `docker` and `docker xxx`
to fail on macs with

> bash: words: bad array subscript

Signed-off-by: Harald Albers <github@albersweb.de>
 2015-08-18 09:17:29 +02:00
Sebastiaan van Stijn e1f3a5ad0a Merge pull request #14113 from dit4c/10348-exec-privileged 
Remerge of `docker exec --privileged` with better tests
 2015-08-16 00:20:41 +02:00
David Calavera 313b37129a Merge pull request #15525 from albers/completion-option-updates 
Updates to bash completion for docker run and docker daemon.
 2015-08-14 13:55:11 -07:00
Rory Hunter 60d97a4a63 Make run and rmi bash completions configurable 
Allow the user to configure how Docker's bash completion works for the
"events", "history", "inspect", "run", "rmi" and "save" commands through the
following environment variables:

DOCKER_COMPLETION_SHOW_IMAGE_IDS
  "none" - Show names only (default)
  "non-intermediate" - Show names and ids, but omit intermediate image IDs
  "all" - Show names and ids, including intermediate image IDs

DOCKER_COMPLETION_SHOW_TAGS
  "yes" - include tags in completion options (default)
  "no"  - don't include tags in completion options

Fixes #9474.

Signed-off-by: Rory Hunter <roryhunter2@gmail.com>
 2015-08-14 11:29:29 +01:00
Qiang Huang 6c4d4c70c6 Adapt CONFIG_NETPRIO_CGROUP in check-config.sh 
Fixes: #15572

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-08-14 14:38:48 +08:00
Tim Dettrick 03f65b3d0d Revert "Revert "Add docker exec run a command in privileged mode"" 
This reverts commit 40b71adee3.

Original commit (for which this is effectively a rebased version) is
72a500e9e5 and was provided by Lei Jitang
<leijitang@huawei.com>.

Signed-off-by: Tim Dettrick <t.dettrick@uq.edu.au>
 2015-08-13 16:36:44 +10:00
David Calavera d50881e446 Merge pull request #15449 from albers/completion-help 
Remove -h flag from completion and daemon reference
 2015-08-12 17:09:51 -07:00
Harald Albers e4d8a8e1ca Add storage options to bash completion 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-08-12 06:13:24 -07:00
Harald Albers 5c1ad6f90c Add options for the json-file logging driver to bash completion 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-08-12 04:39:29 -07:00
Harald Albers 644c158837 Update bash completion for `docker run` 
Also fixed sort order of options using `sort -d`

Signed-off-by: Harald Albers <github@albersweb.de>
 2015-08-12 04:38:55 -07:00
Jessica Frazelle 83416f68de add file to test install script 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-08-11 16:31:58 -07:00
Harald Albers ceb11d9660 Remove -h flag from completion and daemon reference 
All docker subcommands support `-h` as an alias for `--help`
unless they have `-h` aliased to something else like `docker run`,
which uses `-h` for `--hostname`.

`-h` is not included in the help messages of the commands, though.

It ist visible in
* reference: only in `docker daemon` reference,
  see output of `grep -Rse --help=false docs`
* man pages: only in `docker` man page
  see output of `grep -RF '**-h**' man`

For consistency reasons, this commit removes `-h` as an alias for
`--help` from the reference page, man page and the bash completion.

Signed-off-by: Harald Albers <github@albersweb.de>
 2015-08-11 07:30:58 -07:00
Tibor Vass 4293861c1e Merge pull request #15452 from albers/completion-storage-driver 
Add missing storage drivers to bash completion
 2015-08-10 13:25:45 -04:00
Harald Albers 5cee7e8116 Add missing storage drivers to bash completion 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-08-10 08:49:40 -07:00
Brian Goff 51249a3aa0 Merge pull request #15445 from hqhq/hq_use_docker_daemon 
Change all docker -d to docker daemon
 2015-08-10 10:35:19 -04:00
Harald Albers c465ba7bde Add `docker ps --format` to bash completion 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-08-10 06:51:14 -07:00
Qiang Huang 81cc8ebc93 Change all docker -d to docker daemon 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-08-10 20:48:08 +08:00