summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-09-25 16:11:30 +0200
committerGitHub <noreply@github.com>2019-09-25 16:11:30 +0200
commitf197ebe8519198ea24a0a395ffeb97711a248c27 (patch)
treef14c063968258ad208d5257d402476825598df8a
parent4f301c54b891810263052d7fb183af9b73b359e0 (diff)
parentfd8570befa112cf9e8d70016b5078ec3f7f78f9a (diff)
downloadpodman-f197ebe8519198ea24a0a395ffeb97711a248c27.tar.gz
podman-f197ebe8519198ea24a0a395ffeb97711a248c27.tar.bz2
podman-f197ebe8519198ea24a0a395ffeb97711a248c27.zip
Merge pull request #4036 from vrothberg/update-readme
Update readme
-rw-r--r--CONTRIBUTING.md3
-rw-r--r--README.md14
2 files changed, 14 insertions, 3 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 07b2b3584..be13b6de3 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -347,9 +347,6 @@ tracking system.
There is also a [mailing list](https://lists.podman.io/archives/) at `lists.podman.io`.
You can subscribe by sending a message to `podman@lists.podman.io` with the subject `subscribe`.
-[owners]: https://github.com/kubernetes/community/blob/master/contributors/guide/owners.md#owners
-
-
### Bot Interactions
The primary human-interface is through comments in pull-requests. Some of these are outlined
diff --git a/README.md b/README.md
index 4cdccd3a9..f694e92ef 100644
--- a/README.md
+++ b/README.md
@@ -33,6 +33,20 @@ This project tests all builds against each supported version of Fedora, the late
1. Further work on the podman pod command
1. Further improvements on rootless containers
+## Communications
+
+For general questions and discussion, please use the
+IRC `#podman` channel on `irc.freenode.net`.
+
+For discussions around issues/bugs and features, you can use the GitHub
+[issues](https://github.com/containers/libpod/issues)
+and
+[PRs](https://github.com/containers/libpod/pulls)
+tracking system.
+
+There is also a [mailing list](https://lists.podman.io/archives/) at `lists.podman.io`.
+You can subscribe by sending a message to `podman@lists.podman.io` with the subject `subscribe`.
+
## Rootless
Podman can be easily run as a normal user, without requiring a setuid binary.
When run without root, Podman containers use user namespaces to set root in the container to the user running Podman.