kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

buildkit: normalize build target and local platform

Browse source 
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
This commit is contained in:
CrazyMax 2021-10-19 17:10:34 +02:00
parent 306fa44b7c
commit b4e056d556
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
builder/builder-next/adapters/containerimage/pull.go
View file

@ -21,6 +21,7 @@ import (
"github.com/containerd/containerd/remotes/docker" "github.com/containerd/containerd/remotes/docker"
"github.com/containerd/containerd/remotes/docker/schema1" "github.com/containerd/containerd/remotes/docker/schema1"
distreference "github.com/docker/distribution/reference" distreference "github.com/docker/distribution/reference"
dimages "github.com/docker/docker/daemon/images"
"github.com/docker/docker/distribution" "github.com/docker/docker/distribution"
"github.com/docker/docker/distribution/metadata" "github.com/docker/docker/distribution/metadata"
"github.com/docker/docker/distribution/xfer" "github.com/docker/docker/distribution/xfer"
@ -853,11 +854,11 @@ func resolveModeToString(rm source.ResolveMode) string {
} }
func platformMatches(img *image.Image, p *ocispec.Platform) bool { func platformMatches(img *image.Image, p *ocispec.Platform) bool {
if img.Architecture != p.Architecture { return dimages.OnlyPlatformWithFallback(*p).Match(ocispec.Platform{
return false Architecture: img.Architecture,
} OS: img.OS,
if img.Variant != "" && img.Variant != p.Variant { OSVersion: img.OSVersion,
return false OSFeatures: img.OSFeatures,
} Variant: img.Variant,
return img.OS == p.OS })
} }