diff --git a/README.md b/README.md index 8f575f55..65d8920b 100644 --- a/README.md +++ b/README.md @@ -51,8 +51,6 @@ $ mkdir $GOPATH $ go get -d github.com/kubernetes-incubator/cri-o $ cd $GOPATH/src/github.com/kubernetes-incubator/cri-o $ make install.tools -$ make binaries -$ make docs $ sudo make install ``` @@ -63,7 +61,7 @@ $ sudo make install ``` # ocid --debug ``` -If the default `--runtime` value does not point to your runtime: +If the default `--runtime` value does not point to your runtime: ``` # ocid --runtime $(which runc) ``` @@ -111,7 +109,6 @@ $ ocic pod create --config test/testdata/sandbox_config.json #### Remove a pod ``` # ocic pod remove --id - ``` #### List pods diff --git a/docs/ocid.conf.5.md b/docs/ocid.conf.5.md index 655f4d78..ddf33dab 100644 --- a/docs/ocid.conf.5.md +++ b/docs/ocid.conf.5.md @@ -47,7 +47,10 @@ The `ocid` table supports the following options: ## OCID.RUNTIME TABLE **conmon**="" - path to the conmon executable (default: "/usr/libexec/ocid/conmon") + Path to the conmon executable (default: "/usr/libexec/ocid/conmon") + +**conmon_env**=[] + Environment variable list for conmon process (default: ["PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",]) **runtime**="" OCI runtime path (default: "/usr/bin/runc")