From 5f7be5d5bc1e00ad6b497cd22086e04e8624c1b2 Mon Sep 17 00:00:00 2001 From: Aaron Paterson Date: Wed, 12 Aug 2026 21:17:15 +0000 Subject: [PATCH] Spell platforms through one module The tree imports both github.com/containerd/containerd/platforms and github.com/containerd/platforms. The first is a deprecation shim whose every symbol forwards to the second, so the two spellings name the same code and the split lives only in the source: pkg/build reaches for one in build.go and for the other in buildopts.go and frontend.go, and a reader has to open the vendored shim to learn that they agree. One module spells every platform now, the one dockerui itself imports and the one the shim forwards to. --- pkg/build/build.go | 2 +- pkg/build/utils/platform.go | 2 +- pkg/resolver/resolver.go | 2 +- pkg/resolver/resolver_test.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/build/build.go b/pkg/build/build.go index be5be4c8..42cc8f89 100644 --- a/pkg/build/build.go +++ b/pkg/build/build.go @@ -25,7 +25,7 @@ import ( "path/filepath" "strings" - "github.com/containerd/containerd/platforms" + "github.com/containerd/platforms" "github.com/containerd/containerd/v2/core/content" "github.com/moby/buildkit/client" "github.com/moby/buildkit/cmd/buildctl/build" diff --git a/pkg/build/utils/platform.go b/pkg/build/utils/platform.go index 50f50f35..a4de47da 100644 --- a/pkg/build/utils/platform.go +++ b/pkg/build/utils/platform.go @@ -19,7 +19,7 @@ package utils import ( "sort" - "github.com/containerd/containerd/platforms" + "github.com/containerd/platforms" ocispecs "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/pkg/resolver/resolver.go b/pkg/resolver/resolver.go index 38067870..82427645 100644 --- a/pkg/resolver/resolver.go +++ b/pkg/resolver/resolver.go @@ -20,7 +20,7 @@ import ( "context" "fmt" - "github.com/containerd/containerd/platforms" + "github.com/containerd/platforms" "github.com/google/uuid" "github.com/moby/buildkit/client/llb" "github.com/moby/buildkit/client/llb/sourceresolver" diff --git a/pkg/resolver/resolver_test.go b/pkg/resolver/resolver_test.go index bc6cf235..5462466e 100644 --- a/pkg/resolver/resolver_test.go +++ b/pkg/resolver/resolver_test.go @@ -20,7 +20,7 @@ import ( "context" "testing" - "github.com/containerd/containerd/platforms" + "github.com/containerd/platforms" "github.com/moby/buildkit/client/llb/sourceresolver" "github.com/opencontainers/go-digest"