From 2e1d4451ef9089ea6684ab8c6bc905035a2941ad Mon Sep 17 00:00:00 2001 From: Joe Ferguson Date: Thu, 12 May 2016 16:52:58 -0700 Subject: [PATCH] Remove mailing-list due to extra complexity --- .template-helpers/user-feedback.md | 4 ++-- README.md | 8 -------- aerospike/mailing-list.md | 1 - aerospike/user-feedback.md | 15 +++++++++++++++ centos/mailing-list.md | 1 - centos/user-feedback.md | 15 +++++++++++++++ fedora/mailing-list.md | 1 - fedora/user-feedback.md | 15 +++++++++++++++ postgres/mailing-list.md | 1 - postgres/user-feedback.md | 15 +++++++++++++++ update.sh | 3 --- 11 files changed, 62 insertions(+), 17 deletions(-) delete mode 100644 aerospike/mailing-list.md create mode 100644 aerospike/user-feedback.md delete mode 100644 centos/mailing-list.md create mode 100644 centos/user-feedback.md delete mode 100644 fedora/mailing-list.md create mode 100644 fedora/user-feedback.md delete mode 100644 postgres/mailing-list.md create mode 100644 postgres/user-feedback.md diff --git a/.template-helpers/user-feedback.md b/.template-helpers/user-feedback.md index 48e7a6aa..f313c328 100644 --- a/.template-helpers/user-feedback.md +++ b/.template-helpers/user-feedback.md @@ -4,7 +4,7 @@ Documentation for this image is stored in the [`%%REPO%%/` directory](https://gi ## Issues -If you have any problems with or questions about this image, please contact us %%MAILING-LIST%% through a [GitHub issue](%%GITHUB-REPO%%/issues). If the issue is related to a CVE, please check for [a `cve-tracker` issue on the `official-images` repository first](https://github.com/docker-library/official-images/issues?q=label%3Acve-tracker). +If you have any problems with or questions about this image, please contact us through a [GitHub issue](%%GITHUB-REPO%%/issues). If the issue is related to a CVE, please check for [a `cve-tracker` issue on the `official-images` repository first](https://github.com/docker-library/official-images/issues?q=label%3Acve-tracker). You can also reach many of the official image maintainers via the `#docker-library` IRC channel on [Freenode](https://freenode.net). @@ -12,4 +12,4 @@ You can also reach many of the official image maintainers via the `#docker-libra You are invited to contribute new features, fixes, or updates, large or small; we are always thrilled to receive pull requests, and do our best to process them as fast as we can. -Before you start to code, we recommend discussing your plans %%MAILING-LIST%% through a [GitHub issue](%%GITHUB-REPO%%/issues), especially for more ambitious contributions. This gives other contributors a chance to point you in the right direction, give you feedback on your design, and help you find out if someone else is working on the same thing. +Before you start to code, we recommend discussing your plans through a [GitHub issue](%%GITHUB-REPO%%/issues), especially for more ambitious contributions. This gives other contributors a chance to point you in the right direction, give you feedback on your design, and help you find out if someone else is working on the same thing. diff --git a/README.md b/README.md index 050d943c..cd796acd 100644 --- a/README.md +++ b/README.md @@ -101,14 +101,6 @@ https://github.com/docker-library/golang This file is an optional override of the default `user-feedback.md` for those repositories with different issue and contributing policies. -## `/mailing-list.md` - -This file is snippet that gets inserted into the user feedback section to provide and extra way to get help, like a mailing list. Here is an example from the Postgres image: - -```markdown -on the [mailing list](http://www.postgresql.org/community/lists/subscribe/) or -``` - # Issues and Contributing If you would like to make a new Official Image, be sure to follow the [guidelines](https://docs.docker.com/docker-hub/official_repos/) and optionally talk to officialrepos@docker.com. diff --git a/aerospike/mailing-list.md b/aerospike/mailing-list.md deleted file mode 100644 index d7f3f609..00000000 --- a/aerospike/mailing-list.md +++ /dev/null @@ -1 +0,0 @@ -on the [Aerospike Forums](https://discuss.aerospike.com) or diff --git a/aerospike/user-feedback.md b/aerospike/user-feedback.md new file mode 100644 index 00000000..3daaa2c0 --- /dev/null +++ b/aerospike/user-feedback.md @@ -0,0 +1,15 @@ +## Documentation + +Documentation for this image is stored in the [`%%REPO%%/` directory](https://github.com/docker-library/docs/tree/master/%%REPO%%) of the [`docker-library/docs` GitHub repo](https://github.com/docker-library/docs). Be sure to familiarize yourself with the [repository's `README.md` file](https://github.com/docker-library/docs/blob/master/README.md) before attempting a pull request. + +## Issues + +If you have any problems with or questions about this image, please contact us on the [Aerospike Forums](https://discuss.aerospike.com) or through a [GitHub issue](%%GITHUB-REPO%%/issues). If the issue is related to a CVE, please check for [a `cve-tracker` issue on the `official-images` repository first](https://github.com/docker-library/official-images/issues?q=label%3Acve-tracker). + +You can also reach many of the official image maintainers via the `#docker-library` IRC channel on [Freenode](https://freenode.net). + +## Contributing + +You are invited to contribute new features, fixes, or updates, large or small; we are always thrilled to receive pull requests, and do our best to process them as fast as we can. + +Before you start to code, we recommend discussing your plans on the [Aerospike Forums](https://discuss.aerospike.com) or through a [GitHub issue](%%GITHUB-REPO%%/issues), especially for more ambitious contributions. This gives other contributors a chance to point you in the right direction, give you feedback on your design, and help you find out if someone else is working on the same thing. diff --git a/centos/mailing-list.md b/centos/mailing-list.md deleted file mode 100644 index 9608a910..00000000 --- a/centos/mailing-list.md +++ /dev/null @@ -1 +0,0 @@ -by submitting a ticket at [https://bugs.centos.org](https://bugs.centos.org) or diff --git a/centos/user-feedback.md b/centos/user-feedback.md new file mode 100644 index 00000000..b4d04d4a --- /dev/null +++ b/centos/user-feedback.md @@ -0,0 +1,15 @@ +## Documentation + +Documentation for this image is stored in the [`%%REPO%%/` directory](https://github.com/docker-library/docs/tree/master/%%REPO%%) of the [`docker-library/docs` GitHub repo](https://github.com/docker-library/docs). Be sure to familiarize yourself with the [repository's `README.md` file](https://github.com/docker-library/docs/blob/master/README.md) before attempting a pull request. + +## Issues + +If you have any problems with or questions about this image, please contact us by submitting a ticket at [https://bugs.centos.org](https://bugs.centos.org) or through a [GitHub issue](%%GITHUB-REPO%%/issues). If the issue is related to a CVE, please check for [a `cve-tracker` issue on the `official-images` repository first](https://github.com/docker-library/official-images/issues?q=label%3Acve-tracker). + +You can also reach many of the official image maintainers via the `#docker-library` IRC channel on [Freenode](https://freenode.net). + +## Contributing + +You are invited to contribute new features, fixes, or updates, large or small; we are always thrilled to receive pull requests, and do our best to process them as fast as we can. + +Before you start to code, we recommend discussing your plans by submitting a ticket at [https://bugs.centos.org](https://bugs.centos.org) or through a [GitHub issue](%%GITHUB-REPO%%/issues), especially for more ambitious contributions. This gives other contributors a chance to point you in the right direction, give you feedback on your design, and help you find out if someone else is working on the same thing. diff --git a/fedora/mailing-list.md b/fedora/mailing-list.md deleted file mode 100644 index d2e4cbee..00000000 --- a/fedora/mailing-list.md +++ /dev/null @@ -1 +0,0 @@ -by filing a bug on [Fedora's bugzilla page](https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora) (choose `docker` as component and include details about image problems in the description) or diff --git a/fedora/user-feedback.md b/fedora/user-feedback.md new file mode 100644 index 00000000..3aa846ea --- /dev/null +++ b/fedora/user-feedback.md @@ -0,0 +1,15 @@ +## Documentation + +Documentation for this image is stored in the [`%%REPO%%/` directory](https://github.com/docker-library/docs/tree/master/%%REPO%%) of the [`docker-library/docs` GitHub repo](https://github.com/docker-library/docs). Be sure to familiarize yourself with the [repository's `README.md` file](https://github.com/docker-library/docs/blob/master/README.md) before attempting a pull request. + +## Issues + +If you have any problems with or questions about this image, please contact us by filing a bug on [Fedora's bugzilla page](https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora) (choose `docker` as component and include details about image problems in the description) or through a [GitHub issue](%%GITHUB-REPO%%/issues). If the issue is related to a CVE, please check for [a `cve-tracker` issue on the `official-images` repository first](https://github.com/docker-library/official-images/issues?q=label%3Acve-tracker). + +You can also reach many of the official image maintainers via the `#docker-library` IRC channel on [Freenode](https://freenode.net). + +## Contributing + +You are invited to contribute new features, fixes, or updates, large or small; we are always thrilled to receive pull requests, and do our best to process them as fast as we can. + +Before you start to code, we recommend discussing your plans by filing a bug on [Fedora's bugzilla page](https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora) (choose `docker` as component and include details about image problems in the description) or through a [GitHub issue](%%GITHUB-REPO%%/issues), especially for more ambitious contributions. This gives other contributors a chance to point you in the right direction, give you feedback on your design, and help you find out if someone else is working on the same thing. diff --git a/postgres/mailing-list.md b/postgres/mailing-list.md deleted file mode 100644 index c3359383..00000000 --- a/postgres/mailing-list.md +++ /dev/null @@ -1 +0,0 @@ -on the [mailing list](http://www.postgresql.org/community/lists/subscribe/) or diff --git a/postgres/user-feedback.md b/postgres/user-feedback.md new file mode 100644 index 00000000..86591cb5 --- /dev/null +++ b/postgres/user-feedback.md @@ -0,0 +1,15 @@ +## Documentation + +Documentation for this image is stored in the [`%%REPO%%/` directory](https://github.com/docker-library/docs/tree/master/%%REPO%%) of the [`docker-library/docs` GitHub repo](https://github.com/docker-library/docs). Be sure to familiarize yourself with the [repository's `README.md` file](https://github.com/docker-library/docs/blob/master/README.md) before attempting a pull request. + +## Issues + +If you have any problems with or questions about this image, please contact us on the [mailing list](http://www.postgresql.org/community/lists/subscribe/) or through a [GitHub issue](%%GITHUB-REPO%%/issues). If the issue is related to a CVE, please check for [a `cve-tracker` issue on the `official-images` repository first](https://github.com/docker-library/official-images/issues?q=label%3Acve-tracker). + +You can also reach many of the official image maintainers via the `#docker-library` IRC channel on [Freenode](https://freenode.net). + +## Contributing + +You are invited to contribute new features, fixes, or updates, large or small; we are always thrilled to receive pull requests, and do our best to process them as fast as we can. + +Before you start to code, we recommend discussing your plans on the [mailing list](http://www.postgresql.org/community/lists/subscribe/) or through a [GitHub issue](%%GITHUB-REPO%%/issues), especially for more ambitious contributions. This gives other contributors a chance to point you in the right direction, give you feedback on your design, and help you find out if someone else is working on the same thing. diff --git a/update.sh b/update.sh index a26504cb..196ce362 100755 --- a/update.sh +++ b/update.sh @@ -113,9 +113,6 @@ for repo in "${repos[@]}"; do echo ' USER-FEEDBACK => '"$repo"'/user-feedback.md' replace_field "$repo" 'USER-FEEDBACK' "$userFeedback" - echo ' MAILING-LIST => '"$repo"'/mailing-list.md' - replace_field "$repo" 'MAILING-LIST' "$mailingList" '\s*' - echo ' REPO => "'"$repo"'"' replace_field "$repo" 'REPO' "$repo"