Brian Goff
e1f805562a
Merge pull request #19391 from cdauth/systemd_tasks_max
...
Set TasksMax in addition to LimitNPROC in systemd service files
Upstream-commit: 2cd74f99322403ae6de5ee75c05343b3b35a2645
Component: engine
2016-01-18 13:33:07 -05:00
Tianon Gravi
a84ec93f11
Merge pull request #19409 from albers/completion-network-links
...
bash completion for container linking and aliasing
Upstream-commit: 8a4b4f5950dc85dc987dd7363495cbc38bf77972
Component: engine
2016-01-18 08:36:33 -08:00
Harald Albers
4a62754a9e
bash completion for docker network create --internal, --ipam-opt
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 6ae4ffb6e5b82ebef504c5dc547ec97d01e0856f
Component: engine
2016-01-18 07:50:26 -08:00
Harald Albers
e2f01fecd9
bash completion for container linking and aliasing
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 67fe772ca627adf1c0e5937de72e30481068820f
Component: engine
2016-01-18 07:11:19 -08:00
Candid Dauth
b8f7499a3b
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 >
Upstream-commit: 105778343a2e5d510fae1cbdb1b7ab6879e5a028
Component: engine
2016-01-16 18:45:41 +01:00
Brian Goff
a42acfafda
Merge pull request #19386 from sdurrheimer/zsh-completion-network-create-internal
...
Add zsh completion for 'docker network create --internal'
Upstream-commit: 82401a4b13c0581908d46dbc3e7b475c7de48334
Component: engine
2016-01-16 08:04:05 -05:00
Steve Durrheimer
58070250bb
Modify zsh completion for connecting/disconnecting non-running containers to networks
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 0a9508e821384b96979d1dd91acdb67ed83f8e7f
Component: engine
2016-01-16 12:59:20 +01:00
Steve Durrheimer
7f98a9ef4d
Add zsh completion for 'docker network create --internal'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 581a55d54c135b2e92cfb3d16939bea33a242723
Component: engine
2016-01-16 12:53:50 +01:00
Jess Frazelle
d8a8275332
Merge pull request #19169 from Djelibeybi/fix-ol6-build
...
Restoring the RPM build process for Oracle Linux 6
Upstream-commit: b69243e951a9845c3bd3e718452865c2753b7a0c
Component: engine
2016-01-15 16:56:11 -08:00
Phil Estes
170652aa2c
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
Upstream-commit: dd104eb91d6e2eeb92467363d75c762ec303ac84
Component: engine
2016-01-15 16:06:14 -05:00
Tianon Gravi
2365ad5675
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 >
Upstream-commit: 9b2aab3fc85ab1d8cf7479b153e54d5dcceb7886
Component: engine
2016-01-14 13:51:30 -08:00
Harald Albers
f10d08e793
bash completion for --detach-keys
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: b24ded193f7175e7f63e2bb8432b430a6665bfdf
Component: engine
2016-01-14 13:47:20 -08:00
Tibor Vass
2e1c787d5f
Bump Go to version 1.5.3
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 9560d941142b0bd17b0aa51e4d9bfe22354732ec
Component: engine
2016-01-13 17:23:46 -05:00
Tibor Vass
3bf5cbf342
Merge pull request #19279 from tiborvass/rename-authz-to-authorization
...
Rename authz to authorization for greater clarity
Upstream-commit: 612cf0f172948c892d642af3213a012fcf292135
Component: engine
2016-01-13 14:30:18 -05:00
Tibor Vass
460be1e8dd
Rename authz to authorization for greater clarity
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 5c630ea7c3d5e7a24e1c4b2e15506f326706e9bc
Component: engine
2016-01-13 14:15:37 -05:00
Jess Frazelle
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
Harald Albers
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
Tianon Gravi
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
Steve Durrheimer
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
David Calavera
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
Harald Albers
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
Steve Durrheimer
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
Steve Durrheimer
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
Steve Durrheimer
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
Steve Durrheimer
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
Avi Miller
3293844ab5
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 >
Upstream-commit: 28f52bd06a24705bd6958ac505b6b6f36e877547
Component: engine
2016-01-08 08:09:47 +11:00
Arnaud Porterie
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
Harald Albers
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
Vincent Demeester
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
Harald Albers
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
Harald Albers
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
Steve Durrheimer
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
Jess Frazelle
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
Harald Albers
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
Jessica Frazelle
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
Jessica Frazelle
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
David Calavera
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
Jess Frazelle
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
Jessica Frazelle
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
Jess Frazelle
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
Jess Frazelle
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
cristiano balducci
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
Harald Albers
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
Thomas Sjögren
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
Harald Albers
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
David Calavera
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
Harald Albers
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
oyld
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
Sebastiaan van Stijn
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
Vincent Demeester
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