diff options
| author | TomSweeneyRedHat <tsweeney@redhat.com> | 2019-08-22 14:04:32 -0400 |
|---|---|---|
| committer | TomSweeneyRedHat <tsweeney@redhat.com> | 2019-08-22 19:39:07 -0400 |
| commit | ada0568f530b303079ef2bc4cca0f661568d9b63 (patch) | |
| tree | 6a8fcffc888fb2466fc8dd70542d810d0b0f18aa /install.md | |
| parent | 59261cf014678b374c4b0d27077de5d0689d6f0c (diff) | |
| download | podman-ada0568f530b303079ef2bc4cca0f661568d9b63.tar.gz podman-ada0568f530b303079ef2bc4cca0f661568d9b63.tar.bz2 podman-ada0568f530b303079ef2bc4cca0f661568d9b63.zip | |
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 <tsweeney@redhat.com>
Diffstat (limited to 'install.md')
| -rw-r--r-- | install.md | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/install.md b/install.md index d8d70a7b6..eb4ecfa68 100644 --- a/install.md +++ b/install.md @@ -190,11 +190,14 @@ To build, use the following (running `make` can take a while): git clone https://github.com/ostreedev/ostree ~/ostree cd ~/ostree git submodule update --init + # for Fedora, CentOS, RHEL -sudo yum install -y automake bison e2fsprogs-devel fuse-devel libtool xz-devel zlib-devel +sudo yum install -y automake bison e2fsprogs-devel fuse-devel gpgme-devel libseccomp-devel libtool systemd-devel xz-devel zlib-devel + # for Debian, Ubuntu etc. -sudo apt-get install -y automake bison e2fsprogs e2fslibs-dev fuse libfuse-dev libgpgme-dev liblzma-dev libtool zlib1g +sudo apt-get install -y automake bison e2fsprogs e2fslibs-dev fuse libfuse-dev libgpgme-dev liblzma-dev libseccomp-dev libsystemd-dev libtool zlib1g +# for all distributions ./autogen.sh --prefix=/usr --libdir=/usr/lib64 --sysconfdir=/etc # remove --nonet option due to https:/github.com/ostreedev/ostree/issues/1374 sed -i '/.*--nonet.*/d' ./Makefile-man.am @@ -226,6 +229,7 @@ To build from source, use the following: ```bash git clone https://github.com/containers/conmon cd conmon +export GOCACHE="$(mktemp -d)" make sudo make podman ``` @@ -245,25 +249,12 @@ sudo cp runc /usr/bin/runc #### CNI plugins -```bash -git clone https://github.com/containernetworking/plugins.git $GOPATH/src/github.com/containernetworking/plugins -cd $GOPATH/src/github.com/containernetworking/plugins -./build_linux.sh -sudo mkdir -p /usr/libexec/cni -sudo cp bin/* /usr/libexec/cni -``` - #### Setup CNI networking A proper description of setting up CNI networking is given in the [`cni` README](cni/README.md). -Using the CNI plugins from above, a more basic network config is achieved with: - -```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/99-loopback.conf -``` - +A basic setup for CNI networking is done by default during the installation or make processes and +no further configuration is needed to start using Podman. #### Add configuration |