Merge pull request #48712 from thaJeztah/27.x_backport_keep_manifest_order

thaJeztah · web-flow · commit e041d7679661 · 2024-10-21T13:17:54.000+02:00
[27.x backport] api: GET /images/json: preserve original manifest order
diff --git a/daemon/containerd/image_list.go b/daemon/containerd/image_list.go
@@ -248,13 +248,7 @@ func (i *ImageService) imageSummary(ctx context.Context, img images.Image, platf
 
 		if opts.Manifests {
 			defer func() {
-				// If the platform is available, prepend it to the list of platforms
-				// otherwise append it at the end.
-				if available {
-					manifestSummaries = append([]imagetypes.ManifestSummary{mfstSummary}, manifestSummaries...)
-				} else {
-					manifestSummaries = append(manifestSummaries, mfstSummary)
-				}
+				manifestSummaries = append(manifestSummaries, mfstSummary)
 			}()
 		}
 
diff --git a/daemon/containerd/image_list_test.go b/daemon/containerd/image_list_test.go
@@ -247,11 +247,11 @@ func TestImageList(t *testing.T) {
 
 				assert.Check(t, is.Equal(i.Manifests[0].Kind, imagetypes.ManifestKindImage))
 				if assert.Check(t, i.Manifests[0].ImageData != nil) {
-					assert.Check(t, is.Equal(i.Manifests[0].ImageData.Platform.Architecture, "arm64"))
+					assert.Check(t, is.Equal(i.Manifests[0].ImageData.Platform.Architecture, "amd64"))
 				}
 				assert.Check(t, is.Equal(i.Manifests[1].Kind, imagetypes.ManifestKindImage))
 				if assert.Check(t, i.Manifests[1].ImageData != nil) {
-					assert.Check(t, is.Equal(i.Manifests[1].ImageData.Platform.Architecture, "amd64"))
+					assert.Check(t, is.Equal(i.Manifests[1].ImageData.Platform.Architecture, "arm64"))
 				}
 			},
 		},

Original file line number	Diff line number	Diff line change
`@@ -247,11 +247,11 @@ func TestImageList(t *testing.T) {`
`247`	`247`
`248`	`248`	`assert.Check(t, is.Equal(i.Manifests[0].Kind, imagetypes.ManifestKindImage))`
`249`	`249`	`if assert.Check(t, i.Manifests[0].ImageData != nil) {`
`250`		`- assert.Check(t, is.Equal(i.Manifests[0].ImageData.Platform.Architecture, "arm64"))`
	`250`	`+ assert.Check(t, is.Equal(i.Manifests[0].ImageData.Platform.Architecture, "amd64"))`
`251`	`251`	`}`
`252`	`252`	`assert.Check(t, is.Equal(i.Manifests[1].Kind, imagetypes.ManifestKindImage))`
`253`	`253`	`if assert.Check(t, i.Manifests[1].ImageData != nil) {`
`254`		`- assert.Check(t, is.Equal(i.Manifests[1].ImageData.Platform.Architecture, "amd64"))`
	`254`	`+ assert.Check(t, is.Equal(i.Manifests[1].ImageData.Platform.Architecture, "arm64"))`
`255`	`255`	`}`
`256`	`256`	`},`
`257`	`257`	`},`