From ada0568f530b303079ef2bc4cca0f661568d9b63 Mon Sep 17 00:00:00 2001 From: TomSweeneyRedHat Date: Thu, 22 Aug 2019 14:04:32 -0400 Subject: Update cni config instructions Update the CNI configuration instructions to line up with the changes introduced in #3868. Also do a bit less documentation of the configuration and point to the GitHub project so we won't get out of sync in the future. Signed-off-by: TomSweeneyRedHat --- cni/README.md | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'cni') 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. -- cgit v1.2.3-54-g00ecf