frontend/dockerui/build: fix "no scan targets for linux/arm64/v8"

AkihiroSuda · AkihiroSuda · commit 57ab179e6012 · 2025-04-29T23:50:11.000+09:00
Fix issue 5915

Signed-off-by: Akihiro Suda &lt;akihiro.suda.cz@hco.ntt.co.jp&gt;
diff --git a/frontend/dockerui/build.go b/frontend/dockerui/build.go
@@ -128,9 +128,15 @@ func extendWindowsPlatform(p, imgP ocispecs.Platform) ocispecs.Platform {
 }
 
 func normalizePlatform(p, imgP ocispecs.Platform) exptypes.Platform {
-	k := platforms.FormatAll(p)
-	p = extendWindowsPlatform(p, imgP)
-	p = platforms.Normalize(p)
+	var k string
+	if p.OS == "windows" {
+		k = platforms.FormatAll(p)
+		p = extendWindowsPlatform(p, imgP)
+		p = platforms.Normalize(p)
+	} else {
+		p = platforms.Normalize(p)
+		k = platforms.FormatAll(p)
+	}
 	return exptypes.Platform{
 		ID:       k,
 		Platform: p,
diff --git a/frontend/dockerui/build_test.go b/frontend/dockerui/build_test.go
@@ -0,0 +1,40 @@
+package dockerui
+
+import (
+	"testing"
+
+	"github.com/moby/buildkit/exporter/containerimage/exptypes"
+	ocispecs "github.com/opencontainers/image-spec/specs-go/v1"
+	"github.com/stretchr/testify/require"
+)
+
+func TestNormalizePlatform(t *testing.T) {
+	testCases := []struct {
+		p, imgP  ocispecs.Platform
+		expected exptypes.Platform
+	}{
+		{
+			p: ocispecs.Platform{
+				Architecture: "arm64",
+				OS:           "linux",
+				Variant:      "v8",
+			},
+			imgP: ocispecs.Platform{
+				Architecture: "arm64",
+				OS:           "linux",
+			},
+			expected: exptypes.Platform{
+				ID: "linux/arm64", // Not "linux/arm64/v8" https://github.com/moby/buildkit/issues/5915
+				Platform: ocispecs.Platform{
+					Architecture: "arm64",
+					OS:           "linux",
+				},
+			},
+		},
+		// TODO: cover Windows https://github.com/moby/buildkit/pull/5837
+	}
+
+	for _, tc := range testCases {
+		require.Equal(t, tc.expected, normalizePlatform(tc.p, tc.imgP))
+	}
+}
