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 <github@gone.nl>
| ... | ... |
@@ -15,6 +15,7 @@ import ( |
| 15 | 15 |
"github.com/docker/docker/integration-cli/cli/build" |
| 16 | 16 |
"github.com/docker/docker/internal/lazyregexp" |
| 17 | 17 |
"github.com/opencontainers/go-digest" |
| 18 |
+ ocispec "github.com/opencontainers/image-spec/specs-go/v1" |
|
| 18 | 19 |
"gotest.tools/v3/assert" |
| 19 | 20 |
is "gotest.tools/v3/assert/cmp" |
| 20 | 21 |
"gotest.tools/v3/skip" |
| ... | ... |
@@ -518,7 +519,7 @@ func (s *DockerRegistrySuite) TestPullFailsWithAlteredManifest(t *testing.T) {
|
| 518 | 518 |
// Load the target manifest blob. |
| 519 | 519 |
manifestBlob := s.reg.ReadBlobContents(t, manifestDigest) |
| 520 | 520 |
|
| 521 |
- var imgManifest schema2.Manifest |
|
| 521 |
+ var imgManifest ocispec.Manifest |
|
| 522 | 522 |
err = json.Unmarshal(manifestBlob, &imgManifest) |
| 523 | 523 |
assert.NilError(t, err, "unable to decode image manifest from blob") |
| 524 | 524 |
|