Merge pull request #41301 from wangyumu/fix-buildkit-pull-nil-panic

fix buildkit nil panic when frontend image exists
moby · Jul 31, 2020 · 3969120 · 3969120
2 parents e6c4597 + 2b22a2e
commit 3969120
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/builder/builder-next/adapters/containerimage/pull.go b/builder/builder-next/adapters/containerimage/pull.go
@@ -151,7 +151,7 @@ func (is *Source) ResolveImageConfig(ctx context.Context, ref string, opt llb.Re
 	case source.ResolveModePreferLocal:
 		img, err := is.resolveLocal(ref)
 		if err == nil {
-			if !platformMatches(img, opt.Platform) {
+			if opt.Platform != nil && !platformMatches(img, opt.Platform) {
 				logrus.WithField("ref", ref).Debugf("Requested build platform %s does not match local image platform %s, checking remote",
 					path.Join(opt.Platform.OS, opt.Platform.Architecture, opt.Platform.Variant),
 					path.Join(img.OS, img.Architecture, img.Variant),