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

Merge pull request #398 from rhatdan/containers_storage

Browse source 
Default all container storage to /var/lib/containers/storage
This commit is contained in:
Antonio Murdaca 2017-03-25 08:22:11 +01:00 committed by GitHub
commit 37f118d73a
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
docs/ocid.8.md
View file

@ -81,10 +81,10 @@ ocid is meant to provide an integration path between OCI conformant runtimes and
Image which contains the pause executable (default: "kubernetes/pause") Image which contains the pause executable (default: "kubernetes/pause")
**--root**="" **--root**=""
OCID root dir (default: "/var/lib/containers") OCID root dir (default: "/var/lib/containers/storage")
**--runroot**="" **--runroot**=""
OCID state dir (default: "/var/run/containers") OCID state dir (default: "/var/run/containers/storage")
**--runtime**="" **--runtime**=""
OCI runtime path (default: "/usr/bin/runc") OCI runtime path (default: "/usr/bin/runc")

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

@ -30,10 +30,10 @@ The `ocid` table supports the following options:
**root**="" **root**=""
OCID root dir (default: "/var/lib/containers") OCID root dir (default: "/var/lib/containers/storage")
**runroot**="" **runroot**=""
OCID state dir (default: "/var/run/containers") OCID state dir (default: "/var/run/containers/storage")
**storage_driver**="" **storage_driver**=""
OCID storage driver (default is "devicemapper") OCID storage driver (default is "devicemapper")

4
server/config.go
View file

@ -10,8 +10,8 @@ import (
// Default paths if none are specified // Default paths if none are specified
const ( const (
ocidRoot = "/var/lib/ocid" ocidRoot = "/var/lib/containers/storage"
ocidRunRoot = "/var/run/containers" ocidRunRoot = "/var/run/containers/storage"
conmonPath = "/usr/libexec/ocid/conmon" conmonPath = "/usr/libexec/ocid/conmon"
pauseImage = "kubernetes/pause" pauseImage = "kubernetes/pause"
pauseCommand = "/pause" pauseCommand = "/pause"

4
test/testdata/README.md vendored
View file

@ -7,9 +7,9 @@ In terminal 2:
``` ```
sudo ./ocic runtimeversion sudo ./ocic runtimeversion
sudo rm -rf /var/lib/ocid/sandboxes/podsandbox1 sudo rm -rf /var/lib/containers/storage/sandboxes/podsandbox1
sudo ./ocic pod run --config testdata/sandbox_config.json sudo ./ocic pod run --config testdata/sandbox_config.json
sudo rm -rf /var/lib/ocid/containers/container1 sudo rm -rf /var/lib/containers/storage/containers/container1
sudo ./ocic container create --pod podsandbox1 --config testdata/container_config.json sudo ./ocic container create --pod podsandbox1 --config testdata/container_config.json
``` ```