mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Windows: Skip layers+base images
Signed-off-by: John Howard <jhoward@microsoft.com>
This commit is contained in:
parent
2ae49a0887
commit
540c8e9b20
1 changed files with 16 additions and 1 deletions
|
@ -1,10 +1,21 @@
|
||||||
package image
|
package image
|
||||||
|
|
||||||
import "github.com/docker/docker/layer"
|
import (
|
||||||
|
"runtime"
|
||||||
|
|
||||||
|
"github.com/Sirupsen/logrus"
|
||||||
|
"github.com/docker/docker/layer"
|
||||||
|
)
|
||||||
|
|
||||||
// TypeLayers is used for RootFS.Type for filesystems organized into layers.
|
// TypeLayers is used for RootFS.Type for filesystems organized into layers.
|
||||||
const TypeLayers = "layers"
|
const TypeLayers = "layers"
|
||||||
|
|
||||||
|
// typeLayersWithBase is an older format used by Windows up to v1.12. We
|
||||||
|
// explicitly handle this as an error case to ensure that a daemon which still
|
||||||
|
// has an older image like this on disk can still start, even though the
|
||||||
|
// image itself is not usable. See https://github.com/docker/docker/pull/25806.
|
||||||
|
const typeLayersWithBase = "layers+base"
|
||||||
|
|
||||||
// RootFS describes images root filesystem
|
// RootFS describes images root filesystem
|
||||||
// This is currently a placeholder that only supports layers. In the future
|
// This is currently a placeholder that only supports layers. In the future
|
||||||
// this can be made into an interface that supports different implementations.
|
// this can be made into an interface that supports different implementations.
|
||||||
|
@ -25,5 +36,9 @@ func (r *RootFS) Append(id layer.DiffID) {
|
||||||
|
|
||||||
// ChainID returns the ChainID for the top layer in RootFS.
|
// ChainID returns the ChainID for the top layer in RootFS.
|
||||||
func (r *RootFS) ChainID() layer.ChainID {
|
func (r *RootFS) ChainID() layer.ChainID {
|
||||||
|
if runtime.GOOS == "windows" && r.Type == typeLayersWithBase {
|
||||||
|
logrus.Warnf("Layer type is unsupported on this platform. DiffIDs: '%v'", r.DiffIDs)
|
||||||
|
return ""
|
||||||
|
}
|
||||||
return layer.CreateChainID(r.DiffIDs)
|
return layer.CreateChainID(r.DiffIDs)
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue