New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[release/1.5] go.mod github.com/opencontainers/image-spec v1.0.2 #6264
Conversation
Build succeeded.
|
e5291fe
to
0a7abd4
Compare
Build succeeded.
|
images/converter/default.go
Outdated
// Deprecated | ||
type ObjectWithMediaType struct { | ||
// MediaType appears on Docker manifests and manifest lists. | ||
// MediaType does not appear on OCI manifests and index | ||
MediaType string `json:"mediaType,omitempty"` | ||
} | ||
|
||
// DualManifest covers Docker manifest and OCI manifest | ||
// Deprecated: use github.com/opencontainers/image-spec/specs-go/v1.Manifest | ||
type DualManifest struct { | ||
ocispec.Manifest | ||
ObjectWithMediaType | ||
} | ||
|
||
// DualIndex covers Docker manifest list and OCI index | ||
// Deprecated: use github.com/opencontainers/image-spec/specs-go/v1.Index | ||
type DualIndex struct { | ||
ocispec.Index | ||
ObjectWithMediaType | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Heads up; i had to make changes here, because the existing type's MediaType
conflicted with the re-added MediaType
in the image-spec; see #6263 (comment)
# github.com/containerd/containerd/images/converter
images/converter/default.go:162:33: ambiguous selector manifest.MediaType
images/converter/default.go:163:11: ambiguous selector manifest.MediaType
images/converter/default.go:244:30: ambiguous selector index.MediaType
images/converter/default.go:245:8: ambiguous selector index.MediaType
make: *** [Makefile:227: bin/ctr] Error 2
consumers of the containerd modules may run into this if they update the image-spec module
Let me mark this as draft until we merge the master PR #6263 |
- Bring mediaType out of reserved status - specs-go: adding mediaType to the index and manifest structures full diff: opencontainers/image-spec@v1.0.1...v1.0.2 This also contains the local changes from commit fc81384, which fix conflicts between the types that were used locally (which added MediaType) and the re-introduced MediaType field in the image-spec. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
0a7abd4
to
7ab5252
Compare
#6263 was merged, so let me move this out of draft |
Build succeeded.
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
full diff: opencontainers/image-spec@v1.0.1...v1.0.2
This also contains the local changes from commit fc81384 (#6263),
which fix conflicts between the types that were used locally (which added MediaType)
and the re-introduced MediaType field in the image-spec.