Skip to content
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

Consistently version media types #347

Merged
merged 3 commits into from
Sep 30, 2016

Conversation

wking
Copy link
Contributor

@wking wking commented Sep 29, 2016

Version Descriptor and use .v1 for the layer media types defined in specs-go/v1/mediatype.go.

Fixes #338.

@philips
Copy link
Contributor

philips commented Sep 29, 2016

LGTM

Approved with PullApprove

@jonboulle
Copy link
Contributor

Build is broken.

The media type (application/vnd.oci.descriptor.v1+json) is versioned,
so version the Go type.  I don't see anything else that we need to add
to descriptors, but it's probably better to be safe and version it
anyway ;).

Signed-off-by: W. Trevor King <wking@tremily.us>
These media types are defined in the versioned
specs-go/v1/mediatype.go, and we may conceivably adjust the layer spec
in the future.

Generated with:

  $ sed -i 's|application/vnd.oci.image.layer.tar|application/vnd.oci.image.layer.v1.tar|g' \
  >   $(git grep -l application/vnd.oci.image.layer.tar)
  $ sed -i 's|application/vnd.oci.image.layer.nondistributable.tar|application/vnd.oci.image.layer.nondistributable.v1.tar|g'
  >   $(git grep -l application/vnd.oci.image.layer.nondistributable.tar)

Signed-off-by: W. Trevor King <wking@tremily.us>
Generated with:

  $ make img/media-types.png

and Graphviz version 2.38.0.

Signed-off-by: W. Trevor King <wking@tremily.us>
@wking wking force-pushed the versioned-media-types branch from 7366057 to 4e31348 Compare September 30, 2016 14:28
@wking
Copy link
Contributor Author

wking commented Sep 30, 2016

On Fri, Sep 30, 2016 at 03:08:09AM -0700, Jonathan Boulle wrote:

Build is broken.

Ah, I'd forgotten to change the package name when moving descriptor.go
into v1/ 1. Fixed (and rebased onto the current master) with
73660574e31348.

@jonboulle
Copy link
Contributor

jonboulle commented Sep 30, 2016

lgtm

Approved with PullApprove

@philips
Copy link
Contributor

philips commented Sep 30, 2016

LGTM

Approved with PullApprove

@philips
Copy link
Contributor

philips commented Sep 30, 2016

other @opencontainers/image-spec-maintainers PTAL

@vbatts
Copy link
Member

vbatts commented Sep 30, 2016

LGTM

Approved with PullApprove

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants