9fcbef44d7
Fix problems with wrapped errors in logrus
...
This vendors a fork of logrus with fixes to deal with errors generated
by the github.com/pkg/errors package. Without these fixes, the errors
are mishandled when passed to WithError:
- When printing to a terminal (colors enabled), stack traces are
included in the error fields on a log line.
- When printing to a file (or with colors disabled), the error value is
missing entirely.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 738131faae42760957abdaa5a64648ed481eee71
Component: engine
2016-10-18 17:14:59 -07:00
b2f5d14643
Merge pull request #26421 from aaronlehmann/update-thresholds-rollbacks
...
Service update failure thresholds and rollback
Upstream-commit: 3b0660da30a23b86a2f29f1ecf3ded52ab7fe577
Component: engine
2016-10-18 15:26:24 -07:00
196b5a3aee
Merge pull request #27492 from albers/completion-run--stop-timeout
...
Add bash completion for `docker {run,create} --stop-timeout`
Upstream-commit: 701cd7996f18914176e44c90032488dd5e42f136
Component: engine
2016-10-18 17:22:47 -04:00
b2afb8eb0f
Merge pull request #27348 from albers/completion-containers
...
Improve bash completion of containers
Upstream-commit: f8031148337362ef4946f174695eb1077b4e3b72
Component: engine
2016-10-18 13:31:47 -07:00
f2f2348179
Merge pull request #27235 from albers/completion-networks
...
Align bash completion of networks to completion of nodes and services
Upstream-commit: b17107a84a8fb13ece3a87c9abe08d278c8e653a
Component: engine
2016-10-18 13:30:01 -07:00
21157ba472
Merge pull request #27436 from YuPengZTE/devFirst
...
The first letter should be small in error of remote.go
Upstream-commit: 462cb3855dcb3bf14214c23a9271ceb63b97ea67
Component: engine
2016-10-18 12:49:04 -07:00
136f5c6e75
Merge pull request #27474 from tagomoris/identify-fluentd-driver-stops-after-restarts
...
Update fluent-logger-golang to v1.2.1
Upstream-commit: 329f272fd55c9c9c335eef354ab4ec7b09a5c727
Component: engine
2016-10-18 12:47:13 -07:00
d85a4563ef
Merge pull request #27483 from YuPengZTE/devFixLink
...
Fix the typo of link in devmapper
Upstream-commit: 32156e17584782ab7d08f37ec402c0d17bb2cd92
Component: engine
2016-10-18 12:45:31 -07:00
36ad4af546
Merge pull request #27489 from caarlos0/cleanup-vendor
...
cleaning up more stuff in vendor
Upstream-commit: 34e4c5c59fc2d8168cb846cb26c649804d29db1d
Component: engine
2016-10-18 12:44:57 -07:00
d684678466
Merge pull request #27239 from albers/completion-volumes
...
Align bash completion of volumes to completion of nodes and services
Upstream-commit: 29cc38da53df8f4fea0c22ba77d3c6e458e1ccca
Component: engine
2016-10-18 12:27:59 -07:00
c0eebabe70
Service update failure thresholds and rollback
...
This adds support for two enhancements to swarm service rolling updates:
- Failure thresholds: In Docker 1.12, a service update could be set up
to either pause or continue after a single failure occurs. This adds
an --update-max-failure-ratio flag that controls how many tasks need to
fail to update for the update as a whole to be considered a failure. A
counterpart flag, --update-monitor, controls how long to monitor each
task for a failure after starting it during the update.
- Rollback flag: service update --rollback reverts the service to its
previous version. If a service update encounters task failures, or
fails to function properly for some other reason, the user can roll back
the update.
SwarmKit also has the ability to roll back updates automatically after
hitting the failure thresholds, but we've decided not to expose this in
the Docker API/CLI for now, favoring a workflow where the decision to
roll back is always made by an admin. Depending on user feedback, we may
add a "rollback" option to --update-failure-action in the future.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 6d4b527699b3e95d21d79f6b327252a6cdaca5b0
Component: engine
2016-10-18 10:09:50 -07:00
8fcdc8e325
API changes for service rollback and failure threshold
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 67bebd6d819ef46c78092441732fe2afde04fd5b
Component: engine
2016-10-18 10:09:30 -07:00
370f79baaa
Merge pull request #27435 from yuexiao-wang/fix-link
...
Fix a link for feature deprecation policy
Upstream-commit: 668189e7f007dcf276f94453504ee1d7a187ba7f
Component: engine
2016-10-18 10:04:42 -07:00
a74270e76f
Merge pull request #27472 from dnephin/move-graphdriver-quota
...
Move graphdriver quota
Upstream-commit: f5c21faf88f80778e98aa90ad328af19d27f289e
Component: engine
2016-10-18 09:09:09 -07:00
4a60903d29
Merge pull request #27463 from Microsoft/jjh/runservice
...
Windows: Mark run-service flag as hidden
Upstream-commit: 15ea28f6db7339f8a44078f3ef70484c96eebce7
Component: engine
2016-10-18 15:51:10 +02:00
4d36451135
Add bash completion for docker {run,create} --stop-timeout
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 38dc6106098784d4141140a6d3b946b080ba5878
Component: engine
2016-10-18 15:24:28 +02:00
a66c882a3d
Merge pull request #27434 from danix800/fix-doc-typos
...
Fix typos in docs/reference/builder.md.
Upstream-commit: 20be0a6ef788fc2c8dd492751ee25c06d95045df
Component: engine
2016-10-18 15:08:01 +02:00
36ff448ad1
Merge pull request #27481 from yuexiao-wang/fix-link-image-repo
...
Fix the link for sharing images via repositories
Upstream-commit: 043192137f23b8fb8ca3d41327d452ab475f48c9
Component: engine
2016-10-18 14:54:34 +02:00
b507a87735
Fix the link for sharing images via repositories
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: c76f8ff1d4f0bbc273eca7cba4447b06e2da9c0c
Component: engine
2016-10-18 22:59:18 +08:00
a35c353d0b
Merge pull request #27476 from yuexiao-wang/fix-typos-volume
...
Fix some typos
Upstream-commit: 1feaeac65c8968ba2f88a1d2d17e7e775ac2ae18
Component: engine
2016-10-18 13:50:20 +01:00
e13e181560
Merge pull request #27478 from allencloud/wrap-line-in-deleted-containers
...
wrap line in deleted containers when pruning
Upstream-commit: 1643110ef48e6a7c0cf149d9d0ccf05a52026d10
Component: engine
2016-10-18 13:48:44 +01:00
621e0c851d
Merge pull request #22566 from yongtang/22471-daemon-shutdown-timeout
...
Add config parameter to change per-container stop timeout during daemon shutdown
Upstream-commit: dad8cbfc2d6db45331be2cbd8f9997ab0851fccf
Component: engine
2016-10-18 14:33:09 +02:00
77c700603f
Fix typs from go to Go
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 7dad9d5ce45f25750f339642d3b84a81cc2ba98e
Component: engine
2016-10-18 19:40:16 +08:00
16e8ef0b4d
cleaning up more stuff in vendor
...
Signed-off-by: Carlos Alexandro Becker <caarlos0@gmail.com >
Upstream-commit: 2ce76c0696a603d8cca1433c6aa9b4325a711d53
Component: engine
2016-10-18 09:20:41 -02:00
b85187dbd0
Fix code block fences and typo.
...
Signed-off-by: Ding Fei <dingfei@stars.org.cn >
Upstream-commit: 08fe24c2d5ef415d2b94f8e3f28d0299db2d7b6a
Component: engine
2016-10-18 18:05:37 +08:00
96340571d8
Fix typos in docs/reference/builder.md.
...
Signed-off-by: Ding Fei <dingfei@stars.org.cn >
Upstream-commit: 9ccb1f159e964384df32c083058197340941fafa
Component: engine
2016-10-18 18:05:37 +08:00
26c4ac0d99
Fix link for feature deprecation policy
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: b7d34e1c03849a24a4c9c561391a577d4539368c
Component: engine
2016-10-18 17:56:58 +08:00
f3b85d76fb
Merge pull request #27471 from caarlos0/logentries
...
Added Logentries Driver
Upstream-commit: 24582e815330edd197337f17b1a0a541679f969b
Component: engine
2016-10-18 01:33:28 -07:00
153b6651a5
Fix the typo of link in devmapper
...
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn >
Upstream-commit: f7701d90a94922fa6854cc80b2218392d6a4ac76
Component: engine
2016-10-18 16:02:38 +08:00
b9c927e281
wrap line in deleted containers when pruning
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: dcb4d68092ebca6658923fa4b130ca79e121c760
Component: engine
2016-10-18 14:20:12 +08:00
7a03f51c60
Update fluent-logger-golang to v1.2.1
...
This fixes a regression bug not to connect the destination node twice or more.
That regression was brought by v1.2.0, and it also makes many goroutines for
first reconnection (these will finish after first reconnection established).
Signed-off-by: Satoshi Tagomori <tagomoris@gmail.com >
Upstream-commit: 53ed17449e990f49e8eecdf71ec3704ce7118660
Component: engine
2016-10-18 11:26:32 +09:00
2cd33b295f
Make golint happy.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: eb4c4b7ecfb06e304139dcffe9ef309c57479211
Component: engine
2016-10-17 17:28:27 -07:00
5d899f98e2
move graphdriver/projectquota.go to its own package.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 767727480f2856440cc908be7c9296dccb93346c
Component: engine
2016-10-17 17:27:24 -07:00
23d87cfd7e
Added logentries dependency to vendor
...
Signed-off-by: Carlos Alexandro Becker <caarlos0@gmail.com >
Upstream-commit: 0f4db1cc59faddb0207db269fd660e8e1582b77a
Component: engine
2016-10-17 22:06:39 -02:00
7906a55d05
Merge pull request #27459 from aquasecurity/xfs_quota_fedora_build_fix
...
projectquota: fix build failure with new kernels
Upstream-commit: cd0e399e062b45bb0c5e11c7eb4de933b1ad0564
Component: engine
2016-10-18 00:13:27 +02:00
fb34a38625
Merge pull request #26519 from AkihiroSuda/fix-cli-command-formatter-json-support
...
Fix broken JSON support in cli/command/formatter
Upstream-commit: c028a88158f0f993bc7789883be1208e94a1a6b7
Component: engine
2016-10-17 22:44:04 +01:00
7035ba1424
Merge pull request #27440 from lixiaobing10051267/masterVolume
...
fix wrong output title for docker volume ls
Upstream-commit: 0268efc48b86e5cf1c56f2e869f7b66840438ceb
Component: engine
2016-10-17 14:34:24 -07:00
b2c482a30a
Merge pull request #27457 from vdemeester/use-volume-name
...
Revert docker volume column name to VOLUME_NAME
Upstream-commit: 81ce55bb877f004042960705d36636ee3c6f03bd
Component: engine
2016-10-17 13:00:50 -07:00
15c4940651
Update docker stop and docker restart to allow not specifying timeout and use the one specified at container creation time.
...
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: cc703784f39fb3f585ec685cf7aeda6410648446
Component: engine
2016-10-17 12:53:35 -07:00
9fc27540de
Add config parameter to change per-container stop timeout during daemon shutdown
...
This fix tries to add a flag `--stop-timeout` to specify the timeout value
(in seconds) for the container to stop before SIGKILL is issued. If stop timeout
is not specified then the default timeout (10s) is used.
Additional test cases have been added to cover the change.
This fix is related to #22471 . Another pull request will add `--shutdown-timeout`
to daemon for #22471 .
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: e66d2108911a2fad016205bdd6bf181f7e822c1c
Component: engine
2016-10-17 12:28:46 -07:00
d1476e7d2c
Windows: Mark run-service flag as hidden
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 102a38ceb13478351e32c9c40e31e5b3f3298e76
Component: engine
2016-10-17 12:21:31 -07:00
c6750abd82
projectquota: fix build failure with new kernels
...
In kernel version >= v4.5 the project quota ioctl definitions
have been made public via the include/uapi/linux/fs.h API, so
that ext4 could use the same API.
Avoid re-defining the ioctl API if it is already defined in fs.h.
Signed-off-by: Amir Goldstein <amir73il@aquasec.com >
Upstream-commit: 9ea50714469c0c5773178222ae6b745701ac9076
Component: engine
2016-10-17 21:44:23 +03:00
fcb8f917ad
Merge pull request #27429 from thaJeztah/update-api-changelog
...
Add KernelMemory to API changelog
Upstream-commit: f302226a5ba9cf5d1af4ee5392cd57a71545b80a
Component: engine
2016-10-17 11:11:00 -07:00
e12b8f5ae9
Revert docker volume column name to VOLUME_NAME
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 862db3f191b9f1e2426b10d433270bd414ba5a48
Component: engine
2016-10-17 20:03:31 +02:00
314b4d907f
Merge pull request #27452 from lucafavatella/fix-typo-in-build-ref
...
Fix typo in build documentation
Upstream-commit: 92e2a62891c063bc992a5a0afe496a5b1236f6eb
Component: engine
2016-10-17 10:53:36 -07:00
cc3045cf2d
Merge pull request #27421 from jcberthon/master
...
builder: Add AppArmor to runc buildtags for armhf - fixes #27351
Upstream-commit: fb65df5bfe7c03a449b4d7c2c57d73de590ea2e1
Component: engine
2016-10-17 19:20:09 +02:00
a43b38269a
Merge pull request #27424 from pcgeek86/patch-1
...
Update ISSUE_TEMPLATE.md
Upstream-commit: d5a4b0e839b36f216db09a9c43e5a52c8430828e
Component: engine
2016-10-17 10:15:10 -07:00
cf21f12ebe
Improve bash completion of containers
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: b6237a8550685f865d0b8e366f4cec81fca7f4d8
Component: engine
2016-10-17 19:10:48 +02:00
d9f401546d
Merge pull request #25566 from allencloud/fix-config-load-bug
...
fix config load error with default ulimits
Upstream-commit: 165a3d0a7530b20167b99dace601a00a46a99dfa
Component: engine
2016-10-17 18:58:12 +02:00
7b84e05ca6
Merge pull request #24771 from aquasecurity/xfs_quota
...
Implement XFS quota for overlay2
Upstream-commit: 8863a9f62cb16fbdbb318165ffc8140aeb32c597
Component: engine
2016-10-17 09:23:42 -07:00
