From aa28c320f145a4df839e993c6ffa0e991291dba4 Mon Sep 17 00:00:00 2001 From: Solomon Hykes Date: Sun, 9 Nov 2014 15:16:19 +0000 Subject: [PATCH 1/3] Improve "security reports" section in contribution docs. Signed-off-by: Solomon Hykes Upstream-commit: 543127e211ce60b53d554199fdbbd3fe7b85c1c6 Component: engine --- components/engine/CONTRIBUTING.md | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/components/engine/CONTRIBUTING.md b/components/engine/CONTRIBUTING.md index de6434c221..93ff8d8799 100644 --- a/components/engine/CONTRIBUTING.md +++ b/components/engine/CONTRIBUTING.md @@ -6,17 +6,25 @@ feels wrong or incomplete. ## Topics -* [Security Reports](#security-reports) +* [Reporting Security Issues](#reporting-security-issues) * [Design and Cleanup Proposals](#design-and-cleanup-proposals) * [Reporting Issues](#reporting-issues) * [Build Environment](#build-environment) * [Contribution Guidelines](#contribution-guidelines) * [Community Guidelines](#docker-community-guidelines) -## Security Reports +## Reporting Security Issues -Please **DO NOT** file an issue for security related issues. Please send your -reports to [security@docker.com](mailto:security@docker.com) instead. +The Docker maintainers take security very seriously. If you discover a security issue, +please bring it to their attention right away! + +Please send your report privately to [security@docker.com](mailto:security@docker.com), +please **DO NOT** file a public issue. + +Security reports are greatly appreciated and we will publicly thank you for it. We also +like to send gifts - if you're into Docker shwag make sure to let us know :) +We currently do not offer a paid security bounty program, but are not ruling it out in +the future. ## Design and Cleanup Proposals From 4c63170cabab54b057038459ac5ff9eb3db73616 Mon Sep 17 00:00:00 2001 From: Solomon Hykes Date: Sun, 9 Nov 2014 15:17:23 +0000 Subject: [PATCH 2/3] In contribution docs, emphasize that bug reports are appreciated! Signed-off-by: Solomon Hykes Upstream-commit: 2d688b0a787d6f38de244ed1294b0ed91c3533ba Component: engine --- components/engine/CONTRIBUTING.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/components/engine/CONTRIBUTING.md b/components/engine/CONTRIBUTING.md index 93ff8d8799..29a3ce1404 100644 --- a/components/engine/CONTRIBUTING.md +++ b/components/engine/CONTRIBUTING.md @@ -48,6 +48,10 @@ When considering a cleanup task, we are looking for: ## Reporting Issues +A great way to contribute to the project is to send a detailed report when you +encounter an issue. We always appreciate a well-written, thorough bug report, +and will thank you for it! + When reporting [issues](https://github.com/docker/docker/issues) on GitHub please include your host OS (Ubuntu 12.04, Fedora 19, etc). Please include: From a6ea5410ed19d2337318f65ed9a266ec79940b63 Mon Sep 17 00:00:00 2001 From: Solomon Hykes Date: Sun, 9 Nov 2014 15:33:19 +0000 Subject: [PATCH 3/3] Move GOVERNANCE.md to hack/ Signed-off-by: Solomon Hykes Upstream-commit: 4cf0aa711edf3692291766c1d84ec550431b79b2 Component: engine --- components/engine/{ => hack}/GOVERNANCE.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename components/engine/{ => hack}/GOVERNANCE.md (100%) diff --git a/components/engine/GOVERNANCE.md b/components/engine/hack/GOVERNANCE.md similarity index 100% rename from components/engine/GOVERNANCE.md rename to components/engine/hack/GOVERNANCE.md