diff options
| -rw-r--r-- | docs/tutorials/podman_tutorial.md | 15 | ||||
| -rw-r--r-- | install.md | 4 | ||||
| -rw-r--r-- | libpod/runtime.go | 5 |
3 files changed, 21 insertions, 3 deletions
diff --git a/docs/tutorials/podman_tutorial.md b/docs/tutorials/podman_tutorial.md index f8332c820..5017e61cd 100644 --- a/docs/tutorials/podman_tutorial.md +++ b/docs/tutorials/podman_tutorial.md @@ -14,6 +14,17 @@ Fedora 27 and later provide Podman via the package manager. sudo dnf install -y podman ``` +*Optional*: If you've already installed podman on Fedora and you're feeling +adventerous, you can test the very latest podman in Fedora's `updates-testing` +repository before it goes out to all Fedora users. +```console +sudo yum distro-sync --enablerepo=updates-testing podman +``` + +If you use a newer podman package from Fedora's `updates-testing`, we would +appreciate your `+1` feedback in [Bodhi, Fedora's update management +system](https://bodhi.fedoraproject.org/updates/?packages=podman). + ## Install Podman on Fedora from Source Many of the basic components to run Podman are readily available from the Fedora RPM repositories. In this section, we will help you install all the runtime and build dependencies for Podman, @@ -112,7 +123,7 @@ sudo make install PREFIX=/usr This sample container will run a very basic httpd server that serves only its index page. ```console -sudo podman run -dt -e HTTPD_VAR_RUN=/var/run/httpd -e HTTPD_MAIN_CONF_D_PATH=/etc/httpd/conf.d \ +podman run -dt -e HTTPD_VAR_RUN=/var/run/httpd -e HTTPD_MAIN_CONF_D_PATH=/etc/httpd/conf.d \ -e HTTPD_MAIN_CONF_PATH=/etc/httpd/conf \ -e HTTPD_CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/httpd/ \ registry.fedoraproject.org/f27/httpd /usr/bin/run-httpd @@ -123,7 +134,7 @@ will print the container ID after it has run. ### Listing running containers The Podman *ps* command is used to list creating and running containers. ```console -sudo podman ps +podman ps ``` Note: If you add *-a* to the *ps* command, Podman will show all containers. diff --git a/install.md b/install.md index c5268c04d..4f075332d 100644 --- a/install.md +++ b/install.md @@ -4,7 +4,9 @@ #### [Arch Linux](https://www.archlinux.org) -Podman is available in the AUR through the [libpod package](https://aur.archlinux.org/packages/libpod/) +```bash +sudo pacman -S podman +``` #### [Fedora](https://www.fedoraproject.org), [CentOS](https://www.centos.org) diff --git a/libpod/runtime.go b/libpod/runtime.go index 8e7ba8123..c7000d84a 100644 --- a/libpod/runtime.go +++ b/libpod/runtime.go @@ -555,6 +555,11 @@ func makeRuntime(runtime *Runtime) (err error) { // Reset defaults if they were not explicitly set if !runtime.configuredFrom.storageGraphDriverSet && dbConfig.GraphDriver != "" { + if runtime.config.StorageConfig.GraphDriverName != dbConfig.GraphDriver && + runtime.config.StorageConfig.GraphDriverName != "" { + logrus.Errorf("User-selected graph driver %s overwritten by graph driver %s from database - delete libpod local files to resolve", + runtime.config.StorageConfig.GraphDriverName, dbConfig.GraphDriver) + } runtime.config.StorageConfig.GraphDriverName = dbConfig.GraphDriver } if !runtime.configuredFrom.storageGraphRootSet && dbConfig.StorageRoot != "" { |