fc7d1ce752
Ignore layer does not exist error from docker images
...
Fix #31350
As we can see in `daemon.Images()`, there is a gap between
`allImages = daemon.imageStore.Map()` and `l, err :=
daemon.layerStore.Get(layerID)`, so images which still exist when we hit
`allImages = daemon.imageStore.Map()` may have already been deleted when we hit
`l, err := daemon.layerStore.Get(layerID)`.
```
if danglingOnly {
allImages = daemon.imageStore.Heads()
} else {
allImages = daemon.imageStore.Map()
}
...
for id, img := range allImages {
...
layerID := img.RootFS.ChainID()
var size int64
if layerID != "" {
l, err := daemon.layerStore.Get(layerID)
if err != nil {
return nil, err
}
```
Signed-off-by: Yuanhong Peng <pengyuanhong@huawei.com >
Upstream-commit: 2b9694c29e3bbbce23f0c4009f908a23c115c598
Component: engine
2017-03-16 09:21:51 +08:00
ea6f7f96d3
Merge pull request #31538 from yongtang/31325-service-ls-filter-mode
...
Support `--filter mode=global|replicated` for `docker service ls`
Upstream-commit: b36ce6f2f6cfdee4d376b58137dde2bc20fc4312
Component: engine
2017-03-16 01:42:55 +01:00
b5523cf68f
Merge pull request #30514 from FrenchBen/yaml
...
Yaml Generation
Upstream-commit: b5bd023de6a8a57214539331727e7b9bcbf8e341
Component: engine
2017-03-15 16:20:33 -07:00
511144631c
Merge pull request #31862 from vieux/revert_login
...
Revert "Planned 1.13 deprecation: email from login"
Upstream-commit: b4432de9220da3a41a84d6f24ba9adc431278317
Component: engine
2017-03-15 16:17:13 -07:00
71a9172d50
Merge pull request #31847 from mkumatag/fix_contrib
...
Rename project/CONTRIBUTORS.md -> project/CONTRIBUTING.md
Upstream-commit: fa6e7b39e3e26309beddf6a96713c2071457d80d
Component: engine
2017-03-15 14:27:15 -07:00
8d1c92cf9d
Merge pull request #31843 from jim-minter/attachrace_regression
...
Resolve connection reset by peer regression
Upstream-commit: 595ea2f12096e668977808ccea72f74a9e7c2ab7
Component: engine
2017-03-15 20:55:23 +01:00
5ce631e23f
Merge pull request #31837 from vieux/next
...
prepare master for the next release
Upstream-commit: a8ab5855ea8fcc2b1c4dc4bb10a6722d24f4abb6
Component: engine
2017-03-15 11:53:16 -07:00
f6bac49560
Support --filter mode=global|replicated for docker service ls
...
This fix tries to address the request in 31325 by adding
`--filter mode=global|replicated` to `docker service ls`.
As `docker service ls` has a `MODE` column by default, it is natural
to support `--filter mode=global|replicated` for `docker service ls`.
There are multiple ways to address the issue. One way is to pass
the filter of mode to SwarmKit, another way is to process the filter
of mode in the daemon.
This fix process the filter in the daemon.
Related docs has been updated.
An integration test has been added.
This fix fixes 31325.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 43a1bd564b5dbd835631cda102f68286c0d533e9
Component: engine
2017-03-15 11:06:57 -07:00
07acd5ad44
Revert "Planned 1.13 deprecation: email from login"
...
This reverts commit a66efbddb8eaa837cf42aae20b76c08274271dcf.
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
Upstream-commit: 4bce232139014e95590db93863a8c34d3a7779cf
Component: engine
2017-03-15 10:43:18 -07:00
d814e3f611
Update containerd to version 422e31ce907fd9c3833a38d7b8fdd023e5a76e73
...
This fixes an issue preventing containerd from starting if the state
directory didn't exist already.
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 440b2cc7ab873e120c6973ea968c65134a4cb6cb
Component: engine
2017-03-15 08:08:39 -07:00
143f4ad598
Merge pull request #31687 from AkihiroSuda/fix-test-duplicate-mountpoints
...
TestDuplicateMountpointsForVolumesFromAndMounts: remove unintentional dependency for /tmp/data
Upstream-commit: 297786f30c348b28d6cd93e8e0911ac31f31d190
Component: engine
2017-03-15 14:15:39 +01:00
886c21a61b
Merge pull request #31846 from thaJeztah/remove-outdated-etc-hosts-reference
...
docs: remove outdated reference to updating /etc/hosts
Upstream-commit: 5126862d438eb7ad6fd2e9591a830d1c92d91ea8
Component: engine
2017-03-15 14:07:01 +01:00
80cfad5562
Rename project/CONTRIBUTORS.md -> project/CONTRIBUTING.md
...
Signed-off-by: Manjunath A Kumatagi <mkumatag@in.ibm.com >
Upstream-commit: f4ea1081f4b1dc2634cc31e233a72192407e939f
Component: engine
2017-03-15 08:48:27 -04:00
7a7147e036
Merge pull request #31844 from vdemeester/image-filter-reference-remove-version-if
...
Don't compare API version in the future for `image ls` endpoint
Upstream-commit: 2d95c3ca61bea8e31689056b80bec03bea2affbc
Component: engine
2017-03-15 12:06:46 +00:00
a5a1a8eade
Merge pull request #31302 from dnephin/purge-orphaned-services
...
Add --prune to stack deploy
Upstream-commit: b0d1936d304824dc0438b200d269e2d4e0751fcc
Component: engine
2017-03-15 12:57:06 +01:00
b039776e6b
docs: remove outdated reference to updating /etc/hosts
...
Starting with docker 1.10, docker no longer uses
/etc/hosts for service discovery, but uses an
embedded DNS server. This patch removes a reference
to the old (pre 1.10) behavior.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 171f5d84f908056353d5cd138d13de1636447d68
Component: engine
2017-03-15 12:27:23 +01:00
57ff68893d
Replace API version comparison by a if…
...
… as we don't know for sure what API version it will be at that time.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 0f9d22cd66353b3d14dd4a08084f88778fb69480
Component: engine
2017-03-15 10:46:06 +01:00
2ab1de2543
Resolve connection reset by peer regression
...
Signed-off-by: Jim Minter <jminter@redhat.com >
Upstream-commit: dc0ee98805c1e9282c729a79cdf10e59bad3cb09
Component: engine
2017-03-15 09:36:44 +00:00
1867954c73
prepare master for the next release
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
Upstream-commit: 817106aaa1e8575d86e0b95a4219f6a7434572e3
Component: engine
2017-03-14 20:43:33 -07:00
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
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
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
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
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
