Skip to content

Commit 34046f7

Browse files
authored
Merge pull request #56 from vsoch/update/CoC-link
Update Code of Conduct Links
2 parents 7a7eec4 + 2eda8f4 commit 34046f7

File tree

7 files changed

+30
-77
lines changed

7 files changed

+30
-77
lines changed

README.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,20 @@ In various situations ([2.c, 6.h, 6.j, 6.n](https://www.opencontainers.org/about
3232

3333
TOB members can either respond "agree, yes, +1", "disagree, no, -1", or "abstain". A vote passes with two-thirds vote of votes cast. An abstain vote equals not voting at all.
3434

35+
## Code of Conduct
36+
37+
Participation in the OpenContainers community is governed by [OpenContainer's Code of Conduct][code-of-conduct].
38+
39+
## Security
40+
41+
If you find an issue, please follow the [security][security] protocol to report it.
42+
3543
## Meeting Minutes
3644

3745
* [Feb 23rd, 2016](https://docs.google.com/presentation/d/1thxH4PVmHZO3kWrrLL6H1jAhL4r31Zy8xn8wg1LCmjY/edit#slide=id.p3)
3846
* [Mar 4th, 2016](https://docs.google.com/presentation/d/1sHnTyM5S9IGt4jmdlI2D6dzl_8EBSIaRD0oNvmu7ILQ/edit?ts=56d86a8b#slide=id.p3)
3947
* [Mar 18th, 2016](https://docs.google.com/presentation/d/1tANha5hGnOiMh7DAfVhJ5fNwFLXd0iAqrYLGmPZu94I/edit#slide=id.g11f2d5d0f8_4_4)
48+
49+
50+
[security]: https://github.com/opencontainers/org/blob/master/security
51+
[code-of-conduct]: https://github.com/opencontainers/org/blob/master/CODE_OF_CONDUCT.md

code-of-conduct.md

Lines changed: 0 additions & 64 deletions
This file was deleted.

proposals/digest.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Initial maintainers of the go-digest project would be seeded from the image-spec
2323
* Vincent Batts <[email protected]> (@vbatts)
2424

2525
### Code of Conduct
26-
This project would incorporate (by reference) the OCI Code of Conduct.
26+
This project would incorporate (by reference) the OCI [Code of Conduct][code-of-conduct].
2727

2828
### Governance and Releases
2929
This project would incorporate the Governance and Releases processes from the OCI project template: https://github.com/opencontainers/project-template.
@@ -47,3 +47,4 @@ It will provide digesting functionality for all present and future versions of t
4747
A: No. Nothing in this proposal is intended to amend the OCI Charter (https://www.opencontainers.org/about/governance) or OCI Scope Table (https://www.opencontainers.org/about/oci-scope-table).
4848

4949
[image-spec-486]: https://github.com/opencontainers/image-spec/pull/486
50+
[code-of-conduct]: https://github.com/opencontainers/org/blob/master/CODE_OF_CONDUCT.md

proposals/distribution.md

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Additional Maintainers to consider:
3737

3838
## Code of Conduct
3939

40-
This project would incorporate (by reference) the OCI Code of Conduct ([https://github.com/opencontainers/tob/blob/master/code-of-conduct.md](https://github.com/opencontainers/tob/blob/master/code-of-conduct.md)).
40+
This project would incorporate (by reference) the OCI [Code of Conduct][code-of-conduct].
4141

4242
## Governance and Releases
4343

@@ -77,7 +77,7 @@ The following scope entries should be removed from the [scope table][scope]:
7777

7878
The following entries should be added to the [scope table][scope]:
7979

80-
* Specifying authentication and authorization schemes.
80+
* "Specifying authentication and authorization schemes".
8181
Docker's current registry uses an [extension][token] of the [`Bearer`][rfc6750] [auth scheme][rfc7235-s2.1].
8282
Work on specifying Docker's scheme will continue independently, and is orthogonal to the registry API.
8383

@@ -87,7 +87,7 @@ The following entries should be added to the [scope table][scope]:
8787
* Description: Defining protocols for authenticating and authorizing distribution access.
8888
* Why: As an HTTP-based protocol, clients and servers can negotiate authentication via HTTP's [challenge-response authentication framework][rfc7235-s2.1].
8989

90-
* Creating a reference spec for optional DNS based naming and discovery.
90+
* "Creating a reference spec for optional DNS based naming and discovery".
9191
Discovery and registry protocols are completely separate and do not need to be added together.
9292
This entry replaces part of the previous “Creating Reference spec for optional DNS based naming & distribution” entry.
9393

@@ -100,14 +100,14 @@ The following entries should be added to the [scope table][scope]:
100100
There are many good use cases for DNS based distribution, but not all use cases support this.
101101
Furthermore, encoding the location of a bundle into the bundle can cause issues with downloads from alternate locations other than the origin specified in the name.
102102

103-
* Specifying a distribution method.
104-
This entry replaces part of the previous Creating Reference spec for optional DNS based naming & distribution and Standardizing on a particular Distribution method entries.
103+
* "Specifying a distribution method".
104+
This entry replaces part of the previous "Creating Reference spec for optional DNS based naming & distribution" and "Standardizing on a particular Distribution method" entries.
105105

106-
Tag-listing (e.g. “what named manifests are in `library/busybox`?) endpoints are in scope and required for backwards compatibility with clients.
106+
Tag-listing (e.g. "What named manifests are in `library/busybox`?") endpoints are in scope and required for backwards compatibility with clients.
107107
An endpoint for listing image repository names within a registry is considered out of scope for this specification.
108108

109109
Managing the grouping of image repository names is considered part of distribution policy or content management, which are out of scope.
110-
For example, “which image repositories are under `library/`? is out of scope for this project.
110+
For example, "Which image repositories are under `library/`?" is out of scope for this project.
111111

112112
* What: Specifying a distribution method
113113
* In/Out/Future: In scope
@@ -116,7 +116,7 @@ The following entries should be added to the [scope table][scope]:
116116
* Why: This specification will provide one (of possibly many) distribution specifications.
117117
Alternative distribution specifications may be developed for uses cases not covered by this specification, but defining them is currently out of scope for the OCI.
118118

119-
* Retrieving image content by its content-addressable hash.
119+
* "Retrieving image content by its content-addressable hash".
120120
Docker's registry API already provides [endpoints for fetching manifest objects by digest][get-manifest].
121121
Docker's registry API does not currently provide endpoints for fetching [image-index][] objects by digest, but this is the project where that will happen.
122122

@@ -129,7 +129,7 @@ The following entries should be added to the [scope table][scope]:
129129

130130
The following entries should remain in the [scope table][scope] but not be addressed by this project:
131131

132-
* Specifying way to attach signatures.
132+
* "Specifying way to attach signatures".
133133
We don't need to address this as part of distribution, because all resources are content-addressable and can be signed in external systems.
134134

135135
## Related GitHub Issues
@@ -139,6 +139,7 @@ The following entries should remain in the [scope table][scope] but not be addre
139139

140140
[api.md]: https://github.com/docker/distribution/blob/5cb406d511b7b9163bff9b6439072e4892e5ae3b/docs/spec/api.md
141141
[catalog]: https://github.com/docker/distribution/blob/5cb406d511b7b9163bff9b6439072e4892e5ae3b/docs/spec/api.md#catalog
142+
[code-of-conduct]: https://github.com/opencontainers/org/blob/master/CODE_OF_CONDUCT.md
142143
[get-manifest]: https://github.com/docker/distribution/blob/5cb406d511b7b9163bff9b6439072e4892e5ae3b/docs/spec/api.md#pulling-an-image-manifest
143144
[image-spec]: https://github.com/opencontainers/image-spec/
144145
[image-index]: https://github.com/opencontainers/image-spec/blob/v1.0.1/image-index.md

proposals/image-format/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,4 +53,3 @@ A: Existing formats can continue to be a proving ground for technologies, as nee
5353
* Release version of spec with improvements from two independent experimental implementations from OCI members e.g. Amazon Container Registry and rkt
5454
* June ??? v1.0.0
5555
* Release initial version of spec with two independent non-experimental implementations from OCI members
56-

proposals/selinux.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Initial maintainers of the go-selinux project would be:
2525
* Stephen Smalley <[email protected]> (@stephensmalley)
2626

2727
### Code of Conduct
28-
This project would incorporate (by reference) the OCI Code of Conduct.
28+
This project would incorporate (by reference) the OCI [Code of Conduct][code-of-conduct].
2929

3030
### Governance and Releases
3131
This project would incorporate the Governance and Releases processes from the OCI project template: https://github.com/opencontainers/project-template.
@@ -55,3 +55,5 @@ A: There's no versioning of selinux in run. For instance, we fixed something in
5555
*Q: Who are the other target users of go-selinux?*
5656

5757
A: docker, rkt, CRI-O, kubernetes, any other project out there requiring a dedicated selinux library.
58+
59+
[code-of-conduct]: https://github.com/opencontainers/org/blob/master/CODE_OF_CONDUCT.md

proposals/tools.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Initial maintainers of the image-tools project shall be:
3434
* Maintainers of the image-spec project
3535

3636
### Code of Conduct
37-
Both of the proposed projects would incorporate (by reference) the OCI Code of Conduct
37+
Both of the proposed projects would incorporate (by reference) the OCI [Code of Conduct][code-of-conduct].
3838

3939
### Governance and Releases
4040
Both of the proposed projects would incorporate the Governance and Releases processes from the OCI project template: https://github.com/opencontainers/project-template.
@@ -84,3 +84,5 @@ A: Yes. If there is other code or functionality that a contributor believes wou
8484
**Q: Does this change the OCI Charter or Scope Table?**
8585

8686
A: No. Nothing in this proposal is intended to amend the OCI Charter (https://www.opencontainers.org/about/governance) or OCI Scope Table (https://www.opencontainers.org/about/oci-scope-table).
87+
88+
[code-of-conduct]: https://github.com/opencontainers/org/blob/master/CODE_OF_CONDUCT.md

0 commit comments

Comments
 (0)