7e15010c90
Merge pull request #19287 from tianon/check-config-assoc-array
...
Update check-config.sh to use "case" instead of an associative array
Upstream-commit: 22f4dad3d7d3e5a79529bfd763bcefd8af94ba52
Component: engine
2016-01-13 08:38:10 -08:00
29bf1857fc
bash completion for connecting non-running containers to networks
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 40f73c7c8e577baa795b799e0390c89cc0488d45
Component: engine
2016-01-13 10:32:23 +01:00
cc56e418d7
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 >
Upstream-commit: 5c161f4e1a7e25abedefb6d40dfe7f355077773a
Component: engine
2016-01-12 20:57:56 -08:00
25bc7d7874
Add zsh completion for 'docker daemon --userns-remap'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 54bea86b03b0191fd65d5e25ee0f677ffc2baffb
Component: engine
2016-01-12 22:38:32 +01:00
e06b7c48a9
Merge pull request #19208 from sdurrheimer/zsh-completion-update_isolation_shm-size_memory_reservation
...
Zsh completion for 'docker update' + common options refactoring
Upstream-commit: 1a7d40c69221fe39d7be9976398ade678627b9d6
Component: engine
2016-01-11 11:36:55 -08:00
491c316b7d
bash completion for docker {build,create,run} --shm-size
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 3f6b0f4c7c87f8f8f01e67ea3750015e9dcab9bf
Component: engine
2016-01-09 09:27:45 -08:00
3ebca99469
Add zsh completion for 'docker {build,create,run} --isolation'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: d14eba774d4a5e51f1208a4aa5e9dad44966d5c9
Component: engine
2016-01-09 14:48:55 +01:00
6037d11431
Add zsh completion for 'docker {build,create,run} --shm-size
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 01e6bd3c3e79c77c35a443c5eea9a94fbb9861a3
Component: engine
2016-01-09 14:46:06 +01:00
5a1f73e461
Add zsh completion for 'docker {create,run,update} --memory-reservation'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 3a8fb8de4f10024cb4968c3e25c417080ac17576
Component: engine
2016-01-09 14:40:37 +01:00
524263a6b2
Add zsh completion for 'docker update' + refactoring of common options between 'build', 'create', 'run', 'update'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 8a95f8827231164acc3971cab7c0d0325d6ef31d
Component: engine
2016-01-09 14:38:22 +01:00
8a5a35e6dc
Merge pull request #16704 from manchoz/16695_manchoz_archarm
...
Add support for Arch Linux ARM base images generation (#16695 ).
Upstream-commit: 837de957177363947d5f303d82c972f304d8096b
Component: engine
2016-01-06 11:16:40 -08:00
3f5eac3ef8
bash completion for docker update
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 97f84b5dc1d5326c4c56e5057a8c330725247b9d
Component: engine
2016-01-06 10:20:33 -08:00
6dbbe91963
Merge pull request #19097 from albers/completion-daemon--cgroup-parent
...
bash completion for `docker daemon --cgroup-parent`
Upstream-commit: 4f8d794c46109547ecbfaf60e57208af7094722e
Component: engine
2016-01-05 19:56:51 +01:00
8e3f31a35d
bash completion for --isolation
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 9e624d32500e8e1894558e6dedccad5539345ed0
Component: engine
2016-01-05 09:59:29 -08:00
31535b0034
bash completion for docker daemon --cgroup-parent
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: ce2cbde8414380bc6e1e3040acb2c1c7b4c157a8
Component: engine
2016-01-05 09:29:37 -08:00
4ef509bcec
Add zsh completion for 'docker daemon --cgroup-parent'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: b5f6605ca20918c9462aad891d4ca2d541d5949e
Component: engine
2016-01-05 07:41:34 +01:00
65930d6983
Merge pull request #19002 from jfrazelle/update-test-images
...
cleanup test images
Upstream-commit: fa57eedff409edb7a4ad926b365213a944a97954
Component: engine
2016-01-04 10:24:30 -08:00
c4ab65d87a
Compute plugin list in bash completion for docker daemon --authz-plugin
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 2134d38935e99a0fa750870e1a509eb2515d104f
Component: engine
2016-01-02 14:53:10 -08:00
902a67f4ef
add more seccomp profile tests
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 327421d1df557e156b29d14359a2bfdc59cfb46f
Component: engine
2015-12-30 17:30:44 -08:00
baf6d036eb
fix libseccomp where version < 2.2.1
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: ae54e39c80b8cc071143bfcb99bf80e3b0a0ec93
Component: engine
2015-12-28 21:30:49 -08:00
f07bb00458
Merge pull request #18780 from jfrazelle/seccomp-default
...
set default seccomp profile
Upstream-commit: 78ce43bad85fdf97d7c836315e46b531901c8ae7
Component: engine
2015-12-28 16:46:30 -08:00
e2082c5e38
Merge pull request #18937 from cbalducci/patch-1
...
[mkimage-alpine.sh] Additional repo and container cleanup
Upstream-commit: 8b68853ef5015f5dea9fb5a06e6715d0876a1eef
Component: engine
2015-12-28 12:51:31 -08:00
aac8048807
add default seccomp profile tests
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: a48fe6238494547f392b06adf9d48944b4dd8ac3
Component: engine
2015-12-28 10:26:48 -08:00
1ce165db7f
Merge pull request #18923 from albers/completion-network-ls--filter
...
bash completion for `docker network ls --filter`
Upstream-commit: 00362f8ea28a1ae04be66372ccee55d80c4bb11c
Component: engine
2015-12-28 10:16:17 -08:00
e1e0c90deb
Merge pull request #18807 from FlorinAsavoaie/master
...
New features in mkimage-yum.sh script
Upstream-commit: 206046f0baed3476ed83211837202a1d7ce7ee69
Component: engine
2015-12-28 09:09:33 -08:00
b147f556c5
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 >
Upstream-commit: 7fa40ef513aedffefce9237a7db30340be0b6696
Component: engine
2015-12-28 14:11:56 +01:00
e18180f247
bash completion for docker network ls --filter
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: f2ba1e4d80c6c811f2c0a6c905f5590d65e70812
Component: engine
2015-12-27 09:28:19 -08:00
2db5ffe958
add /bin/tar to apparmor profile
...
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com >
Upstream-commit: 602498d1b093e4d066e8434aa1cbc041999d44ea
Component: engine
2015-12-23 18:11:16 +01:00
d09f09929b
remove --format from bash completion for docker network rm
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: f03695efc100a8f35e73bf51fc694e370e019d25
Component: engine
2015-12-22 11:35:41 -08:00
8da2c14d42
Merge pull request #18847 from albers/completion-rename-functions
...
Better function names in bash completion
Upstream-commit: 5b913de5e68690c79563feb9a5082d5915371dcf
Component: engine
2015-12-22 08:43:08 -08:00
2d930c1a34
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 >
Upstream-commit: e715daab3d531725dc4faef2265337d133bd16bc
Component: engine
2015-12-22 13:38:02 +01:00
02f28288ea
Fix syntax error in init script
...
Signed-off-by: oyld <oyld0210@163.com >
Upstream-commit: bbbc01b86edf9a5676ad735d008097942e0a93ac
Component: engine
2015-12-22 04:00:00 -08:00
161c03c6c1
Merge pull request #15879 from Mashimiao/add-support-blkio_throtte_iops
...
Add support for blkio read/write iops device
Upstream-commit: 312c82677bdc86d50b483d642ad8c61f1c840c55
Component: engine
2015-12-21 23:45:18 +01:00
a9aa983363
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
Upstream-commit: eff810aed688879f67a3730c41d9adce4637470f
Component: engine
2015-12-21 22:02:18 +01:00
f15d9f32b3
Merge pull request #18828 from albers/completion-plugins
...
Use computed plugin lists in bash completion
Upstream-commit: 88c4d4a94306f6cd6e415eb0ddd887f3fabe8a0e
Component: engine
2015-12-21 09:57:48 -08:00
306ef7b263
Merge pull request #17692 from vdemeester/images-format
...
Add --format support to images command
Upstream-commit: 42460b6772323552bfb58ae703124145ffd8a56b
Component: engine
2015-12-21 09:57:29 -08:00
3e4663395d
Use computed plugin lists in bash completion
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 2033c09705dc14ea32a23a9fa78d5b7d0cac1229
Component: engine
2015-12-21 18:30:23 +01:00
f41d29a49b
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 >
Upstream-commit: 34a3c3cacf2fd827f13a5e37541acff1409658c4
Component: engine
2015-12-21 17:38:07 +01:00
1c5df6581b
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 >
Upstream-commit: 60b4db7eb17f4eb509be4a4968364ada2075d60c
Component: engine
2015-12-21 16:38:50 +02:00
a04e1f9592
Add support for blkio read/write iops device
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
Upstream-commit: 843084b08b521a70baf9284ec4e23e941ab38367
Component: engine
2015-12-21 09:14:49 +08:00
d095d83f03
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 >
Upstream-commit: 325b1f35ae7419cd7454800c8eda4dfaca1d9a77
Component: engine
2015-12-20 16:00:53 +01:00
11e1d2a63a
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 >
Upstream-commit: c8badcbd26535ff6763c724328debb1282fccb82
Component: engine
2015-12-20 14:20:30 +02:00
8d399a7fd9
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 >
Upstream-commit: a08c955e30d6790d1f69483d5e33e2a81a08b100
Component: engine
2015-12-20 00:42:17 +01:00
77ce2d3289
remove oracle linux 6 for time being
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 7ddf4214a666c3182acc031cec02fc99c877e98b
Component: engine
2015-12-15 16:34:41 -08:00
dde4bcd6f4
bash completion for docker daemon --authz-plugin
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 069fe81fa602e7d8af98e2b67b761a62526f014a
Component: engine
2015-12-14 13:25:45 -08:00
a0ef20d025
Fix small missing equal sign for 'docker daemon --cluster-store-opt'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 4ba173630ad2b7a5fc59df280617a1bfa1dda323
Component: engine
2015-12-14 21:20:49 +01:00
0d312f9927
Add zsh completion for 'docker daemon --authz-plugin'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 76844d786bea2e435d25f150044fa242206ce364
Component: engine
2015-12-14 21:16:54 +01:00
c540865248
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 >
Upstream-commit: 824ae856325b53d4c84bd000713f63720d79b67a
Component: engine
2015-12-13 19:48:40 +01:00
3c4fcf6b7a
Fix typos found across repository
...
Signed-off-by: Justas Brazauskas <brazauskasjustas@gmail.com >
Upstream-commit: 927b334ebfc786276a039e45ec097e71bf9a104c
Component: engine
2015-12-13 18:04:12 +02:00
96b1d45a1b
Merge pull request #18242 from jfrazelle/i-have-no-idea
...
Remove ipc rule in docker-engine apparmor profile
Upstream-commit: cd648dce3adf0f15059eb848d3140d5c7b9f350f
Component: engine
2015-12-11 11:23:41 +01:00
