Граф коммитов

1067 Коммитов

Автор SHA1 Сообщение Дата
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
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