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.

Sign up for GitHub

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

schema: Add descriptor tests and fix mediaType pattern #448

Merged
merged 2 commits into from
Jan 31, 2017
+217 −1
Merged

schema: Add descriptor tests and fix mediaType pattern #448

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bcb75b0
descriptor: Require RFC-6838-compliant mediaTypes
wking Nov 5, 2016
be553fb
schema/descriptor_test: Add descriptor tests
wking Nov 5, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
descriptor: Require RFC-6838-compliant mediaTypes 
Restore the MUST which was removed from the 15f9f74 version of this
commit.  My personal preference would be to just say:

  Values MUST comply with [RFC 6838][rfc6838].

But Stephen wanted a direct reference to 4.2 as well [1].

[1]: #448 (comment)

Signed-off-by: W. Trevor King <[email protected]>
@wking
wking committed Jan 25, 2017
commit bcb75b07e5dd1426c1e1a86b53de94c928e7cddd
5 changes: 4 additions & 1 deletion descriptor.md
View file
Original file line number Diff line number Diff line change
@@ -19,7 +19,8 @@ The following fields contain the primary properties that constitute a Descriptor

- **`mediaType`** *string*

This REQUIRED property contains the MIME type of the referenced content.
This REQUIRED property contains the media type of the referenced content.
Values MUST comply with [RFC 6838][rfc6838], including the [naming requirements in its section 4.2][rfc6838-s4.2].

The OCI image specification defines [several of its own MIME types](media-types.md) for resources defined in the specification.

@@ -139,4 +140,6 @@ In the following example, the descriptor indicates that the referenced manifest
```

[rfc3986]: https://tools.ietf.org/html/rfc3986
[rfc6838]: https://tools.ietf.org/html/rfc6838
[rfc6838-s4.2]: https://tools.ietf.org/html/rfc6838#section-4.2
[rfc7230-s2.7]: https://tools.ietf.org/html/rfc7230#section-2.7