diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-05-20 15:46:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-20 15:46:58 +0200 |
| commit | 18a953918e1d15aded713f9802865807bd25a1e0 (patch) | |
| tree | 975dce0339d0b7b76450f3b61765f56bbf904685 | |
| parent | a83edf23ac8fb12f8787ead5257b35425e1996d6 (diff) | |
| parent | 900dd3e6333fe68838214e05f19399afd8887cf2 (diff) | |
| download | podman-18a953918e1d15aded713f9802865807bd25a1e0.tar.gz podman-18a953918e1d15aded713f9802865807bd25a1e0.tar.bz2 podman-18a953918e1d15aded713f9802865807bd25a1e0.zip | |
Merge pull request #3154 from haircommander/tutorial-conmon
Fixup conmon documentation
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | install.md | 9 |
2 files changed, 5 insertions, 6 deletions
@@ -67,7 +67,7 @@ The plan is to use OCI projects and best of breed libraries for different aspect - Storage: Container and image storage is managed by [containers/storage](https://github.com/containers/storage) - Networking: Networking support through use of [CNI](https://github.com/containernetworking/cni) - Builds: Builds are supported via [Buildah](https://github.com/containers/buildah). -- Conmon: [Conmon](https://github.com/cri-o/cri-o) is a tool for monitoring OCI runtimes. It is part of the CRI-O package +- Conmon: [Conmon](https://github.com/containers/conmon) is a tool for monitoring OCI runtimes. ## Podman Information for Developers diff --git a/install.md b/install.md index 82dd4c36a..a278cb4ba 100644 --- a/install.md +++ b/install.md @@ -188,13 +188,12 @@ export PATH=$GOPATH/bin:$PATH #### conmon The latest version of `conmon` is expected to be installed on the system. Conmon is used to monitor OCI Runtimes. -To build from source, use the following (if not already executed above, run `export GOPATH=~/go && mkdir -p $GOPATH`): +To build from source, use the following: ```bash -git clone https://github.com/cri-o/cri-o $GOPATH/src/github.com/cri-o/cri-o -cd $GOPATH/src/github.com/cri-o/cri-o -mkdir bin -make bin/conmon +git clone https://github.com/containers/conmon +cd conmon +make sudo install -D -m 755 bin/conmon /usr/libexec/podman/conmon ``` |