Skip to content

Consistently version media types - #347

Merged
philips merged 3 commits into
opencontainers:masterfrom
wking:versioned-media-types
Sep 30, 2016
Merged

Consistently version media types#347
philips merged 3 commits into
opencontainers:masterfrom
wking:versioned-media-types

Conversation

@wking

@wking wking commented Sep 29, 2016

Copy link
Copy Markdown
Contributor

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

Fixes #338.

@philips

philips commented Sep 29, 2016

Copy link
Copy Markdown
Contributor

LGTM

Approved with PullApprove

@jonboulle

Copy link
Copy Markdown
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

wking commented Sep 30, 2016

Copy link
Copy Markdown
Contributor Author

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

jonboulle commented Sep 30, 2016

Copy link
Copy Markdown
Contributor

lgtm

Approved with PullApprove

@philips

philips commented Sep 30, 2016

Copy link
Copy Markdown
Contributor

LGTM

Approved with PullApprove

@philips

philips commented Sep 30, 2016

Copy link
Copy Markdown
Contributor

other @opencontainers/image-spec-maintainers PTAL

@vbatts

vbatts commented Sep 30, 2016

Copy link
Copy Markdown
Member

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