kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #21872 from Microsoft/sjw/nanoserver-fix

Browse source 
Fixing nanoserver image load bug.
This commit is contained in:
John Howard 2016-04-07 21:24:32 -07:00
commit d5ef62f489
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
daemon/daemon_windows.go
View file

@ -401,7 +401,9 @@ func restoreCustomImage(is image.Store, ls layer.Store, rs reference.Store) erro
id, err := is.Create(config) id, err := is.Create(config)
if err != nil { 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 { if err := rs.AddTag(ref, id, true); err != nil {

2
daemon/graphdriver/windows/windows.go
View file

@ -454,7 +454,7 @@ func (d *Driver) GetCustomImageInfos() ([]CustomImageInfo, error) {
imageData.ID = id imageData.ID = id
// For now, hard code that all base images except nanoserver depend on win32k support // 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") imageData.OSFeatures = append(imageData.OSFeatures, "win32k")
} }