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

Merge fb10263a4b into 7465244d7d

Browse source
This commit is contained in:
Suraj Deshmukh 2017-05-12 18:41:00 +00:00 • committed by GitHub
commit 4dcbbcacaf
4 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/ocid.8.md
View file

@ -87,7 +87,7 @@ ocid is meant to provide an integration path between OCI conformant runtimes and
OCID state dir (default: "/var/run/containers/storage") OCID state dir (default: "/var/run/containers/storage")
**--runtime**="" **--runtime**=""
OCI runtime path (default: "/usr/bin/runc") OCI runtime path (default: "/usr/local/sbin/runc")
**--selinux**=*true*|*false* **--selinux**=*true*|*false*
Enable selinux support (default: false) Enable selinux support (default: false)

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

@ -55,7 +55,7 @@ The `ocid` table supports the following options:
Environment variable list for conmon process (default: ["PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",]) 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/local/sbin/runc")
**selinux**=*true*|*false* **selinux**=*true*|*false*
Enable selinux support (default: false) Enable selinux support (default: false)

2
server/config.go
View file

@ -207,7 +207,7 @@ func DefaultConfig() *Config {
Listen: "/var/run/ocid.sock", Listen: "/var/run/ocid.sock",
}, },
RuntimeConfig: RuntimeConfig{ RuntimeConfig: RuntimeConfig{
Runtime: "/usr/bin/runc", Runtime: "/usr/local/sbin/runc",
RuntimeHostPrivileged: "", RuntimeHostPrivileged: "",
Conmon: conmonPath, Conmon: conmonPath,
ConmonEnv: []string{ ConmonEnv: []string{

2
tutorial.md
View file

@ -46,7 +46,7 @@ chmod +x runc-linux-amd64
``` ```
``` ```
sudo mv runc-linux-amd64 /usr/bin/runc sudo mv runc-linux-amd64 /usr/local/sbin/runc
``` ```
Print the `runc` version: Print the `runc` version: