GitList

Browse code

LCOW: Fix FROM scratch

Signed-off-by: John Howard <jhoward@microsoft.com>
(cherry picked from commit 20b11792e8c58348d3f50756251c98f80e027a35)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

John Howard authored on 2019/05/15 07:48:17
Showing 1 changed files

daemon/images/image_builder.go

History View file @ ba28377

@@ -170,6 +170,9 @@ func (i *ImageService) pullForBuilder(ctx context.Context, name string, authConf
                      func (i *ImageService) GetImageAndReleasableLayer(ctx context.Context, refOrID string, opts backend.GetImageAndLayerOptions) (builder.Image, builder.ROLayer, error) {
                      	if refOrID == "" { // ie FROM scratch
                      		os := runtime.GOOS
                     +		if runtime.GOOS == "windows" {
                     +			os = "linux"
                     +		}
                      		if opts.Platform != nil {
                      			os = opts.Platform.OS
+                     		}