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
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
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
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
85b9c9f55a
Merge pull request #31712 from rcjsuen/patch-2
...
Fix directive example to match description
Upstream-commit: 4744b01d3bfcb5cfe320bb239894cb6b67165245
Component: engine
2017-03-13 16:34:29 +01:00
9af013f196
Merge pull request #31682 from albers/completion-service-create--stop-signal
...
Add bash completion for `service create|update --stop-signal`
Upstream-commit: 9c498eae4d5cbddf9b59a9d0eb3096f115704fc7
Component: engine
2017-03-13 16:22:27 +01:00
2a2b0da00b
Merge pull request #31773 from cyphar/apparmor-fix-ensure-exec
...
daemon: also ensureDefaultApparmorProfile in exec path
Upstream-commit: e311c1401982cde966e8cc8358efbfa37e2cae37
Component: engine
2017-03-13 16:15:49 +01:00
dbf0cb1010
Merge pull request #30788 from ripcurld0/hide_win_opts
...
Hide command options that are related to Windows
Upstream-commit: be453c5a13f1945f1deb12308ba0600e72284365
Component: engine
2017-03-13 16:15:29 +01:00
14b850d8cb
Merge pull request #30648 from allencloud/do-not-fail-fast-when-inspect
...
do not fail fast when executing inspect command
Upstream-commit: 562d2dc978c6489a776f9550416bef9e111baefd
Component: engine
2017-03-13 16:04:04 +01:00
dc089ee246
Merge pull request #31503 from Microsoft/jjh/cleanuphcsonrestore
...
Windows: Cleanup HCS on restore
Upstream-commit: 2fca6526d6c9dfdc714f3a1b8ee880fbbab7580e
Component: engine
2017-03-13 13:43:35 +01:00
d93297a0a4
Merge pull request #31047 from yallop/cli-v-state
...
Flags for specifying bind mount consistency
Upstream-commit: 7f6e7088b7ef083a57b11e3837119019de73487b
Component: engine
2017-03-13 11:36:10 +01:00
60e7990876
Vendor libnetwork for network inspect --verbose changes
...
Signed-off-by: Santhosh Manohar <santhosh@docker.com >
Upstream-commit: 67086764647b1c16553d1dd057f0e1d2c775c625
Component: engine
2017-03-12 21:23:21 -07:00
c2b7c22146
daemon: also ensureDefaultApparmorProfile in exec path
...
When 567ef8e7858c ("daemon: switch to 'ensure' workflow for AppArmor
profiles") was merged, it didn't correctly handle the exec path if
AppArmor profiles were deleted. Fix this by duplicating the
ensureDefaultApparmorProfile code in the exec code.
Fixes: 567ef8e7858c ("daemon: switch to 'ensure' workflow for AppArmor profiles")
Signed-off-by: Aleksa Sarai <asarai@suse.de >
Upstream-commit: 790a81ea9acce318d0e037771c253951b874140b
Component: engine
2017-03-13 15:20:05 +11:00
8d8d9c4abd
Fix markdown in references for Kramdown
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: 0ce13eb0d343e81db7006fd9c3e0c95ee1c3925c
Component: engine
2017-03-12 12:01:06 -07:00
6126368ef5
Merge pull request #31736 from mlaventure/update-runc
...
Update runc to 9c2d8d184e5da67c95d601382adf14862e4f2228
Upstream-commit: 613334eb5073e3b332d4f23babc5d4847ef66f59
Component: engine
2017-03-12 10:52:32 +01:00
da38e7fbf1
Hide command options that are related to Windows
...
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com >
Upstream-commit: 7199522ea2e77c77bf931474eca92aa502ce0031
Component: engine
2017-03-12 08:47:17 +02:00
da0af5d2c9
Merge pull request #31176 from adshmh/29662-stack-deploy-error-if-external-combined-with-other-volume-options
...
stack deploy exits with error if both 'external' and other options are specified for a volume
Upstream-commit: 8b02a15d527edeaae9135c3f6d23948bf95efb55
Component: engine
2017-03-11 01:59:43 +01:00
6079289459
Merge pull request #30047 from duglin/distError
...
Add the mediaType to the error
Upstream-commit: e10f9db26d7db8396d6f70419ecd1aa081190069
Component: engine
2017-03-10 16:44:49 -08:00
8d7175a239
Merge pull request #31743 from aaronlehmann/vendor-swarmkit-0e2d9eb
...
Vendor swarmkit 0e2d9eb
Upstream-commit: 43f8bce876c48d90fafd5fe9f9f223300bd06904
Component: engine
2017-03-10 16:33:15 -08:00
218618324e
Error on attempting service logs on TTY container
...
Right now getting logs from a service with an attached TTY does not
work. The behavior was undefined and caused the command to hang and
strange messages to occur in the daemon logs.
This returns errors, both deep in the swarmkit adapter (to guard against
undefined behavior, which is Bad) and in the daemon (to tell users that
the thing they're asking for is not possible).
Signed-off-by: Drew Erny <drew.erny@docker.com >
Upstream-commit: 37ae1ef0ffcf8605daeaf41440da774370377a6d
Component: engine
2017-03-10 14:48:56 -08:00
a30a450bff
Update runc to 9c2d8d184e5da67c95d601382adf14862e4f2228
...
This fix a conflict with systemd daemon-reload (see
https://github.com/opencontainers/runc/pull/1344 )
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 6cea6d40fce0122e50b8852ff6fd6d5b9856b182
Component: engine
2017-03-10 14:07:56 -08:00
fb0a10df03
Merge pull request #31739 from mlaventure/update-containerd
...
Update containerd to 9f68f96b8c0746e254b52bc1defcf7cc0c1a62eb
Upstream-commit: b6c5b4730be86d7b27e2649c7889230f7dfdedb8
Component: engine
2017-03-10 14:04:53 -08:00
281516f8c3
Vendor swarmkit 0e2d9eb
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 79bf23845b7829bf68b9dda47af46886b274ac78
Component: engine
2017-03-10 11:15:44 -08:00
973cfaf93a
Merge pull request #31679 from allencloud/put-secret-in-swarm-thing
...
move secret into swarm thing in swagger
Upstream-commit: c29c2a9a700fc74e9f099136ed7c0fa92b8b4afc
Component: engine
2017-03-10 13:50:25 -05:00
e65dda6e42
Merge pull request #31532 from aboch/vnd
...
Vendoring libnetwork @1a01921
Upstream-commit: 05e7f956bdf52a2a42c39d9d0b36169ec60b5b3a
Component: engine
2017-03-10 12:55:19 -05:00
c920474a6f
Update containerd to 9f68f96b8c0746e254b52bc1defcf7cc0c1a62eb
...
This include ensure that containerd GRPC healthcheck service is
register before the restore process is done as this can take a while.
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 07ad8c66400775ed1a51179be0b9137f051c4a0b
Component: engine
2017-03-10 09:16:12 -08:00
da62433767
Merge pull request #31665 from mlaventure/aufs-lsof-oob
...
Remove aufs debugEBusy()
Upstream-commit: 2c2983cd8e58630889712c40a614714ce0c68efc
Component: engine
2017-03-10 11:51:14 -05:00
71c1fbfb02
Merge pull request #31703 from jen20/solaris-cflags
...
pkg/system: Set appropriate CFLAGS on Solaris
Upstream-commit: 400d154737cd026f29269bb381390b3d454ba6bb
Component: engine
2017-03-10 14:34:53 +00:00
b165536c8d
Merge pull request #31730 from thaJeztah/cherry-autoremove-it
...
Add integration tests for client- and daemon-side auto-remove
Upstream-commit: 61f7f0fc9e68b804c1ea8bd49d3eb708b68ec461
Component: engine
2017-03-10 15:00:14 +01:00
