From f59e9dae1c721409fdbaba53c11273a6779ee67d Mon Sep 17 00:00:00 2001 From: Mrunal Patel Date: Mon, 11 Sep 2017 15:43:53 -0700 Subject: [PATCH] docs: Add missing bind option in docs and command help Signed-off-by: Mrunal Patel --- cmd/crio/main.go | 2 +- docs/crio.8.md | 6 +++++- docs/crio.conf.5.md | 6 +++++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/cmd/crio/main.go b/cmd/crio/main.go index cebbd657..754ab327 100644 --- a/cmd/crio/main.go +++ b/cmd/crio/main.go @@ -300,7 +300,7 @@ func main() { cli.StringFlag{ Name: "image-volumes", Value: string(libkpod.ImageVolumesMkdir), - Usage: "image volume handling ('mkdir' or 'ignore')", + Usage: "image volume handling ('mkdir', 'bind', or 'ignore')", }, cli.StringFlag{ Name: "hooks-dir-path", diff --git a/docs/crio.8.md b/docs/crio.8.md index 21a2e2dd..34f54571 100644 --- a/docs/crio.8.md +++ b/docs/crio.8.md @@ -90,7 +90,11 @@ set the CPU profile file path using --insecure-registry. **--image-volumes**="" - Image volume handling ('mkdir' or 'ignore') (default: "mkdir") + Image volume handling ('mkdir', 'bind' or 'ignore') (default: "mkdir") + mkdir: A directory is created inside the container root filesystem for the volumes. + bind: A directory is created inside container state directory and bind mounted into + the container for the volumes. + ignore: All volumes are just ignored and no action is taken. **--listen**="" Path to crio socket (default: "/var/run/crio.sock") diff --git a/docs/crio.conf.5.md b/docs/crio.conf.5.md index 9c1896b4..8200a30a 100644 --- a/docs/crio.conf.5.md +++ b/docs/crio.conf.5.md @@ -78,7 +78,11 @@ The `crio` table supports the following options: A prefix to prepend to image names that can't be pulled as-is (default: "docker://") **image_volumes**="" - Image volume handling ('mkdir' or 'ignore') (default: "mkdir") + Image volume handling ('mkdir', 'bind' or 'ignore') (default: "mkdir") + mkdir: A directory is created inside the container root filesystem for the volumes. + bind: A directory is created inside container state directory and bind mounted into + the container for the volumes. + ignore: All volumes are just ignored and no action is taken. **insecure_registries**="" Enable insecure registry communication, i.e., enable un-encrypted