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
1b58e69a36
add pkcs11 build tag to deb and rpm builds
...
Signed-off-by: David Lawrence <david.lawrence@docker.com > (github: endophage)
Upstream-commit: 829d1883dccc8000a6781bc074fd16afe2833841
Component: engine
2016-04-13 17:55:50 -07:00
d823c21aaa
Bump Go version to 1.5.4/1.6.1 (security fix) ( #21978 )
...
Go 1.6.1 is for ppc64le only.
https://groups.google.com/forum/#!msg/golang-announce/9eqIHqaWvck/kXsfO0ogLAAJ
Dockerfile.armhf cannot currently be updated.
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 7268eb97bc208f4cdf7c9119da0cfa2c9ed558a4
Component: engine
2016-04-13 11:22:48 -07:00
3b52ebb9ff
Add support for setting sysctls
...
This patch will allow users to specify namespace specific "kernel parameters"
for running inside of a container.
Signed-off-by: Dan Walsh <dwalsh@redhat.com >
Upstream-commit: 9caf7aeefd23263a209c26c8439d26c147972d81
Component: engine
2016-04-12 13:37:31 -04:00
385a33a1f9
Add "VXLAN" to check-config.sh
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: c082dad637f2b7ee07a284143566746c98bf1211
Component: engine
2016-04-11 16:42:53 -07:00
22b918f431
Add zsh completion for 'docker volume ls -f {dangling,driver,name}'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 7ad5438555c9fbe5dc3b82f993db73862974280a
Component: engine
2016-04-10 12:52:33 +02:00
b51f29d979
Add zsh completion for '--log-opt syslog-format=rfc5424micro'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 553435499670a0a2408ace95a5f6b19d4737a648
Component: engine
2016-04-10 11:11:12 +02:00
f17ace9c5a
Add zsh completion for '--log-opt syslog-format'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 6e14ebd030ac8803438a183d5135100320caa035
Component: engine
2016-04-09 17:34:46 +02:00
6787b6d232
Merge pull request #21884 from albers/completion-volume-ls-filter
...
bash completion for `docker volume ls -f {driver,name}`
Upstream-commit: f832183e33a690e297bd6dacf7a9cd812025daac
Component: engine
2016-04-08 14:33:09 -07:00
c564a9ec27
bash completion for docker volume ls -f {driver,name}
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 3cf856ce0cfa2d619515ea3f98cf559660e24f1e
Component: engine
2016-04-08 13:45:44 +02:00
85a76c64a2
bash completion for --log-opt syslog-format
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 472030e9cc3f3f80824eaa9f32e656f17801ec5b
Component: engine
2016-04-08 13:19:25 +02:00
fdeeda1dbd
Merge pull request #21645 from albers/completion-history--human
...
bash completion for `docker history --human`
Upstream-commit: 4745656e189de7f5ca2985c6c8c00392c458ad53
Component: engine
2016-03-30 12:19:47 +02:00
9eb1caaca3
Merge pull request #21491 from pcarrier/pcarrier/wtf
...
docker.service: don't limit tasks
Upstream-commit: 2f35c6b3fb4aad381ac3e47b17aef900600d7784
Component: engine
2016-03-30 11:08:15 +02:00
31defe9bca
bash completion for docker history --human
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: a2dbf7626c9950aab5049f0e485e053232be1e5f
Component: engine
2016-03-29 21:56:24 -07:00
