From fd47ccef7bf3a81c3af8f89952aa49de3db25d3d Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sat, 5 Jul 2025 17:52:48 +0200 Subject: [PATCH] integration-cli: TestPullFailsWithAlteredManifest: use OCI manifest The OCI types should be able to unmarshal the image manifest (regardless if it was created from the legacy distribution types or otherwise), so we can drop the use of the legacy distribution types here. Signed-off-by: Sebastiaan van Stijn --- integration-cli/docker_cli_by_digest_test.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/integration-cli/docker_cli_by_digest_test.go b/integration-cli/docker_cli_by_digest_test.go index 354fb78841..ea77374efd 100644 --- a/integration-cli/docker_cli_by_digest_test.go +++ b/integration-cli/docker_cli_by_digest_test.go @@ -15,6 +15,7 @@ import ( "github.com/docker/docker/integration-cli/cli/build" "github.com/docker/docker/internal/lazyregexp" "github.com/opencontainers/go-digest" + ocispec "github.com/opencontainers/image-spec/specs-go/v1" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/skip" @@ -518,7 +519,7 @@ func (s *DockerRegistrySuite) TestPullFailsWithAlteredManifest(t *testing.T) { // Load the target manifest blob. manifestBlob := s.reg.ReadBlobContents(t, manifestDigest) - var imgManifest schema2.Manifest + var imgManifest ocispec.Manifest err = json.Unmarshal(manifestBlob, &imgManifest) assert.NilError(t, err, "unable to decode image manifest from blob")