Commit graph

1033 commits

Author SHA1 Message Date
Aleksa Sarai
4bf7a84c96 apparmor: fix version checks to work properly
Using {{if major}}{{if minor}} doesn't work as expected when the major
version changes. In addition, this didn't support patch levels (which is
necessary in some cases when distributions ship apparmor weirdly).

Signed-off-by: Aleksa Sarai <asarai@suse.com>
2016-02-15 20:36:07 +11:00
Shijiang Wei
05b05a358f request a new token before downloading each layer
Fixes #20069

Signed-off-by: Shijiang Wei <mountkin@gmail.com>
2016-02-14 16:56:07 +08:00
Frederik Nordahl Jul Sabroe
2541a23c3a Fish completion lists all containers on "docker rm -f"
Signed-off-by: Frederik Nordahl Jul Sabroe <frederikns@gmail.com>
2016-02-12 19:14:35 +01:00
Aidan Hobson Sayers
d736a9d2c3 Add docs for --ipv6 option, also add --internal as appropriate
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
2016-02-12 01:42:15 +00:00
David Calavera
cb4a22b1a9 Merge pull request #20167 from jfrazelle/butts
remove tasksmax, people on newer kernels can add it themselves
2016-02-09 14:18:51 -08:00
Jessica Frazelle
6241250824
remove tasksmax, people on newer kernels can add it themselves
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2016-02-09 14:07:23 -08:00
Harald Albers
7e31a96d22 Improve key specific bash subcompletions
The obscure `case "${words[$cword-2]}$prev=" in` idiom is no
longer used for key specific completions in options with map values.

The `__docker_map_key_of_current_option()` function does a much
better job.

Signed-off-by: Harald Albers <github@albersweb.de>
2016-02-07 11:19:04 -08:00
Harald Albers
6f9bd6c1b8 Check key specific bash subcompletions first
This is a refactoring in preparation of cleaning up the handling
of key specific subcompletions.

The new `__docker_map_key_of_current_option()` function will be used
instead of the `__docker_map_key_of_current_option()` idiom in the
following commit.
As this function is very specific, checks using it should be executed
before those checking for `$prev`.

This commit just moves the checks without any modification.

Signed-off-by: Harald Albers <github@albersweb.de>
2016-02-07 10:57:46 -08:00
Jessica Frazelle
f5afe02b69
fix deb generate
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2016-02-05 15:31:12 -08:00
Sebastiaan van Stijn
6c2b014d5e dont try to install journald driver on wheezy
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2016-02-04 16:22:23 +01:00
Jess Frazelle
d47812dd1d Merge pull request #19886 from AndrewGuenther/185160-init-socket-fix
Wait to fire start event until socket is created
2016-02-03 17:38:52 -08:00
Tianon Gravi
75aa7dbe4f Add some basic bash completion for seccomp values
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2016-02-03 13:48:34 -08:00
Jessica Frazelle
1cbd772629
fix opensuse rpm
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2016-02-03 10:34:17 -08:00
Tibor Vass
6bde64ab2d Merge pull request #19894 from samneirinck/powershell-support
Add powershell completion support
2016-02-02 13:50:45 -05:00
Tianon Gravi
63ad7df2aa Merge pull request #19851 from hqhq/hq_remove_libseccompa
Cleanup libseccomp.a hack since dockerinit is gone
2016-02-02 09:52:35 -08:00
Vincent Woo
87a450a37f Allow disabling of colored Docker logs via daemon flag.
Signed-off-by: Vincent Woo <me@vincentwoo.com>
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-02-01 16:19:18 -05:00
Andrew Guenther
9f401254bd Wait to fire start event until socket is created
Previously, this check only worked if no host was specified and was
hard coded to check for "/var/run/docker.sock"

This change generalizes that check and captures any specified socket
and waits for it to be created.

Caveat: This will only check the first socket specified, but it is an
improvement over none at all.

Fixes #185160

Signed-off-by: Andrew Guenther <guenther.andrew.j@gmail.com>
2016-02-01 08:40:26 -08:00
Sam Neirinck
3b35a5b604 Add powershell completion support
Initial version of powershell tab completion. It completes
commands and container names.

Signed-off-by: Sam Neirinck <sam@samneirinck.com>
2016-02-01 17:12:15 +01:00
Qiang Huang
a605d641d7 Cleanup libseccomp.a hack since dockerinit is gone
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2016-01-30 16:17:13 +08:00
Jess Frazelle
e23f24bbbd Merge pull request #18176 from hypriot/17802-build-first-debian-package-for-arm
add support for building first ARM-based debian package
2016-01-29 13:26:20 -08:00
Jessica Frazelle
c40f487c5c
update bash completions for push and pull
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2016-01-29 10:14:36 -08:00
Govinda Fichtner
7b31ed432e add support for building first ARM debian package
Signed-off-by: Govinda Fichtner <govinda.fichtner@googlemail.com>
2016-01-29 00:21:17 +01:00
Harald Albers
0e5ea96fa6 Improve bash completion for users and groups
Signed-off-by: Harald Albers <github@albersweb.de>
2016-01-28 09:48:47 -08:00
Harald Albers
11fe3edacb bash completion for journald tag support
Signed-off-by: Harald Albers <github@albersweb.de>
2016-01-28 08:41:37 +01:00
Harald Albers
a381efcf39 Improve bash completion for docker volume ls -f dangling
Signed-off-by: Harald Albers <github@albersweb.de>
2016-01-27 09:32:14 +01:00
Vincent Demeester
805a107df4 Merge pull request #19736 from albers/completion-network-rm-custom
Let bash completion for `docker network rm` only complete custom networks
2016-01-27 09:07:47 +01:00
Brian Goff
146e49b039 Merge pull request #19671 from calavera/volume-dangling
Make volume dangling filter return only used volumes with `dangling=false`.
2016-01-26 17:01:20 -05:00
David Calavera
9e2b63e0ae Fix bash completion for docker volume ls --dangling=false.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-01-26 14:29:37 -05:00
Harald Albers
0e1bfdd43e Let bash completion for docker network rm only complete custom networks
Signed-off-by: Harald Albers <github@albersweb.de>
2016-01-26 10:57:38 -08:00
Harald Albers
62f366490b bash completion for docker daemon --userns-remap
Signed-off-by: Harald Albers <github@albersweb.de>
2016-01-26 10:24:47 -08:00
Aleksa Sarai
4357ed4a73 *: purge dockerinit from source code
dockerinit has been around for a very long time. It was originally used
as a way for us to do configuration for LXC containers once the
container had started. LXC is no longer supported, and /.dockerinit has
been dead code for quite a while. This removes all code and references
in code to dockerinit.

Signed-off-by: Aleksa Sarai <asarai@suse.com>
2016-01-26 23:47:02 +11:00
Tianon Gravi
722fac7a73 Change the way we install from backports in the deb builder (to force deps too)
Also, add "libsystemd-journal-dev" to the explicit list (which is what prompted the change in how we install).

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2016-01-25 14:49:05 -08:00
Brian Goff
9211fc36a9 Merge pull request #19655 from sdurrheimer/zsh-completion-cp-follow-link
Add zsh completion for 'docker cp -L --follow-link'
2016-01-25 09:28:26 -05:00
Sebastiaan van Stijn
5719dca1d7 Merge pull request #19657 from sdurrheimer/zsh-completion-new-syslog-over-tls-options
Add zsh completion for new 'docker daemon --log-opt syslog-tls-ca-cer…
2016-01-25 01:21:57 -08:00
Steve Durrheimer
b3cd453b84 Add zsh completion for new 'docker daemon --log-opt syslog-tls-ca-cert syslog-tls-cert syslog-tls-key syslog-tls-skip-verify' options
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-01-25 08:21:15 +01:00
Steve Durrheimer
995d1d09ce Add zsh completion for new 'docker daemon --cluster-store-opt discovery.heartbeat discovery.ttl kv.path' options
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-01-25 08:14:46 +01:00
Steve Durrheimer
490ea6961c Add zsh completion for 'docker cp -L --follow-link'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-01-25 08:09:30 +01:00
Brian Goff
714587196b Merge pull request #19643 from albers/completion-nospace
fix minor bash completion issue on OSX (compopt)
2016-01-24 20:58:33 -05:00
Vincent Demeester
84e4fb8b0a Merge pull request #19641 from albers/completion-syslog-tls
bash completion for syslog over TLS log driver
2016-01-24 22:14:54 +01:00
Antonio Murdaca
0764706dcc Merge pull request #19636 from albers/completion-daemon--cluster-store-opt
bash completion for new `--cluster-store-opt` values
2016-01-24 22:12:37 +01:00
Vincent Demeester
460f491457 Merge pull request #19642 from albers/completion-tag-f
Remove completion for `docker tag -f`
2016-01-24 22:10:23 +01:00
Antonio Murdaca
a3cfdb5a31 Merge pull request #19633 from albers/completion-ps-filter-dead
bash completion for `docker ps --filter status=dead`
2016-01-24 22:04:56 +01:00
Antonio Murdaca
672ca81869 Merge pull request #19632 from albers/completion-cp--follow-link
bash completion for `docker cp --follow-link`
2016-01-24 22:04:26 +01:00
Harald Albers
6b28e1bbe2 fix minor bash completion issue on OSX (compopt)
Signed-off-by: Harald Albers <github@albersweb.de>
2016-01-24 10:28:36 -08:00
Harald Albers
1bd5424c38 remove zsh completion for docker tag -f
Signed-off-by: Harald Albers <github@albersweb.de>
2016-01-24 10:11:18 -08:00
Harald Albers
59754c4bd8 remove bash completion for docker tag -f
Signed-off-by: Harald Albers <github@albersweb.de>
2016-01-24 10:07:04 -08:00
Harald Albers
6723c8aa26 bash completion for syslog over TLS log driver
Signed-off-by: Harald Albers <github@albersweb.de>
2016-01-24 09:34:30 -08:00
Harald Albers
17eb18899e bash completion for --cluster-store-opt kv.path discovery.{heartbeat,ttl}
Signed-off-by: Harald Albers <github@albersweb.de>
2016-01-24 07:24:12 -08:00
Harald Albers
7f345f2ec4 bash completion for docker images -f dangling=false
Signed-off-by: Harald Albers <github@albersweb.de>
2016-01-24 06:36:04 -08:00
Harald Albers
0f654bb5eb bash completion for docker ps --filter status=dead
Signed-off-by: Harald Albers <github@albersweb.de>
2016-01-24 05:57:57 -08:00
Harald Albers
7b3058b864 bash completion for docker cp --follow-link
Signed-off-by: Harald Albers <github@albersweb.de>
2016-01-24 05:39:52 -08:00
Sebastiaan van Stijn
b3af1d5242 Merge pull request #19598 from tianon/pkg-config
Add pkg-config to our Debian build environment
2016-01-22 17:33:43 -08:00
Nalin Dahyabhai
7d4f52ec6b Add pkg-config to our RPM build environment
While hack/make.sh checks for systemd headers using pkg-config, we
forgot to ensure that they were there in the images that we use for
building binaries for RPM-based distributions.  Add the right packages
to the generate.sh that we use for them, and update the copies of the
generated files that we carry in the source tree.

Notes: Fedora, CentOS, and Oracle Linux put the pkg-config command in
the "pkgconfig" package, while OpenSUSE calls the package "pkg-config".
The systemd-devel package, like systemd, is not in Oracle Linux 6.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2016-01-22 18:46:07 -05:00
Tianon Gravi
9ac671f79e Add pkg-config to our Debian build environment
This is used in `hack/make.sh` for detecting various dependencies such as `libsystemd-journal` -- without this, our packages don't support pulling logs back out of journald. 😢

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2016-01-22 15:22:04 -08:00
Tianon Gravi
90e33640b8 Add a note to /etc/default/docker noting that it does not apply to systemd
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2016-01-22 07:35:02 -08:00
Vincent Demeester
7aef311269 Merge pull request #19541 from albers/completion-events
Support new events in bash completion
2016-01-21 18:40:54 +01:00
Harald Albers
ab01b6f385 Refactor handling of key specific subcompletions
The currently used idiom for handling key specific subcompletions
did not work here: behind `docker event -f type=network `, the completion
of networks triggered. The expected behaviour is not to complete
anything here.

In order to limit the scope of the corresponding PR, the new idiom is
currently only used in `docker events --filter`.

Signed-off-by: Harald Albers <github@albersweb.de>
2016-01-21 14:24:31 +01:00
Harald Albers
fcc035848f Support new events in bash completion
Signed-off-by: Harald Albers <github@albersweb.de>
2016-01-21 13:57:35 +01:00
Jess Frazelle
5537a92e45 Merge pull request #19377 from jfrazelle/cleanup-build-rpm-deb
Cleanup build rpm deb
2016-01-20 23:58:33 -08:00
Sebastiaan van Stijn
b433e1e7fb Merge pull request #19486 from sdurrheimer/zsh-completion-network-links
Zsh completion for '--alias --net-alias --ip --ip6 --link'
2016-01-20 09:28:04 -08:00
Antonio Murdaca
e9ac149472 Merge pull request #19478 from zchee/add-arg-syntax
Add `ARG` instruction syntax for vim
2016-01-20 13:20:47 +01:00
Steve Durrheimer
fe8a6a5b67 Add zsh completion for 'docker network connect --link'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-01-20 10:19:03 +01:00
Steve Durrheimer
5284e037ff Add zsh completion for 'docker {network connect, create, run} --ip --ip6'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-01-20 10:19:03 +01:00
Steve Durrheimer
898b53fafa Add zsh completion for 'docker network connect --alias' and 'docker {create, run} --net-alias'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-01-20 10:19:03 +01:00
Steve Durrheimer
32bd703926 Add zsh completion for 'docker {attach,exec,run,start} --detach-keys'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-01-20 10:14:35 +01:00
Koichi Shiraishi
b15247868c
Add ARG instruction syntax for vim
Signed-off-by: Koichi Shiraishi <k@zchee.io>
2016-01-20 15:08:45 +09:00
Jessica Frazelle
0bff2515f7
add a way to only build requested pkgs
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2016-01-19 17:47:27 -08:00
Steve Durrheimer
da26fc26b2 Add zsh completion for 'docker network create --ipam-opt' + Reordering for better maintainability
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-01-19 21:16:16 +01:00
Brian Goff
2cd74f9932 Merge pull request #19391 from cdauth/systemd_tasks_max
Set TasksMax in addition to LimitNPROC in systemd service files
2016-01-18 13:33:07 -05:00
Tianon Gravi
8a4b4f5950 Merge pull request #19409 from albers/completion-network-links
bash completion for container linking and aliasing
2016-01-18 08:36:33 -08:00
Harald Albers
6ae4ffb6e5 bash completion for docker network create --internal, --ipam-opt
Signed-off-by: Harald Albers <github@albersweb.de>
2016-01-18 07:50:26 -08:00
Harald Albers
67fe772ca6 bash completion for container linking and aliasing
Signed-off-by: Harald Albers <github@albersweb.de>
2016-01-18 07:11:19 -08:00
Candid Dauth
105778343a Set TasksMax in addition to LimitNPROC in systemd service files
systemd sets an additional limit on processes and threads that defaults to 512 when run under Linux >= 4.3.
See more information here: http://unix.stackexchange.com/a/255603/59955

Signed-off-by: Candid Dauth <cdauth@cdauth.eu>
2016-01-16 18:45:41 +01:00
Brian Goff
82401a4b13 Merge pull request #19386 from sdurrheimer/zsh-completion-network-create-internal
Add zsh completion for 'docker network create --internal'
2016-01-16 08:04:05 -05:00
Steve Durrheimer
0a9508e821 Modify zsh completion for connecting/disconnecting non-running containers to networks
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-01-16 12:59:20 +01:00
Steve Durrheimer
581a55d54c Add zsh completion for 'docker network create --internal'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-01-16 12:53:50 +01:00
Jess Frazelle
b69243e951 Merge pull request #19169 from Djelibeybi/fix-ol6-build
Restoring the RPM build process for Oracle Linux 6
2016-01-15 16:56:11 -08:00
Jessica Frazelle
3466e5c911
fix selinux version for contrib/builder generation
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2016-01-15 15:29:43 -08:00
Phil Estes
dd104eb91d Merge pull request #19345 from tianon/fast-syscall-compile
Switch "syscall-test" image from "debian:jessie" to "buildpack-deps:jessie" so that "gcc" is already included
2016-01-15 16:06:14 -05:00
Tianon Gravi
9b2aab3fc8 Switch "syscall-test" image from "debian:jessie" to "buildpack-deps:jessie" so that "gcc" is already included
This results in a significant time savings during repeated builds (since we don't have to re-download gcc for every test run).

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2016-01-14 13:51:30 -08:00
Harald Albers
b24ded193f bash completion for --detach-keys
Signed-off-by: Harald Albers <github@albersweb.de>
2016-01-14 13:47:20 -08:00
Tibor Vass
9560d94114 Bump Go to version 1.5.3
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-01-13 17:23:46 -05:00
Tibor Vass
612cf0f172 Merge pull request #19279 from tiborvass/rename-authz-to-authorization
Rename authz to authorization for greater clarity
2016-01-13 14:30:18 -05:00
Tibor Vass
5c630ea7c3 Rename authz to authorization for greater clarity
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-01-13 14:15:37 -05:00
Jess Frazelle
22f4dad3d7 Merge pull request #19287 from tianon/check-config-assoc-array
Update check-config.sh to use "case" instead of an associative array
2016-01-13 08:38:10 -08:00
Harald Albers
40f73c7c8e bash completion for connecting non-running containers to networks
Signed-off-by: Harald Albers <github@albersweb.de>
2016-01-13 10:32:23 +01:00
Tianon Gravi
5c161f4e1a Update check-config.sh to use "case" instead of an associative array
This fixes Bash 3.x compatibility (where associative arrays are not available).

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2016-01-12 20:57:56 -08:00
Steve Durrheimer
54bea86b03 Add zsh completion for 'docker daemon --userns-remap'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-01-12 22:38:32 +01:00
David Calavera
1a7d40c692 Merge pull request #19208 from sdurrheimer/zsh-completion-update_isolation_shm-size_memory_reservation
Zsh completion for 'docker update' + common options refactoring
2016-01-11 11:36:55 -08:00
Harald Albers
3f6b0f4c7c bash completion for docker {build,create,run} --shm-size
Signed-off-by: Harald Albers <github@albersweb.de>
2016-01-09 09:27:45 -08:00
Steve Durrheimer
d14eba774d Add zsh completion for 'docker {build,create,run} --isolation'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-01-09 14:48:55 +01:00
Steve Durrheimer
01e6bd3c3e Add zsh completion for 'docker {build,create,run} --shm-size
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-01-09 14:46:06 +01:00
Steve Durrheimer
3a8fb8de4f Add zsh completion for 'docker {create,run,update} --memory-reservation'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-01-09 14:40:37 +01:00
Steve Durrheimer
8a95f88272 Add zsh completion for 'docker update' + refactoring of common options between 'build', 'create', 'run', 'update'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-01-09 14:38:22 +01:00
Avi Miller
28f52bd06a Restoring the RPM build process for Oracle Linux 6 and updating the docker-engine.spec
file to require the Unbreakable Enterprise Kernel Release 4 on both Oracle Linux 6
and Oracle Linux 7.

The UEK R4 provides the required kernel functionality for VxLAN support
required by Docker 1.9 and user namespace support required for 1.10+.

The build of Docker on Oracle Linux 6 requires some manipulation of the build
environment so that the CGO compiler uses the UEK R4 headers instead of the old
default kernel headers.

Signed-off-by: Avi Miller <avi.miller@oracle.com>
2016-01-08 08:09:47 +11:00
Arnaud Porterie
837de95717 Merge pull request #16704 from manchoz/16695_manchoz_archarm
Add support for Arch Linux ARM base images generation (#16695).
2016-01-06 11:16:40 -08:00
Harald Albers
97f84b5dc1 bash completion for docker update
Signed-off-by: Harald Albers <github@albersweb.de>
2016-01-06 10:20:33 -08:00
Vincent Demeester
4f8d794c46 Merge pull request #19097 from albers/completion-daemon--cgroup-parent
bash completion for `docker daemon --cgroup-parent`
2016-01-05 19:56:51 +01:00
Harald Albers
9e624d3250 bash completion for --isolation
Signed-off-by: Harald Albers <github@albersweb.de>
2016-01-05 09:59:29 -08:00
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