diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/podman.1.md | 7 | ||||
| -rw-r--r-- | docs/tutorials/README.md | 2 | ||||
| -rw-r--r-- | docs/tutorials/podman_tutorial.md | 8 |
3 files changed, 10 insertions, 7 deletions
diff --git a/docs/podman.1.md b/docs/podman.1.md index b5331a45d..26a5a0ae0 100644 --- a/docs/podman.1.md +++ b/docs/podman.1.md @@ -58,11 +58,14 @@ Path to the OCI compatible binary used to run containers **--storage-driver, -s**=**value** -Select which storage driver is used to manage storage of images and containers (default is overlay) +Storage driver. The default storage driver for UID 0 is configured in /etc/containers/storage.conf, and is *vfs* for other users. The `STORAGE_DRIVER` environment variable overrides the default. The --storage-driver specified driver overrides all. + +Overriding this option will cause the *storage-opt* settings in /etc/containers/storage.conf to be ignored. The user must +specify additional options via the `--storage-opt` flag. **--storage-opt**=**value** -Used to pass an option to the storage driver +Storage driver option, Default storage driver options are configured in /etc/containers/storage.conf. The `STORAGE_OPTS` environment variable overrides the default. The --storage-opt specified options overrides all. **--syslog** diff --git a/docs/tutorials/README.md b/docs/tutorials/README.md index 5cf60303d..ad0c5ae88 100644 --- a/docs/tutorials/README.md +++ b/docs/tutorials/README.md @@ -4,6 +4,6 @@ ## Links to a number of useful tutorials for the Podman utility. -**[Introduction Tutorial](https://github.com/projectatomic/libpod/tree/master/docs/tutorials/podman_tutorial.md)** +**[Introduction Tutorial](https://github.com/containers/libpod/tree/master/docs/tutorials/podman_tutorial.md)** Learn how to setup Podman and perform some basic commands with the utility. diff --git a/docs/tutorials/podman_tutorial.md b/docs/tutorials/podman_tutorial.md index 31203aec2..89e3968f6 100644 --- a/docs/tutorials/podman_tutorial.md +++ b/docs/tutorials/podman_tutorial.md @@ -31,8 +31,8 @@ and make libpod. ```console $ export GOPATH=~/go $ mkdir -p $GOPATH -$ git clone https://github.com/projectatomic/libpod/ $GOPATH/src/github.com/projectatomic/libpod -$ cd $GOPATH/src/github.com/projectatomic/libpod +$ git clone https://github.com/containers/libpod/ $GOPATH/src/github.com/containers/libpod +$ cd $GOPATH/src/github.com/containers/libpod $ make $ sudo make install PREFIX=/usr ``` @@ -91,8 +91,8 @@ $ sudo cp runc /usr/bin/runc ### Building and installing Podman ```console -$ git clone https://github.com/projectatomic/libpod/ $GOPATH/src/github.com/projectatomic/libpod -$ cd $GOPATH/src/github.com/projectatomic/libpod +$ git clone https://github.com/containers/libpod/ $GOPATH/src/github.com/containers/libpod +$ cd $GOPATH/src/github.com/containers/libpod $ make $ sudo make install PREFIX=/usr ``` |