LCOW: Fix ImageCache to address right store

John Howard · John Howard · commit ba40132366e1 · 2017-06-20T19:49:53.000-07:00
Signed-off-by: John Howard &lt;jhoward@microsoft.com&gt;
diff --git a/builder/builder.go b/builder/builder.go
@@ -78,7 +78,7 @@ type Result struct {
 // ImageCacheBuilder represents a generator for stateful image cache.
 type ImageCacheBuilder interface {
 	// MakeImageCache creates a stateful image cache.
-	MakeImageCache(cacheFrom []string) ImageCache
+	MakeImageCache(cacheFrom []string, platform string) ImageCache
 }
 
 // ImageCache abstracts an image cache.
diff --git a/builder/dockerfile/builder.go b/builder/dockerfile/builder.go
@@ -166,7 +166,7 @@ func newBuilder(clientCtx context.Context, options builderOptions) *Builder {
 		buildStages:      newBuildStages(),
 		imageSources:     newImageSources(clientCtx, options),
 		pathCache:        options.PathCache,
-		imageProber:      newImageProber(options.Backend, config.CacheFrom, config.NoCache),
+		imageProber:      newImageProber(options.Backend, config.CacheFrom, options.Platform, config.NoCache),
 		containerManager: newContainerManager(options.Backend),
 		platform:         options.Platform,
 	}
diff --git a/builder/dockerfile/dispatchers_test.go b/builder/dockerfile/dispatchers_test.go
@@ -63,7 +63,7 @@ func newBuilderWithMockBackend() *Builder {
 			Backend: mockBackend,
 		}),
 		buildStages:      newBuildStages(),
-		imageProber:      newImageProber(mockBackend, nil, false),
+		imageProber:      newImageProber(mockBackend, nil, runtime.GOOS, false),
 		containerManager: newContainerManager(mockBackend),
 	}
 	return b
@@ -488,10 +488,10 @@ func TestRunWithBuildArgs(t *testing.T) {
 	}
 
 	mockBackend := b.docker.(*MockBackend)
-	mockBackend.makeImageCacheFunc = func(_ []string) builder.ImageCache {
+	mockBackend.makeImageCacheFunc = func(_ []string, _ string) builder.ImageCache {
 		return imageCache
 	}
-	b.imageProber = newImageProber(mockBackend, nil, false)
+	b.imageProber = newImageProber(mockBackend, nil, runtime.GOOS, false)
 	mockBackend.getImageFunc = func(_ string) (builder.Image, builder.ReleaseableLayer, error) {
 		return &mockImage{
 			id:     "abcdef",
diff --git a/builder/dockerfile/imageprobe.go b/builder/dockerfile/imageprobe.go
@@ -19,13 +19,13 @@ type imageProber struct {
 	cacheBusted bool
 }
 
-func newImageProber(cacheBuilder builder.ImageCacheBuilder, cacheFrom []string, noCache bool) ImageProber {
+func newImageProber(cacheBuilder builder.ImageCacheBuilder, cacheFrom []string, platform string, noCache bool) ImageProber {
 	if noCache {
 		return &nopProber{}
 	}
 
 	reset := func() builder.ImageCache {
-		return cacheBuilder.MakeImageCache(cacheFrom)
+		return cacheBuilder.MakeImageCache(cacheFrom, platform)
 	}
 	return &imageProber{cache: reset(), reset: reset}
 }
diff --git a/builder/dockerfile/mockbackend_test.go b/builder/dockerfile/mockbackend_test.go
@@ -18,7 +18,7 @@ type MockBackend struct {
 	containerCreateFunc func(config types.ContainerCreateConfig) (container.ContainerCreateCreatedBody, error)
 	commitFunc          func(string, *backend.ContainerCommitConfig) (string, error)
 	getImageFunc        func(string) (builder.Image, builder.ReleaseableLayer, error)
-	makeImageCacheFunc  func(cacheFrom []string) builder.ImageCache
+	makeImageCacheFunc  func(cacheFrom []string, platform string) builder.ImageCache
 }
 
 func (m *MockBackend) ContainerAttachRaw(cID string, stdin io.ReadCloser, stdout, stderr io.Writer, stream bool, attached chan struct{}) error {
@@ -71,9 +71,9 @@ func (m *MockBackend) GetImageAndReleasableLayer(ctx context.Context, refOrID st
 	return &mockImage{id: "theid"}, &mockLayer{}, nil
 }
 
-func (m *MockBackend) MakeImageCache(cacheFrom []string) builder.ImageCache {
+func (m *MockBackend) MakeImageCache(cacheFrom []string, platform string) builder.ImageCache {
 	if m.makeImageCacheFunc != nil {
-		return m.makeImageCacheFunc(cacheFrom)
+		return m.makeImageCacheFunc(cacheFrom, platform)
 	}
 	return nil
 }
diff --git a/daemon/cache.go b/daemon/cache.go
@@ -1,22 +1,18 @@
 package daemon
 
 import (
-	"runtime"
-
 	"github.com/Sirupsen/logrus"
 	"github.com/docker/docker/builder"
 	"github.com/docker/docker/image/cache"
 )
 
 // MakeImageCache creates a stateful image cache.
-func (daemon *Daemon) MakeImageCache(sourceRefs []string) builder.ImageCache {
+func (daemon *Daemon) MakeImageCache(sourceRefs []string, platform string) builder.ImageCache {
 	if len(sourceRefs) == 0 {
-		// TODO @jhowardmsft LCOW. For now, assume it is the OS of the host
-		return cache.NewLocal(daemon.stores[runtime.GOOS].imageStore)
+		return cache.NewLocal(daemon.stores[platform].imageStore)
 	}
 
-	// TODO @jhowardmsft LCOW. For now, assume it is the OS of the host
-	cache := cache.New(daemon.stores[runtime.GOOS].imageStore)
+	cache := cache.New(daemon.stores[platform].imageStore)
 
 	for _, ref := range sourceRefs {
 		img, err := daemon.GetImage(ref)

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ type Result struct {`
`78`	`78`	`// ImageCacheBuilder represents a generator for stateful image cache.`
`79`	`79`	`type ImageCacheBuilder interface {`
`80`	`80`	`// MakeImageCache creates a stateful image cache.`
`81`		`- MakeImageCache(cacheFrom []string) ImageCache`
	`81`	`+ MakeImageCache(cacheFrom []string, platform string) ImageCache`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`// ImageCache abstracts an image cache.`
Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ func newBuilder(clientCtx context.Context, options builderOptions) *Builder {`
`166`	`166`	`buildStages: newBuildStages(),`
`167`	`167`	`imageSources: newImageSources(clientCtx, options),`
`168`	`168`	`pathCache: options.PathCache,`
`169`		`- imageProber: newImageProber(options.Backend, config.CacheFrom, config.NoCache),`
	`169`	`+ imageProber: newImageProber(options.Backend, config.CacheFrom, options.Platform, config.NoCache),`
`170`	`170`	`containerManager: newContainerManager(options.Backend),`
`171`	`171`	`platform: options.Platform,`
`172`	`172`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,13 +19,13 @@ type imageProber struct {`
`19`	`19`	`cacheBusted bool`
`20`	`20`	`}`
`21`	`21`
`22`		`-func newImageProber(cacheBuilder builder.ImageCacheBuilder, cacheFrom []string, noCache bool) ImageProber {`
	`22`	`+func newImageProber(cacheBuilder builder.ImageCacheBuilder, cacheFrom []string, platform string, noCache bool) ImageProber {`
`23`	`23`	`if noCache {`
`24`	`24`	`return &nopProber{}`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`reset := func() builder.ImageCache {`
`28`		`- return cacheBuilder.MakeImageCache(cacheFrom)`
	`28`	`+ return cacheBuilder.MakeImageCache(cacheFrom, platform)`
`29`	`29`	`}`
`30`	`30`	`return &imageProber{cache: reset(), reset: reset}`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ type MockBackend struct {`
`18`	`18`	`containerCreateFunc func(config types.ContainerCreateConfig) (container.ContainerCreateCreatedBody, error)`
`19`	`19`	`commitFunc func(string, *backend.ContainerCommitConfig) (string, error)`
`20`	`20`	`getImageFunc func(string) (builder.Image, builder.ReleaseableLayer, error)`
`21`		`- makeImageCacheFunc func(cacheFrom []string) builder.ImageCache`
	`21`	`+ makeImageCacheFunc func(cacheFrom []string, platform string) builder.ImageCache`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`func (m *MockBackend) ContainerAttachRaw(cID string, stdin io.ReadCloser, stdout, stderr io.Writer, stream bool, attached chan struct{}) error {`
`@@ -71,9 +71,9 @@ func (m *MockBackend) GetImageAndReleasableLayer(ctx context.Context, refOrID st`
`71`	`71`	`return &mockImage{id: "theid"}, &mockLayer{}, nil`
`72`	`72`	`}`
`73`	`73`
`74`		`-func (m *MockBackend) MakeImageCache(cacheFrom []string) builder.ImageCache {`
	`74`	`+func (m *MockBackend) MakeImageCache(cacheFrom []string, platform string) builder.ImageCache {`
`75`	`75`	`if m.makeImageCacheFunc != nil {`
`76`		`- return m.makeImageCacheFunc(cacheFrom)`
	`76`	`+ return m.makeImageCacheFunc(cacheFrom, platform)`
`77`	`77`	`}`
`78`	`78`	`return nil`
`79`	`79`	`}`