Commit Graph

1112 Commits

Author SHA1 Message Date
357ff8123d Merge pull request #23085 from icecrime/gitdm.config
Add gitdm configuration
Upstream-commit: 09be7d9ee4533c0b60c0c2b70d0cde41a86e5049
Component: engine
2016-06-01 18:12:59 +02:00
9ca60cdcf4 bash completion for dockerd
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 5f1c5b28a719d63005ce5e2190348bdfbce629c3
Component: engine
2016-05-29 07:09:05 -07:00
e49e05c1a7 Add gitdm configuration
Update .mailmap and add gitdm configuration.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: bf6d52bba16072d0c0f85782a5907acad4067789
Component: engine
2016-05-28 21:08:20 -07:00
1ca96c8cd2 Update golang 1.6.2
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
Upstream-commit: d59458c12d76d732e0ab564ea0e769323af6d3d6
Component: engine
2016-05-27 23:00:05 +02:00
0aa032d270 Build deb for raspbian-jessie
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
Upstream-commit: 46c61497a056042397fed7db65059feb68d28e16
Component: engine
2016-05-27 22:54:50 +02:00
9b06540d32 Merge pull request #22840 from runcom/go1.6
Upgrade to golang 1.6.2
Upstream-commit: 9b0d385975c80359b4cab2c75e4834fe803e12d5
Component: engine
2016-05-27 06:54:57 -07:00
9fc37c22c9 Add before and since filter to images
Add support for two now filter on the `images` command : `before` and
`since`. They work the same as the one on the `ps` command but for
images.

        $ docker images --filter before=myimage
        # display all images older than myimage
        $ docker images --filter since=myimage
        # display all images younger than myimage

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 750e16f57c0121aa8cdad1763f0bb6e54b8c6d75
Component: engine
2016-05-25 13:49:10 +02:00
dd2618f69b Update golang 1.6.2 for ARM
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: f32ccb080ac382a386cbe33ed1d11048474206c5
Component: engine
2016-05-25 11:58:48 +02:00
7fe655caac Upgrade to golang 1.6.2
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 40b21745cc14628fc5336fbacddf092667a70c65
Component: engine
2016-05-25 11:58:48 +02:00
0de35f39e7 bash completion for docker ps -f {before,since}
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: c49d3274067055dc830d97f1490a84aa73e403e6
Component: engine
2016-05-25 09:35:33 +02:00
2e9725c51d bash completion for daemon events
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: cc6a1b8bb3849f2ead3f89fc18a573034e1386f1
Component: engine
2016-05-24 17:19:03 +02:00
d84ac3cf8d Add zsh completion for 'docker images' filters
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 11da243273908719c5ab755c6765a9561693ba30
Component: engine
2016-05-22 13:01:08 +02:00
214a2bf487 Add a --filter option to docker search
The filtering is made server-side, and the following filters are
supported:

* is-official (boolean)
* is-automated (boolean)
* has-stars (integer)

Signed-off-by: Fabrizio Soppelsa <fsoppelsa@mirantis.com>
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: e009ebdf4c0bf0ff64da8d48eefad63d0644de3e
Component: engine
2016-05-20 13:41:28 +02:00
612ad97231 Add support for --pid=container:<id>
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
Upstream-commit: fb43ef649bc6aa11ca19c0e046518e85e1c7e2fa
Component: engine
2016-05-17 13:49:05 -04:00
052290c835 Fix typo in zsh completion
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 09cb57b773d1b83773120da3c4382defa37cf257
Component: engine
2016-05-17 13:38:46 +02:00
00eb665726 Update check_config for MEMCG_KMEM
CONFIG_MEMCG_KMEM is removed since 4.6, it's accounted by default
since 4.6, so it's merged to CONFIG_MEMCG.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 27d7b135d4475b8c7b5159792b9b6d160e4535c1
Component: engine
2016-05-16 13:55:24 +08:00
4c4ce8206c Merge pull request #22740 from sdurrheimer/zsh-completion-network-ls-filter-label
Add zsh completion for 'docker network ls --filter label'
Upstream-commit: fbf3741f0d2d6328c9351c38120e6e46cdce5fdf
Component: engine
2016-05-14 22:27:00 +02:00
b8c6540ccd Merge pull request #22739 from sdurrheimer/zsh-completion-daemon-concurrent
Add zsh completion for 'docker daemon --max-concurrent-downloads --ma…
Upstream-commit: c80f9269975114e7587a49e2b54f4a9ef8c27a43
Component: engine
2016-05-14 22:25:59 +02:00
ca207f3050 Add zsh completion for 'docker network ls --filter label'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: afca8a454ac4214461b106d26d610231df7804f3
Component: engine
2016-05-14 19:38:39 +02:00
92808ac20a Add zsh completion for 'docker daemon --max-concurrent-downloads --max-concurrent-uploads'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: bf9a1d5027d4f7d6a5e07d2774c3499d41d63c28
Component: engine
2016-05-14 19:20:20 +02:00
ebdd31bd5a Add zsh completion for 'docker logs --details'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: dcca0f6dd1b2fb239c0310112a5968c2f3a51aca
Component: engine
2016-05-14 19:13:01 +02:00
9fe611523f Merge pull request #22714 from albers/completion-logs--details
bash completion for `docker logs --details`
Upstream-commit: a213a446d7828c54e9ce104b38e1adfd4827871e
Component: engine
2016-05-13 14:37:45 +02:00
921a4bba50 bash completion for docker logs --details
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: d166c8fbb21ce5ba2e456ca2b737202182dfe7f8
Component: engine
2016-05-13 08:42:43 +02:00
91f1115a66 bash completion for docker daemon --max-concurrent-{down,up}load
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: cc6bcaaddcc590bd4810bcc0177ab3c3b43d5a37
Component: engine
2016-05-13 08:25:53 +02:00
99e89dfbb3 Merge pull request #22455 from Anvil/bash-completion-failglob
docker bash completions fails when failglob is enabled
Upstream-commit: f7c79cdeae67cec70c5257e808cb51eb7a90d35c
Component: engine
2016-05-11 13:08:48 -10:00
b47a34c25a Merge pull request #22368 from tianon/wheezy-lts
Update contrib/mkimage/debootstrap to include wheezy-lts
Upstream-commit: 78e9f2e9e74a0c25318054ed21c539acfb44e235
Component: engine
2016-05-11 12:49:26 -10:00
fee867dae4 Merge pull request #22365 from dnephin/fix_selinux_for_dockerd
Update the binary name in docker-engine-selinux/docker.fc
Upstream-commit: bacce5ef4f77acc9450e46bc7a4ca8ad3330b134
Component: engine
2016-05-11 12:44:55 -10:00
906e7550b5 Merge pull request #22278 from runcom/fixies-dockerd
Fixies dockerd
Upstream-commit: fd3a795a478cec71d2c9fd2178c67482f04ef029
Component: engine
2016-05-11 07:57:00 -07:00
97e6cef981 contrib: init: use dockerd
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 1ac1b78b3a771c562d9cfa91c14f8a494c3723c1
Component: engine
2016-05-11 11:00:11 +02:00
8d0748f1ff Allow changing wheezy deb builder backport mirror
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 6a033e617f6c948788c580b26c6567d7d9ef359e
Component: engine
2016-05-09 09:10:30 -07:00
991c954a45 Fix rpm generation on oraclelinux-6
The uek kernel needs to be install first in order to get the correct
btrfs tools version.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 05dec0b032a6bde63a803141e2ccd48daa1a494e
Component: engine
2016-05-05 12:12:49 -07:00
a07549943f Update contrib/mkimage/debootstrap to account for Debian LTS changes
See https://www.debian.org/News/2016/20160425 and https://wiki.debian.org/LTS/Using for more details.

> For Debian 7 "Wheezy" LTS there will be no requirement to add a separate wheezy-lts suite to your sources.list any more. In fact you will not notice the switch to LTS because after the official security support by the Debian Security Team ends, security updates will be provided via security.debian.org 's wheezy/updates.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 084c72e760cb78078f1f1bafbcd70d4dafd8e0c5
Component: engine
2016-05-04 08:39:45 -07:00
97d521660e Merge pull request #22446 from thaJeztah/add-daemon-reload
Add support for reloading daemon configuration through systemd
Upstream-commit: 9c52a04f389d4bd2eb447c13a13003d79b746abc
Component: engine
2016-05-04 12:38:40 +02:00
be36ed6341 Merge pull request #22452 from cpuguy83/fix_zsh_completion_psformat
Make zsh completion work when ps output is custom
Upstream-commit: 2a6980c5cb111514d1929c619b8fc8fc2df00fd5
Component: engine
2016-05-02 17:39:46 +02:00
c59e149a58 contrib/completion/bash/docker: _docker_docker: quoting __docker_to_extglob result to avoid failglob interference
Signed-off-by: Damien Nadé <github@livna.org>
Upstream-commit: 79490a6ad3a2f44c937708c841bc61633e74da77
Component: engine
2016-05-02 16:53:43 +02:00
5a1389f4b1 Make zsh completion work when ps output is custom
When `psFormat` is used in the docker client config json, if the output
is non-standard it breaks some of the completion handling for
containers.

This fixes that by ensuring that calls to `ps` use the default/standard
formatting by calling `docker ps --format 'table'`

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: ba3f8a9fefc9da16dc00cf01f2b1d32ec54ce20d
Component: engine
2016-05-02 09:45:01 -04:00
490a37a62f Add support for reloading daemon configuration through systemd
This adds support for reloading the docker daemon
(SIGHIUP) so that changes in '/etc/docker/daemon.json'
can be loaded at runtime by reloading the service
through systemd ('systemctl reload docker')

Before this change, systemd would output an error
that "reloading" is not supported for the docker
service;

  systemctl reload docker
  Failed to reload docker.service: Job type reload is not applicable for unit docker.service.

After this change, the docker daemon can be reloaded
through 'systemctl reload docker', which reloads
the configuration;

  journalctl -f -u docker.service

  May 02 03:49:20 testing systemd[1]: Reloading Docker Application Container Engine.
  May 02 03:49:20 testing docker[28496]: time="2016-05-02T03:49:20.143964103-04:00" level=info msg="Got signal to reload configuration, reloading from: /etc/docker/daemon.json"
  May 02 03:49:20 testing systemd[1]: Reloaded Docker Application Container Engine.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: f74b856e1ac2805fe48ceb52bc83cd7a3cec870c
Component: engine
2016-05-02 10:27:07 +02:00
236d071954 Add zsh completion for 'docker network ls -f driver'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: d6780c319086379023894c6ae26301bce6b01b98
Component: engine
2016-04-30 13:07:03 +02:00
d380357613 Merge pull request #22319 from thaJeztah/network-driver-filter
Add "driver" filter for network ls
Upstream-commit: 7a5658129740cd8e4345246758aa30fe3c835d10
Component: engine
2016-04-30 10:38:10 +02:00
295ba6c97d Add zsh completion for 'docker network ls -f {id,name,type}'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 8a51f9511cffd8d95dd46fc1b3663a7e7e543949
Component: engine
2016-04-29 22:38:10 +02:00
6e410ce449 Add "driver" filter for network ls
This add a new filter to 'docker network ls'
to allow filtering by driver-name.

Contrary to "ID" and "name" filters, this
filter only supports an *exact* match.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 23e418b6c966a43a463a064053ce0c741b8e5159
Component: engine
2016-04-29 16:22:26 +02:00
a625365923 Merge pull request #22370 from mlaventure/fix-experimental-builder
Allow specifying the apt mirror to use when generating deb packages
Upstream-commit: 717842fbdeeec3e3bd56525e998a2ffcb087b4d0
Component: engine
2016-04-28 16:26:29 -04:00
ebb9e8de8c Allow specifying the apt mirror to use when generating deb packages
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: d0a65a03e9f789b73956e2d30447a385d6531dfe
Component: engine
2016-04-28 13:05:34 -07:00
71b8f4887c Update the binary name in docker-engine-selinux/docker.fc.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: b9135646d6d132e448a4da46effd7889fbf69416
Component: engine
2016-04-27 11:41:21 -04:00
ad49d67f49 centos:7/OL:7 now includes libseccomp 2.2.1
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 1521a41fc578958d0238f95b43c49edab9a65a47
Component: engine
2016-04-26 20:48:26 -04:00
62d05d12a1 Merge pull request #22287 from hqhq/hq_add_blk_check
Add CONFIG_CFQ_GROUP_IOSCHED check
Upstream-commit: 66eb91463a2c2400a4bc059144283509e09e209b
Component: engine
2016-04-25 20:15:31 +08:00
e0fe841732 Add CONFIG_CFQ_GROUP_IOSCHED check
blkio.weight depends on this config.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 192387198d02e3e75377f8fbc06840b9a6dec8bd
Component: engine
2016-04-25 14:08:29 +08:00
09985717bc Merge pull request #22015 from endophage/pkcs11_debs
add pkcs11 build tag to deb and rpm builds
Upstream-commit: 4377a58c1235c1f207a28f8ffb0599d7b3adeedf
Component: engine
2016-04-22 13:29:44 -04:00
ac79d29757 add zsh completion for 'docker {build,create,run} --disable-content-trust'
Signed-off-by: Ke Xu <leonhartx.k@gmail.com>
Upstream-commit: da90fe0218411933d53daac7366ce4353cd5b665
Component: engine
2016-04-21 16:06:09 +09:00
7c4fbf51d2 Add docs about how to extend devicemapper thin pool
Signed-off-by: Chun Chen <ramichen@tencent.com>
Upstream-commit: b21d90c28faaa9f906c4e3b2145ddf661a19e994
Component: engine
2016-04-20 10:49:51 +08:00