From 2b22a2e792fbf2169cba3ffd2b6a8271ecbd1eea Mon Sep 17 00:00:00 2001
From: Wang Yumu <37442693@qq.com>
Date: Wed, 29 Jul 2020 07:48:50 +0800
Subject: [PATCH] fix buildkit pull nil panic

Signed-off-by: Wang Yumu <37442693@qq.com>
---
 builder/builder-next/adapters/containerimage/pull.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/builder/builder-next/adapters/containerimage/pull.go b/builder/builder-next/adapters/containerimage/pull.go
index aa5e349c3a..65ee7a329c 100644
--- 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),