docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-16 20:22:36 +03:00
Code Activity

Fixing nanoserver image load bug.

Browse Source 
Fixes an issue that prevents nano server images from loading properly. Also updates logic for custom image loading to avoid preventing daemon start because an image failed to load.

Signed-off-by: Stefan J. Wernli <swernli@microsoft.com>
Upstream-commit: a22092b13695c44790bb443ac8b536965b1cdba3
Component: engine
This commit is contained in:
Stefan J. Wernli
2016-04-07 15:58:57 -07:00
parent ecdfed949e
commit 431366980d
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/engine/daemon/daemon_windows.go
View File

@@ -402,7 +402,9 @@ func restoreCustomImage(is image.Store, ls layer.Store, rs reference.Store) erro
id, err := is.Create(config)
if err != nil {
return err
logrus.Warnf("Failed to restore custom image %s with error: %s.", name, err.Error)
logrus.Warnf("Skipping image %s...", name)
continue
}
if err := rs.AddTag(ref, id, true); err != nil {

2
components/engine/daemon/graphdriver/windows/windows.go
View File

@@ -449,7 +449,7 @@ func (d *Driver) GetCustomImageInfos() ([]CustomImageInfo, error) {
imageData.ID = id
// For now, hard code that all base images except nanoserver depend on win32k support
if imageData.Name != "nanoserver" {
if imageData.Name != "NanoServer" {
imageData.OSFeatures = append(imageData.OSFeatures, "win32k")
}