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

Merge pull request #890 from mrunalp/bind_docs

Browse source 
docs: Add missing bind option in docs and command help
This commit is contained in:
Daniel J Walsh 2017-09-16 05:11:17 -04:00 committed by GitHub
commit d03ea10be2
3 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmd/crio/main.go
View file

@ -300,7 +300,7 @@ func main() {
cli.StringFlag{ cli.StringFlag{
Name: "image-volumes", Name: "image-volumes",
Value: string(libkpod.ImageVolumesMkdir), Value: string(libkpod.ImageVolumesMkdir),
Usage: "image volume handling ('mkdir' or 'ignore')", Usage: "image volume handling ('mkdir', 'bind', or 'ignore')",
}, },
cli.StringFlag{ cli.StringFlag{
Name: "hooks-dir-path", Name: "hooks-dir-path",

6
docs/crio.8.md
View file

@ -90,7 +90,11 @@ set the CPU profile file path
using --insecure-registry. using --insecure-registry.
**--image-volumes**="" **--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**="" **--listen**=""
Path to crio socket (default: "/var/run/crio.sock") Path to crio socket (default: "/var/run/crio.sock")

6
docs/crio.conf.5.md
View file

@ -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://") A prefix to prepend to image names that can't be pulled as-is (default: "docker://")
**image_volumes**="" **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**="" **insecure_registries**=""
Enable insecure registry communication, i.e., enable un-encrypted Enable insecure registry communication, i.e., enable un-encrypted