buildkit: normalize build target and local platform
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
(cherry picked from commit b4e056d556
)
This commit is contained in:
parent
9f5b26fb86
commit
80b7e8b5d7
|
@ -22,6 +22,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"
|
||||||
|
@ -854,11 +855,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
|
})
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue