From 6f81ec8c672bb021dc8cebaab54279f27db58ba9 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Thu, 16 Mar 2017 17:28:54 -0400 Subject: [PATCH 1/2] 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 --- OWNERS | 1 + docs/ocid.8.md | 4 ++-- docs/ocid.conf.5.md | 4 ++-- server/config.go | 4 ++-- test/testdata/README.md | 4 ++-- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/OWNERS b/OWNERS index 629b6df0..67170166 100644 --- a/OWNERS +++ b/OWNERS @@ -5,3 +5,4 @@ assignees: - mikebrow - feiskyer - sameo + - dwalsh diff --git a/docs/ocid.8.md b/docs/ocid.8.md index 89592b1a..147d3b68 100644 --- a/docs/ocid.8.md +++ b/docs/ocid.8.md @@ -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") diff --git a/docs/ocid.conf.5.md b/docs/ocid.conf.5.md index 2eec29db..cae4f0a3 100644 --- a/docs/ocid.conf.5.md +++ b/docs/ocid.conf.5.md @@ -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") diff --git a/server/config.go b/server/config.go index f893428e..f4aab0b2 100644 --- a/server/config.go +++ b/server/config.go @@ -10,8 +10,8 @@ import ( // Default paths if none are specified const ( - ocidRoot = "/var/lib/ocid" - ocidRunRoot = "/var/run/containers" + ocidRoot = "/var/lib/containers/storage" + ocidRunRoot = "/var/run/containers/storage" conmonPath = "/usr/libexec/ocid/conmon" pauseImage = "kubernetes/pause" pauseCommand = "/pause" diff --git a/test/testdata/README.md b/test/testdata/README.md index d198b7ab..2fef7118 100644 --- a/test/testdata/README.md +++ b/test/testdata/README.md @@ -7,9 +7,9 @@ In terminal 2: ``` 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 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 ``` From 89be1e9f35d6949727d51d54401b2563adc7f01d Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Fri, 24 Mar 2017 08:20:11 -0400 Subject: [PATCH 2/2] Switch to using opencontainers/selinux We have moved selinux support out of opencontainers/runc into its own package. This patch moves to using the new selinux go bindings. Signed-off-by: Daniel J Walsh --- OWNERS | 1 - 1 file changed, 1 deletion(-) diff --git a/OWNERS b/OWNERS index 67170166..629b6df0 100644 --- a/OWNERS +++ b/OWNERS @@ -5,4 +5,3 @@ assignees: - mikebrow - feiskyer - sameo - - dwalsh