summaryrefslogtreecommitdiff
path: root/cni
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-08-25 18:46:31 +0200
committerGitHub <noreply@github.com>2019-08-25 18:46:31 +0200
commitc0528c152ebe2a972e2a44384ebd4ac87b936273 (patch)
tree6a8fcffc888fb2466fc8dd70542d810d0b0f18aa /cni
parent59261cf014678b374c4b0d27077de5d0689d6f0c (diff)
parentada0568f530b303079ef2bc4cca0f661568d9b63 (diff)
downloadpodman-c0528c152ebe2a972e2a44384ebd4ac87b936273.tar.gz
podman-c0528c152ebe2a972e2a44384ebd4ac87b936273.tar.bz2
podman-c0528c152ebe2a972e2a44384ebd4ac87b936273.zip
Merge pull request #3877 from TomSweeneyRedHat/dev/tsweeney/cnifix
Update cni config instructions
Diffstat (limited to 'cni')
-rw-r--r--cni/README.md14
1 files changed, 8 insertions, 6 deletions
diff --git a/cni/README.md b/cni/README.md
index d35bc4111..2683df714 100644
--- a/cni/README.md
+++ b/cni/README.md
@@ -1,15 +1,17 @@
## `cni` ##
-There are a wide variety of different [CNI][cni] network configurations. This
+There are a wide variety of different [CNI](https://github.com/containernetworking/cni) network configurations. This
directory just contains an example configuration that can be used as the
basis for your own configuration.
To use this configuration, place it in `/etc/cni/net.d` (or the directory
specified by `cni_config_dir` in your `libpod.conf`).
-In addition, you need to install the [CNI plugins][cni] necessary into
-`/opt/cni/bin` (or the directory specified by `cni_plugin_dir`). The
-two plugins necessary for the example CNI configurations are `portmap` and
-`bridge`.
+For example a basic network configuration can be achieved with:
-[cni]: https://github.com/containernetworking/plugins
+```bash
+sudo mkdir -p /etc/cni/net.d
+curl -qsSL https://raw.githubusercontent.com/containers/libpod/master/cni/87-podman-bridge.conflist | sudo tee /etc/cni/net.d/87-podman-bridge.conf
+```
+
+Dependent upon your CNI configuration, you will need to install as a minimum the `port` and `bridge` [CNI plugins](https://github.com/containernetworking/plugins) into `/opt/cni/bin` (or the directory specified by `cni_plugin_dir` in libpod.conf). Please refer to the [CNI](https://github.com/containernetworking) project page in GitHub for more information.