Commit Graph
36884 Commits
Author SHA1 Message Date
Santhosh Manohar acc4901d56 Enhance network inspect to show all tasks, local & non-local, in swarm mode
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
Upstream-commit: 6c7da0ca57
Component: cli
2017-03-13 17:52:08 -07:00
Santhosh Manohar 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
Justin Cormack 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
Brian Goff 15bb8a00b0 Merge pull request #31672 from dperny/service-logs-formatting
Service logs formatting
Upstream-commit: 8b3bfc15c3
Component: cli
2017-03-13 19:08:55 -04:00
Brian Goff 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
Nishant Totla 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
Justin Cormack 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
Tibor Vass 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
Justin Cormack 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
Daniel Nephin 6f96d531a0 Add compose file version 3.2
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 2e9b15143a
Component: cli
2017-03-13 16:20:42 -04:00
Daniel Nephin 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
Vincent Demeester 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
Daniel Nephin 29b6bbfa5e Refactor container run cli command.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 4e388c22d3
Component: cli
2017-03-13 16:05:51 -04:00
Daniel Nephin 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
Sebastiaan van Stijn 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
Daniel Nephin 74ffacfbac Move endpoint_mode under deploy and add it to the schema.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 33bfb1e5e5
Component: cli
2017-03-13 15:00:56 -04:00
Daniel Nephin 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
allencloud a4dea23f9c support both endpoint modes in stack
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: cd1cde6e77
Component: cli
2017-03-13 15:00:49 -04:00
allencloud 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
Kenfe-Mickael Laventure 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
John Howard (VM) 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
Aaron Lehmann 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
Aaron Lehmann 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
Justin Cormack fe5268e5c2 Merge pull request #31579 from ijc25/cpuacct
Correct CPU usage calculation in presence of offline CPUs and newer Linux
Upstream-commit: b786563826
Component: cli
2017-03-13 16:32:18 +00:00
Justin Cormack 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
John Howard (VM) 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
Harald Albers 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
John Howard (VM) 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
Vincent Demeester 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
Vincent Demeester 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
Vincent Demeester 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
Vincent Demeester 69b02a7f96 Merge pull request #30788 from ripcurld0/hide_win_opts
Hide command options that are related to Windows
Upstream-commit: 278e4ccdc5
Component: cli
2017-03-13 16:15:29 +01:00
Vincent Demeester 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
Sebastiaan van Stijn c0c565ca20 Merge pull request #30648 from allencloud/do-not-fail-fast-when-inspect
do not fail fast when executing inspect command
Upstream-commit: be1855fac4
Component: cli
2017-03-13 16:04:04 +01:00
Sebastiaan van Stijn 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
Vincent Demeester 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
Sebastiaan van Stijn 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
erxian 302e9828e2 refine docs to describe experimental feature docker build --squash
Signed-off-by: erxian <evelynhsu21@gmail.com>
Upstream-commit: 4bcb11449633a88ff9458126d417b8ac1a72a10b
Component: engine
2017-03-13 16:19:15 +08:00
Santhosh Manohar 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
Aleksa Sarai 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
Misty Stanley-Jones 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
Vincent Demeester 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
Boaz Shuster 1efe06c1d3 Hide command options that are related to Windows
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
Upstream-commit: e398a78466
Component: cli
2017-03-12 08:47:17 +02:00
Boaz Shuster 1029e1dfc8 Hide command options that are related to Windows
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
Upstream-commit: 818c54a2ca
Component: cli
2017-03-12 08:47:17 +02:00
Boaz Shuster 0069d4e4ab Hide command options that are related to Windows
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
Upstream-commit: c7dd91faf5
Component: cli
2017-03-12 08:47:17 +02:00
Boaz Shuster 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
Jeremy Chambers a3d2ba14fc Implements --format option for docker history command by creating a formatter
Signed-off-by: Jeremy Chambers <jeremy@thehipbot.com>

Adds to history documentation for --format

Signed-off-by: Jeremy Chambers <jeremy@thehipbot.com>

Adds MarshalJSON to historyContext for {{json .}} format

Signed-off-by: Jeremy Chambers <jeremy@thehipbot.com>

Adds back the --human option to history command

Signed-off-by: Jeremy Chambers <jeremy@thehipbot.com>

Cleans up formatter around --human option for history, Adds integration test for --format option of history

Signed-off-by: Jeremy Chambers <jeremy@thehipbot.com>

Adds test for history formatter checking full table results, Runs go fmt on touched files

Signed-off-by: Jeremy Chambers <jeremy@thehipbot.com>

Fixes lint errors in formatter/history

Signed-off-by: Jeremy Chambers <jeremy@thehipbot.com>

Runs go fmt on cli/command/formatter/history.go

Signed-off-by: Jeremy Chambers <jeremy@thehipbot.com>

sRemoves integration test for --format option of history

Merges Created and CreatedSince in docker history formatter, Updates docs and tests
Upstream-commit: 371839ee5c
Component: cli
2017-03-11 13:54:16 -06:00
Jeremy Chambers 77bcd83cef Implements --format option for docker history command by creating a formatter
Signed-off-by: Jeremy Chambers <jeremy@thehipbot.com>

Adds to history documentation for --format

Signed-off-by: Jeremy Chambers <jeremy@thehipbot.com>

Adds MarshalJSON to historyContext for {{json .}} format

Signed-off-by: Jeremy Chambers <jeremy@thehipbot.com>

Adds back the --human option to history command

Signed-off-by: Jeremy Chambers <jeremy@thehipbot.com>

Cleans up formatter around --human option for history, Adds integration test for --format option of history

Signed-off-by: Jeremy Chambers <jeremy@thehipbot.com>

Adds test for history formatter checking full table results, Runs go fmt on touched files

Signed-off-by: Jeremy Chambers <jeremy@thehipbot.com>

Fixes lint errors in formatter/history

Signed-off-by: Jeremy Chambers <jeremy@thehipbot.com>

Runs go fmt on cli/command/formatter/history.go

Signed-off-by: Jeremy Chambers <jeremy@thehipbot.com>

sRemoves integration test for --format option of history

Merges Created and CreatedSince in docker history formatter, Updates docs and tests
Upstream-commit: 6bc1f345af77fcf8f1f34b66ae51c314cc63401e
Component: engine
2017-03-11 13:54:16 -06:00
John Howard ee2890e0a1 Avoid TestExecWindowsOpenHandles timing out
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: f8821202c649a19cbec063399174f03c3f66527c
Component: engine
2017-03-10 18:46:01 -08:00
Sebastiaan van Stijn 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