dilim/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-08-05 07:30:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix buildkit pull nil panic

Browse Source 
Signed-off-by: Wang Yumu <37442693@qq.com>
This commit is contained in:
Wang Yumu
2020-07-29 07:48:50 +08:00
parent 9e33baffc5
commit 2b22a2e792
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
builder/builder-next/adapters/containerimage/pull.go
View File

@@ -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),