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

Hello world! #1

Merged
merged 423 commits into from
Sep 15, 2016
Merged

Hello world! #1

merged 423 commits into from
Sep 15, 2016

Conversation

runcom
Copy link
Member

@runcom runcom commented Sep 14, 2016

This is moving from OCI/image-spec to this new repository - the relevant commit to review is f0a6243 (this commit is also splitting oci-image-tool in 3 new binaries as per opencontainers/image-spec#296)

Please, do add Travis CI.

This is keeping all the history from OCI/image-spec - I'll move out the issues from the spec tomorrow morning.

If something isn't really super correct and doesn't block this PR - I believe we can get this PR in and re-iterate in the following days.

@vbatts @philips PTAL

runcom and others added 30 commits June 15, 2016 11:03
As the refs are descriptors, the media-type is not strictly a manifest
or manifest-list.

Reported-by: W. Trevor King <[email protected]>
Signed-off-by: Vincent Batts <[email protected]>
Right now manifest is relying on the external Docker docs to explain the
digest format. Instead use the OCI Descriptor docs.

Signed-off-by: Brandon Philips <[email protected]>
This adds a test of the schema compatibility by taking the manifest of
library/docker from the docker hub, with sha256 digest verification, and
simply finding/replacing the four constant strings documented in
media-types.md and ensuring that it passes OCI validation.

https://github.com/opencontainers/image-spec/blob/master/media-types.md

This test is functionaly equivalent to downloading a Docker v2.2
manifest into the file `docker-manifest:

```
$ curl -L -H "Authorization: Bearer ..." \
	-H "Accept: application/vnd.docker.distribution.manifest.v2+json" \
	https://registry-1.docker.io/v2/library/docker/manifests/sha256fg:888206c77cd2811ec47e752ba291e5b7734e3ef137dfd222daadaca39a9f17bc > docker-manifest
```

And then running a regex to change `docker.distribution` to `oci.image`
and changing `v2` to `v1`

```
$ cat docker-manifest | sed -e "s%docker\.distribution%oci\.image%g" -e "s%v2%v1%g" > oci-manifest
```

And finally testing the manifest with oci-image-tool:

```
$ oci-image-tool validate oci-manifest
oci-manifest: OK
```

Signed-off-by: Brandon Philips <[email protected]>
These quasi-entities (which are missing the usual closing semicolon)
have been floating around since c22ca79 (serialization: docker v1
image format media type, 2016-04-04, #6).

Generated with:

  $ sed -i 's/&lt/</;s/&gt/>/' $(git grep -l [email protected])

Signed-off-by: W. Trevor King <[email protected]>
*: Fix '&lt' -> '<' and '&gt' -> '>' typos
serialization: add language about whiteout
Signed-off-by: Antonio Murdaca <[email protected]>
media-types.md: fix typo
image-layout: clarify refs can be generic
manifest: use descriptor doc as canonical source
schema: add a docker v2.2 backwards compat test
Signed-off-by: Antonio Murdaca <[email protected]>
Signed-off-by: Antonio Murdaca <[email protected]>
Signed-off-by: Antonio Murdaca <[email protected]>
DiffIDs and Manifest list digests were a bit confusing. Explain the
difference.

Fixes: #115
Signed-off-by: Brandon Philips <[email protected]>
manifest: explain schemaVersion == 2
Makefile: fix fmt target and format json files
schema: update from updated esc command
test: manifest list backward compatibility
This is a spec change based on testing live Docker Hub configs. Volume
may be null as found in the hub.docker.com/library/docker image.

Signed-off-by: Brandon Philips <[email protected]>
@wking
Copy link
Contributor

wking commented Sep 14, 2016

On Wed, Sep 14, 2016 at 11:39:20AM -0700, Antonio Murdaca wrote:

This is moving from OCI/image-spec to this new repository…

How was this branch created? I expect we want to merge
project-template and image-spec, and then remove the spec-only stuff.
Preserving project-template's commit history makes life easier for Git
when we pull in future project-templates updates (e.g. if
opencontainers/project-template#18 lands). Preserving the image-spec
history makes it easy to audit the split ;).

@runcom
Copy link
Member Author

runcom commented Sep 14, 2016

This was created from the image-spec

@philips
Copy link
Contributor

philips commented Sep 14, 2016

@wking I am guessing git filter-branch

@runcom
Copy link
Member Author

runcom commented Sep 14, 2016

@wking the split is just 1 commit not sure what you need to audit exactly

@runcom
Copy link
Member Author

runcom commented Sep 14, 2016

Also, I don't have commit access to this repo so if anyone would/could, he can pick up image-spec, apply my latest commit from this PR and push force to this repo to preserve commit history. Otherwise github isn't letting me create a PR from totally different branch with nothing in common.

@wking
Copy link
Contributor

wking commented Sep 14, 2016

On Wed, Sep 14, 2016 at 12:01:57PM -0700, Antonio Murdaca wrote:

Otherwise github isn't letting me create a PR from totally different
branch with nothing in common.

You can merge this repo into your external history (that's what I did
in opencontainers/project-template#3).

*: rename serialization.md -> config.md
@runcom
Copy link
Member Author

runcom commented Sep 14, 2016

@wking how about now?

@philips
Copy link
Contributor

philips commented Sep 14, 2016

LGTM

@caniszczyk
Copy link
Contributor

FYI: I also just enabled Travis CI here too

@runcom
Copy link
Member Author

runcom commented Sep 14, 2016

FYI: I also just enabled Travis CI here too

thanks Chris!

@wking
Copy link
Contributor

wking commented Sep 14, 2016

On Wed, Sep 14, 2016 at 01:01:22PM -0700, Antonio Murdaca wrote:

@wking how about now?

9554306 looks pretty good to me. It's just missing a merge from
project-template 1.

@runcom
Copy link
Member Author

runcom commented Sep 14, 2016

@wking I merged project-templace as well now, but CI is failing on some DCO's and whitespaces in .gitvalidation on merge commits - what do we do?

@wking
Copy link
Contributor

wking commented Sep 14, 2016

On Wed, Sep 14, 2016 at 02:19:23PM -0700, Antonio Murdaca wrote:

@wking I merged project-templace as well now

Looks pretty good to me. Minor nits:

  • 6a8fd3b adds a ‘TODO(runcom)’ to HACKING.md. I'd rather just drop
    HACKING.md now that it's mostly empty. You may want to put your
    tweak-commit after all the merges to make rerolling around those
    merges.
  • 6a8fd3b adds ‘tools’ to the Makefile but does not document it in
    the ‘help’ target.
  • 6a8fd3b uses oci-validate, etc., but I would prefer
    oci-image-validate, etc. to avoid conflicts or ambiguity with
    ocitools (which, since Rename ocitools to oci-runtime-tool runtime-tools#212 is
    installing oci-runtime-tool).

* origin/master:
  Initial commit
* pt/master: (32 commits)
  GOVERNANCE.md: fix typo
  GOVERNANCE and RELEASES: split the files
  project-governance: Make voting more generic
  proposals: release approval process explain security@ email
  proposal: fix a typo
  proposals: release-approval-process fix a grammar thing
  release-approval: Add non-spec unanimous quorum reduction
  release-approval: Shuffle to make more DRY
  proposals: release-approval-process: fixup additional typos
  proposals: release approval process: improve REJECT feedback
  proposals: release approval process: add information to projects
  proposals: release approval process: add language about mailing list
  proposals: release approval process: add quorum language
  proposals: release-approval-process: add voting members language
  proposals: release approval process: clarify utility of GitHub
  proposals: release approval process: use consistent language for rejects
  proposals: release approval process: one month pre-releases
  proposals: release approval process 3 rcs required
  proposals: release approval process to one week for apps
  proposal: release-approval-process add some motivation
  ...
@runcom
Copy link
Member Author

runcom commented Sep 15, 2016

@wking @philips @vbatts should be good to go

@vbatts
Copy link
Member

vbatts commented Sep 15, 2016

loads of DCO missing, and whitespace checks fail. and the build fails (make tools).
...
but LGTM as a first PR ;-)

@runcom
Copy link
Member Author

runcom commented Sep 15, 2016

and the build fails (make tools).

ooh I'll fix this one before merging (weird)

@vbatts about the DCO and whitespaces, not sure what should I do.

@philips
Copy link
Contributor

philips commented Sep 15, 2016

LGTM

@caniszczyk can you just override the DCO thing, those mistakes were made long ago and not really fixable.

P.S. Can we get rid of the DCO, it is sooooo silly.

@vbatts
Copy link
Member

vbatts commented Sep 15, 2016

LGTM

@vbatts vbatts merged commit 853746e into opencontainers:master Sep 15, 2016
@runcom
Copy link
Member Author

runcom commented Sep 15, 2016

make tools has been fixed though! https://travis-ci.org/opencontainers/image-tools/jobs/160157208#L288

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.