[release/1.5] go.mod github.com/opencontainers/image-spec v1.0.2#6264
Merged
estesp merged 1 commit intocontainerd:release/1.5from Dec 10, 2021
Merged
[release/1.5] go.mod github.com/opencontainers/image-spec v1.0.2#6264estesp merged 1 commit intocontainerd:release/1.5from
estesp merged 1 commit intocontainerd:release/1.5from
Conversation
|
Build succeeded.
|
thaJeztah
force-pushed
the
1.5_bump_oci_spec
branch
from
e5291fe to
0a7abd4
Compare
|
Build succeeded.
|
thaJeztah
commented
Nov 18, 2021
Comment on lines
+352
to
366
| // 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 | ||
| } |
Member
Author
There was a problem hiding this comment.
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
Member
|
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 <[email protected]>
thaJeztah
force-pushed
the
1.5_bump_oci_spec
branch
from
0a7abd4 to
7ab5252
Compare
Member
Author
|
#6263 was merged, so let me move this out of draft |
AkihiroSuda
approved these changes
Dec 10, 2021
|
Build succeeded.
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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.