77a575417f
Merge pull request #31833 from tonistiigi/docker-group
...
Fix default socket group regression
Upstream-commit: 0b9b7906afecc7d69ac496c15344643f09307c31
Component: engine
2017-03-14 20:34:42 -07:00
b85681b72c
Merge pull request #31147 from adshmh/30629-print-escaping-hint-on-invalid-interpolation-format
...
docker stack deploy interpolation format error due to not escaping $ now includes a hint
Upstream-commit: 95b46ff68fefdbd9b792768d0ca141589b493cbd
Component: engine
2017-03-14 17:14:09 -07:00
61fa674abb
Merge pull request #31790 from mlaventure/devicecgrouprules-api-swagger
...
Update swagger.yaml and api/version-history.md for DeviceCgrouprules
Upstream-commit: cec9594947c3666162e322252e4e69fbbcea096d
Component: engine
2017-03-14 16:51:09 -07:00
5e15ee9c6f
Fix default socket group regression
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: c7c2cd4e8e9c0fe03e8e9f343867c2fb5568ca1d
Component: engine
2017-03-14 16:09:08 -07:00
b0ff606238
docs: added support for CLI yaml file generation
...
Signed-off-by: French Ben <frenchben@docker.com >
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 5443f0152f77eb983e6475474b02c2e11d975f1c
Component: engine
2017-03-14 16:04:08 -07:00
57e788256f
Add bash completion for network inspect --verbose
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 693a4186122e12b2e530e9f55cbb2656ef469648
Component: engine
2017-03-14 15:37:59 -07:00
cd9fe4f7ac
Merge pull request #31824 from albers/completion-update--service-logs
...
Update bash completion for `docker service logs`
Upstream-commit: f7cfacbfe95212a373a54835aee9686f85953913
Component: engine
2017-03-14 14:44:36 -07:00
156f743ca8
Merge pull request #31686 from AkihiroSuda/fix-defer-it-on-swarm
...
integration-cli-on-swarm: make sure deferred function gets executed before os.Exit()
Upstream-commit: f72404e48dca05c8a42b2c92cdffd72457dc73d1
Component: engine
2017-03-14 14:41:41 -07:00
42ac777ed3
Add mount point to cgroup root when initializing cgroup paths for
...
cpu.rt_runtime
PR https://github.com/docker/docker/pull/23430 introduced a couple more
flags including `--cpu-rt-runtime` to the docker daemon. It appears
recent changes or merge issues may have broken this. It currently does
not take the cgroup mount point into account when determining the cgroup
files to write values to. This breaks docker setting its own
`cpu.rt_runtime` for the daemon. This also means containers aren't able
to set theirs.
Also, the cgroups.FindCgroupMountpointAndRoot returns back a mount point
that includes the cgroup of the currently running container when docker
is run inside a docker container. this breaks the `--cpu-rt-runtime`
flag when running docker in docker. A fix has been placed here, but
potentially could be pulled up into libcontainer if this is a better
place for it.
Signed-off-by: Erik St. Martin <alakriti@gmail.com >
Upstream-commit: 40e075532ab4d01b4ceb36f145b95e2d3a5d951f
Component: engine
2017-03-14 16:18:36 -04:00
6a9291e20f
Add --prune to stack deploy.
...
Add to command line reference.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 644fd804fce63499812259331b0a9f2a4a3ebcc4
Component: engine
2017-03-14 16:09:28 -04:00
258019e01c
Fix environment resolving.
...
Load from env should only happen if the value is unset.
Extract a buildEnvironment function and revert some changes to tests.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: a9c86b63c03fc3557748d7792c11041387cb93d9
Component: engine
2017-03-14 16:00:43 -04:00
52e6564dcd
compose: fix environment interpolation from the client
...
For an environment variable defined in the yaml without value,
the value needs to be propagated from the client, as in Docker Compose.
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: ea43c33330ec9a1e9a9b8a85348c1757fdae65c4
Component: engine
2017-03-14 15:59:40 -04:00
d136f71978
Merge pull request #31809 from vieux/bump_api
...
bump API to 1.28
Upstream-commit: 1a24abe42d1ad08b60c406b4cf95956dbc110ed6
Component: engine
2017-03-14 11:53:52 -07:00
2dc7385741
Merge pull request #31795 from dnephin/compose-file-v3.2
...
Compose file v3.2
Upstream-commit: cd56476f1862ae03cd125779e1d1f9fab293c248
Component: engine
2017-03-14 14:10:24 -04:00
975e2e2d89
Merge pull request #30597 from dnephin/add-expanded-mount-format-to-stack-deploy
...
Add expanded mount format to stack deploy
Upstream-commit: 49376cddab7d2ea28fd08fbbb75522656a72ed09
Component: engine
2017-03-14 17:53:28 +00:00
7f033bf36d
Merge pull request #31586 from aaronlehmann/digest-pin-context
...
cluster: Renew the context after communicating with the registry
Upstream-commit: 08bbd434f55e7468cb4363c60c5533b37875cf03
Component: engine
2017-03-14 09:46:15 -07:00
9aea8ad976
bump API to 1.28
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
Upstream-commit: cd173a603003f3b15f4bae13e2e27b7ee1a46942
Component: engine
2017-03-14 09:32:50 -07:00
1f771756e3
Update bash completion for docker service logs
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 93546c257a21463ebca20a11539d0dda732800d3
Component: engine
2017-03-14 17:28:58 +01:00
713d7a3829
Update swagger.yaml and api/version-history.md for DeviceCgrouprules
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 6e97f11df9fa695ee1739bf55ab7166934746523
Component: engine
2017-03-14 07:24:29 -07:00
402994850c
restrict secret view to node level in controller
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
Upstream-commit: 8392123f303e55902ac42544f0e7e226855592f6
Component: engine
2017-03-14 09:53:02 -04:00
5fe9aafe47
Merge pull request #31500 from dperny/fix-service-logs-cli
...
Add tail and since to service logs
Upstream-commit: 1d4608032d95b846418cdf6a718061d20fed7f48
Component: engine
2017-03-14 14:19:29 +01:00
f2a604d536
Merge pull request #31635 from christopher-gibson/master
...
Fix fish autocompletion with custom ps output
Upstream-commit: 0f212b57e8b4842a8306d74f2c3aaae4bf5376c8
Component: engine
2017-03-14 11:28:59 +01:00
fc09e7ea35
Merge pull request #31791 from Microsoft/jjh/unpause
...
CI cleanup - only unpause if platform supports it
Upstream-commit: 6ea8006a4f4223d0a68dfd6befef30b25a90d71a
Component: engine
2017-03-14 10:58:06 +01:00
9bcce9d144
Merge pull request #31813 from albers/docs-dockerd--no-new-privileges
...
Remove docs for `dockerd --no-new-privileges`
Upstream-commit: d4db198592e3b4500869f5b32187855263078831
Component: engine
2017-03-14 10:09:12 +01:00
8dd6a42039
Remove docs for dockerd --no-new-privileges
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 0a1ace9d2f72f3e3c20e8ddad2407ba7145e3db5
Component: engine
2017-03-14 10:00:14 +01:00
e3702e984d
Add bash completion for topology-aware scheduling
...
- bash completion for `docker service create --placement-pref`
- bash completion for `docker service update --placement-pref-{add,rm}`
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 71aba36d5a9ea8c8d1f5efaaa12864ddcab90fcd
Component: engine
2017-03-14 08:37:05 +01:00
95794e3edc
Merge pull request #31710 from sanimej/drillerrr
...
Add verbose flag to network inspect to show all services & tasks in swarm mode
Upstream-commit: cdf66ba715c573f85338a2b2a432db6cb9a48e6d
Component: engine
2017-03-13 21:12:32 -07:00
63b9d27151
Merge pull request #31793 from mlaventure/update-containerd
...
Update containerd to version 949e6facb77383876aeff8a6944dde66b3089574
Upstream-commit: bba7d8adda69a7e514010487f3dfdd0002cd9bb9
Component: engine
2017-03-13 19:39:58 -07:00
3f4d5e9ab5
Merge pull request #31713 from nishanttotla/better-warnings
...
Improve warnings when image digest pinning fails
Upstream-commit: 764e80e84c8cd72cf7843deda18c07760b5533a9
Component: engine
2017-03-13 17:57:06 -07:00
ff11389227
Enhance network inspect to show all tasks, local & non-local, in swarm mode
...
Signed-off-by: Santhosh Manohar <santhosh@docker.com >
Upstream-commit: 14f76a21db71c5a817cb4d1e27f9940cefd5c820
Component: engine
2017-03-13 17:52:08 -07:00
6e546c094d
Merge pull request #31193 from docbobo/master-aarch64
...
Support for debian-jessie on aarch64
Upstream-commit: 4108d6259a94acc8e6b486fb27e58860dd5b09fc
Component: engine
2017-03-14 00:45:30 +00:00
38cad21bc6
Merge pull request #31672 from dperny/service-logs-formatting
...
Service logs formatting
Upstream-commit: aa733ba8a85a116a1d4a92ac59cddd9e1b4ab8ea
Component: engine
2017-03-13 19:08:55 -04:00
7e6d323f9b
Improve warnings when image digest pinning fails
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com >
Upstream-commit: 44855dff42a4adbf73a4d286e27963da2112f563
Component: engine
2017-03-13 15:16:35 -07:00
b40b9979b1
Merge pull request #31796 from vdemeester/update-docker-credential-helpers-to-v0.5.0
...
Update docker-credential-helpers to v0.5.0
Upstream-commit: 916c6b55b97b8d54f2959f451105a3d725b83ebb
Component: engine
2017-03-13 22:04:21 +00:00
77daab9192
Merge pull request #31767 from mstanleyjones/fix_tables
...
Fix markdown in references for Kramdown
Upstream-commit: f947d823f0b05655d1d6b99920dcc3ac54766a97
Component: engine
2017-03-13 14:13:15 -07:00
379cf92965
Merge pull request #31740 from Microsoft/jjh/privcheck
...
Windows: Balk on --privileged
Upstream-commit: 72f1425ff2e802961135d750207838f81a96a301
Component: engine
2017-03-13 20:35:45 +00:00
af1bbd0867
Add compose file version 3.2
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: e7bf5be18b1a97b6f2b5eb6c6976fe9544589efe
Component: engine
2017-03-13 16:20:42 -04:00
080e3bfe01
Update docker-credential-helpers to v0.5.0
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 9dec486cf6d8e85bb5737b75e8520bb9433ec043
Component: engine
2017-03-13 21:08:41 +01:00
0bac9da8c9
Refactor container run cli command.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 6a21a127ab5437f12731576653c751a9758aabb8
Component: engine
2017-03-13 16:05:51 -04:00
7928809ca1
Merge pull request #31752 from Microsoft/jjh/stringer
...
Fix stringer in Result (pkg\testutil\cmd)
Upstream-commit: 75f1bf0e865fddfa68a61ef4f0857ce235c1773b
Component: engine
2017-03-13 20:33:56 +01:00
b2d648703b
Move endpoint_mode under deploy and add it to the schema.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 751552c65f244917ce74d09d0f528308a6b35755
Component: engine
2017-03-13 15:00:56 -04:00
a8bf637055
support both endpoint modes in stack
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 96790657288699146f579382f25d932c87125e86
Component: engine
2017-03-13 15:00:49 -04:00
2cbeb808e9
Update containerd to version 949e6facb77383876aeff8a6944dde66b3089574
...
This fixes a regression where debug logs where hidden in debug mode.
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 4c95db877c751ab6500ae7e6af7829dbaafaa8fd
Component: engine
2017-03-13 11:44:40 -07:00
823d86f98c
Windows: CI Only unpause on Hyper-V containers
...
Signed-off-by: John Howard (VM) <jhoward@ntdev.microsoft.com >
Upstream-commit: 64615c9aa8e21bf9cd39e6ad4496c9e9c1bce55f
Component: engine
2017-03-13 11:24:25 -07:00
3d6e27c904
Merge pull request #31784 from albers/fix-completion-service-update-constraint
...
Fix bash completion for service constraints
Upstream-commit: 47cd4bf526723100bdbbd5a6bb983cdd668882e9
Component: engine
2017-03-13 10:42:22 -07:00
1b786f2dda
Merge pull request #31674 from dperny/service-logs-err-on-tty
...
Error on attempting services logs on TTY container
Upstream-commit: 47615d9871510cdad0f894f8bc9e82c1a9873fa5
Component: engine
2017-03-13 10:17:33 -07:00
067b63e8af
Merge pull request #31579 from ijc25/cpuacct
...
Correct CPU usage calculation in presence of offline CPUs and newer Linux
Upstream-commit: 2c6a1e1878975550cd2e7a98494773903e39eaf7
Component: engine
2017-03-13 16:32:18 +00:00
4be4b8f026
Windows: Balk on --privileged
...
Signed-off-by: John Howard (VM) <jhoward@ntdev.microsoft.com >
Upstream-commit: 4af3389d43d93f50d9b4fa217de148ec45abf8cb
Component: engine
2017-03-13 08:56:17 -07:00
4f03bdf687
Fix bash completion for service constraints
...
- Remove bash completion for `service update --constraint`
- Add bash completion for `service update --constraint-{add,rm}`
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: d1340b9440461ed5637ad0026e298729fec79d96
Component: engine
2017-03-13 16:52:38 +01:00
97318c100a
Fix stringer in Result (pkg\testutil\cmd)
...
Signed-off-by: John Howard (VM) <jhoward@ntdev.microsoft.com >
Upstream-commit: f577131d3bc49860f615c458e44fc035b3708415
Component: engine
2017-03-13 08:40:31 -07:00
Victor Vieux
Anusha Ragunathan
Tonis Tiigi
French Ben
Harald Albers
Erik St. Martin
Daniel Nephin
Akihiro Suda
Daniel Nephin
Justin Cormack
Kenfe-Mickael Laventure
Evan Hazlett
Vincent Demeester
Sebastiaan van Stijn
Madhu Venugopal
Santhosh Manohar
Brian Goff
Nishant Totla
Tibor Vass
allencloud
John Howard (VM)
Aaron Lehmann