3c2827770b
Add Logs to ContainerAttachOptions
...
Signed-off-by: Andy Goldstein <agoldste@redhat.com >
Upstream-commit: fc8097f957ec7ae990f84faf54bce85a399c96af
Component: engine
2016-10-19 11:39:00 -04:00
e4a5c6f7fb
Merge pull request #26965 from Microsoft/jjh/rootpath
...
Windows: Set correct root path logic
Upstream-commit: 15fb3fd9da06c73c4efd88140f6fc12130f361a9
Component: engine
2016-10-19 15:50:37 +02:00
aaf05c1203
Merge pull request #27387 from talex5/health-restart
...
Reset health status to starting when a container is restarted
Upstream-commit: 7a4d286ddd78aff567c21bdd0a54d7765488ca64
Component: engine
2016-10-19 15:48:59 +02:00
6553369753
Merge pull request #26130 from AkihiroSuda/networkcreationtime
...
add creation timestamp to `docker network inspect`
Upstream-commit: f279c11a7724abbec80a4cb215dccaeebe13edae
Component: engine
2016-10-19 15:48:29 +02:00
28791e5b60
Merge pull request #27316 from albers/completion-plugins
...
Align bash completion of plugins to completion of nodes and services
Upstream-commit: ff43982fbbbca71bcd9625ccc50fa8d5fb547228
Component: engine
2016-10-19 12:17:12 +02:00
2b55f480a4
Merge pull request #26984 from thaJeztah/update-triage-process
...
[RFC] Update triage process with more labels
Upstream-commit: d2ccc8007a46fce925b20ec678b5068bfd0f9fb1
Component: engine
2016-10-19 12:12:50 +02:00
a787673664
Merge pull request #27501 from aaronlehmann/remove-resolveindex
...
registry: Remove unused method ResolveIndex
Upstream-commit: f11a588d751cb7f82e2291ae1d5d5c0a3743e8fb
Component: engine
2016-10-19 00:30:55 -07:00
0138b61d5e
Merge pull request #27523 from lixiaobing10051267/masterInstall
...
Remove invalid installation content because there is no corresponding files
Upstream-commit: e319954229358caede53bb64c336fa116e9159c2
Component: engine
2016-10-18 23:51:28 -07:00
df687714f9
Remove invalid installtion content because there is no corresponding files
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 9146ac50c451da95898b216be4fe772168d5edd6
Component: engine
2016-10-19 15:12:55 +08:00
a9ca455bda
add creation timestamp to docker network inspect
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: b5bb7de5d26a49c8a3789cfcaeb8ff3e6153e708
Component: engine
2016-10-19 06:38:39 +00:00
7003dd5887
Merge pull request #27502 from dnephin/fix-dockerd-help-text
...
Update sfp13/pflag
Upstream-commit: 024b97bf0fa7babd68948ce9c9dc38deba74e5ed
Component: engine
2016-10-18 23:27:54 -07:00
79977cb0e7
Merge pull request #27520 from dmcgowan/fix-27384
...
Add limit to page size used by overlay2 driver
Upstream-commit: 74f486cd71e99e5e7a04a98e941841af48771c5d
Component: engine
2016-10-18 23:11:17 -07:00
3643ef102a
Merge pull request #27267 from ezrasilvera/plugin_fix
...
Call the AuthZRes function also when the daemon returns error
Upstream-commit: 194f04bbbe5b4de06235bf56b8842cadac0294dc
Component: engine
2016-10-18 21:53:43 -07:00
ed569140d9
Add limit to page size used by overlay2 driver
...
Go can falsely report a larger page size than supported,
causing overlay2 mount arguments to be truncated. When overlay2
detects the mount arguments have hit the page limit, it will
switch to using relative paths. If this limit is smaller than
the actual page size there is no behavioral problems, but if it
is larger mounts can fail for images with many layers.
Closes #27384
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: 520034e35b463e8c9d69ac78b52a4e5df958bc04
Component: engine
2016-10-18 17:34:19 -07:00
f7298ec9d2
Update sfp13/pflag
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 4e4da146ecc726f9fb78553710e019edb4685d18
Component: engine
2016-10-18 17:17:22 -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
8fe449b7c3
registry: Remove unused method ResolveIndex
...
This does not appear to be used.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 19858ff1b1c9a6e2e0a57c1e0f972934822306b6
Component: engine
2016-10-18 12:04:10 -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
