Default all container storage to /var/lib/containers/storage

containers/storage is defaulting to /var/lib/containers/storage
for image and containers storage.  It is also defaulting to
/var/run/containers/storage for all runtime.  The defaults
for CRI-O should match so that lots of other tools that use
containers/storage can share the same storage.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
Daniel J Walsh 2017-03-16 17:28:54 -04:00
parent 673b6e4c51
commit 6f81ec8c67
5 changed files with 9 additions and 8 deletions

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")
**--root**=""
OCID root dir (default: "/var/lib/containers")
OCID root dir (default: "/var/lib/containers/storage")
**--runroot**=""
OCID state dir (default: "/var/run/containers")
OCID state dir (default: "/var/run/containers/storage")
**--runtime**=""
OCI runtime path (default: "/usr/bin/runc")

View file

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