vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

update README.md and ocid.conf.5.md

Browse source 
Signed-off-by: HaoZhang <crazykev@zju.edu.cn>
This commit is contained in:
HaoZhang 2016-10-25 01:08:17 +08:00
parent 18f477911c
commit 292b7e0034
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
README.md
View file

@ -51,8 +51,6 @@ $ mkdir $GOPATH
$ go get -d github.com/kubernetes-incubator/cri-o $ go get -d github.com/kubernetes-incubator/cri-o
$ cd $GOPATH/src/github.com/kubernetes-incubator/cri-o $ cd $GOPATH/src/github.com/kubernetes-incubator/cri-o
$ make install.tools $ make install.tools
$ make binaries
$ make docs
$ sudo make install $ sudo make install
``` ```
@ -111,7 +109,6 @@ $ ocic pod create --config test/testdata/sandbox_config.json
#### Remove a pod #### Remove a pod
``` ```
# ocic pod remove --id <pod_id> # ocic pod remove --id <pod_id>
``` ```
#### List pods #### List pods

5
docs/ocid.conf.5.md
View file

@ -47,7 +47,10 @@ The `ocid` table supports the following options:
## OCID.RUNTIME TABLE ## OCID.RUNTIME TABLE
**conmon**="" **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**="" **runtime**=""
OCI runtime path (default: "/usr/bin/runc") OCI runtime path (default: "/usr/bin/runc")