Skip to content

Commit

Permalink
Merge pull request #106 from carolynvs/rename-master
Browse files Browse the repository at this point in the history
Rename master to main
  • Loading branch information
silvin-lubecki authored Feb 9, 2021
2 parents 00159a9 + 17a93f8 commit c859986
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@ When you are asked to cut a new release, here is the process:
- Bump the build segment (version-prerelease.BUILDTAG+releasename) if you only
fixed something in the build, but the final binaries are the same.

1. Ensure that the master CI build is passing, then make the tag and push it.
1. Ensure that the CI build is passing, then make the tag and push it.

```
git checkout master
git checkout main
git pull
git tag VERSION -a -m ""
git push --tags
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[![CircleCI](https://circleci.com/gh/cnabio/cnab-to-oci/tree/master.svg?style=svg)](https://circleci.com/gh/cnabio/cnab-to-oci/tree/master) [![Documentation](https://godoc.org/github.com/cnabio/cnab-to-oci/remotes?status.svg)](http://godoc.org/github.com/cnabio/cnab-to-oci/remotes)
[![CircleCI](https://circleci.com/gh/cnabio/cnab-to-oci/tree/main.svg?style=svg)](https://circleci.com/gh/cnabio/cnab-to-oci/tree/main) [![Documentation](https://godoc.org/github.com/cnabio/cnab-to-oci/remotes?status.svg)](http://godoc.org/github.com/cnabio/cnab-to-oci/remotes)

# CNAB to OCI

Expand All @@ -10,7 +10,7 @@ CNAB using an OCI or Docker registry.
## Rationale for this approach

Goals:
- Package the information from a CNAB [`bundle.json`](https://github.com/deislabs/cnab-spec/blob/master/101-bundle-json.md) into a format that can be stored in container registries.
- Package the information from a CNAB [`bundle.json`](https://github.com/deislabs/cnab-spec/blob/main/101-bundle-json.md) into a format that can be stored in container registries.
- Require no or only minor changes to the [OCI specification](https://github.com/opencontainers/image-spec).
- Major changes would take long to get approved.
- Anything that diverges from the current specification will require coordination with registries to ensure compatibility.
Expand All @@ -27,9 +27,9 @@ Non-goals:
### Selection of OCI index

The CNAB specification references a
[list of invocation images](https://github.com/deislabs/cnab-spec/blob/master/101-bundle-json.md#invocation-images)
[list of invocation images](https://github.com/deislabs/cnab-spec/blob/main/101-bundle-json.md#invocation-images)
and a
[map of other images](https://github.com/deislabs/cnab-spec/blob/master/101-bundle-json.md#the-image-map).
[map of other images](https://github.com/deislabs/cnab-spec/blob/main/101-bundle-json.md#the-image-map).
An [OCI index](#what-is-an-oci-index) is already used for handling multiple
images so this was seen as a natural fit.

Expand Down

0 comments on commit c859986

Please sign in to comment.