diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9cd1543..48c2a0d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -14,10 +14,10 @@ We are really glad you are reading this, because we need volunteer developers to * [More about labels](#more-about-labels) * [Pull Requests](#pull-requests) * [Resolving Conflicts by Rebasing](#resolving-conflicts-by-rebasing) - * [Avoiding Issues with the Commit Sign-off](#avoiding-issues-with-the-commit-sign-off) * [Reviews](#reviews) * [Commit convention](#commit-convention) * [Coding Guidelines](#coding-guidelines) +* [Licensing Guidelines](#licensing-guidelines) * [Developer Certificate Of Origin](#developer-certificate-of-origin) * [Contributor of the month](#contributor-of-the-month) * [How do I become a maintainer?](#how-do-i-become-a-maintainer) @@ -193,6 +193,11 @@ git push --force-with-lease If you have any questions or run into any issues, feel free to reach out to our community for support. +### Reviews + +Reviewing a pull request is also a very good way of contributing. + +If you want to review PR often to help the project, you may want to be recognized as a reviewer. You can find more info on becoming a reviewer [here](https://github.com/falcosecurity/evolution/blob/main/MAINTAINERS_GUIDELINES.md#onboarding-a-reviewer). ### Commit convention @@ -211,7 +216,17 @@ This is handled on a per-repository basis. However, general guidelines are assum - reference guidelines of the code language used should be followed; - significant functionality should come with appropriate testing to be run in the automated test suite; -- if third-party code is used, all licenses must be preserved and be compatible with our [licensing requirements](https://github.com/falcosecurity/evolution/blob/main/GOVERNANCE.md#license). +- [licensing guidelines](#licensing-guidelines) must be followed. +## Licensing Guidelines + +The following guidelines apply to all repositories under the `falcosecurity` organization: + +- our Governance's [licensing requirements](https://github.com/falcosecurity/evolution/blob/main/GOVERNANCE.md#license) must be respected; +- unless otherwise specified, all code must be licensed under the [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0); +- each repository must have a `LICENSE` file in its root folder; +- all new inbound code contributions must be signed off with the [Developer Certificate of Origin](#developer-certificate-of-origin); +- all source file headers must include the corresponding [SPDX license identifier](https://spdx.dev/ids); +- if third-party code is used, their licenses must be vetted to ensure compatibility with our [licensing requirements](https://github.com/falcosecurity/evolution/blob/main/GOVERNANCE.md#license). ## Developer Certificate Of Origin @@ -239,13 +254,7 @@ to add the sign-off with the following command, which can then be force pushed. git commit --amend -s ``` -We use [@poiana](https://github.com/poiana) to enforce the DCO on each pull request and branch commits of every `falcosecurity` respository. - -### Reviews - -Reviewing a pull request is also a very good way of contributing. - -If you want to review PR often to help the project, you may want to be recognized as a reviewer. You can find more info on becoming a reviewer [here](https://github.com/falcosecurity/evolution/blob/main/MAINTAINERS_GUIDELINES.md#onboarding-a-reviewer). +We use [@poiana](https://github.com/poiana) to enforce the DCO on each pull request and branch commits of every `falcosecurity` respository ## Contributor of the month