diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-06-03 19:43:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-03 19:43:56 +0200 |
| commit | cbfb4980ce7d9e6ed1ea769d0f42c52e1ad0bffa (patch) | |
| tree | a3e923a491ca37274c2509141d31657669202601 /docs | |
| parent | df0141dc200fc55f750bd3d878b98d4af4110e03 (diff) | |
| parent | cbca6253282cc76be74b3005da80b63de94a8180 (diff) | |
| download | podman-cbfb4980ce7d9e6ed1ea769d0f42c52e1ad0bffa.tar.gz podman-cbfb4980ce7d9e6ed1ea769d0f42c52e1ad0bffa.tar.bz2 podman-cbfb4980ce7d9e6ed1ea769d0f42c52e1ad0bffa.zip | |
Merge pull request #6469 from jwhonce/wip/auth
V2 Add support for ssh authentication methods
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/source/markdown/podman.1.md | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/docs/source/markdown/podman.1.md b/docs/source/markdown/podman.1.md index 02f23e6cc..8dc486b65 100644 --- a/docs/source/markdown/podman.1.md +++ b/docs/source/markdown/podman.1.md @@ -61,6 +61,9 @@ Podman and libpod currently support an additional `precreate` state which is cal **--identity**=*path* Path to SSH identity file +**--passphrase**=*secret* +pass phrase for SSH identity file + **--log-level**=*level* Log messages above specified level: debug, info, warn, error (default), fatal or panic (default: "error") @@ -73,18 +76,21 @@ When namespace is set, created containers and pods will join the given namespace **--network-cmd-path**=*path* Path to the command binary to use for setting up a network. It is currently only used for setting up a slirp4netns network. If "" is used then the binary is looked up using the $PATH environment variable. -**--remote**, **-r**=*url* -URL to access Podman service (default "unix:/run/user/3267/podman/podman.sock") +**--remote**, **-r** +Access Podman service will be remote + +**--url**=*value* +URL to access Podman service (default from `containers.conf`, rootless "unix://run/user/$UID/podman/podman.sock" or as root "unix://run/podman/podman.sock). **--root**=*value* Storage root dir in which data, including images, is stored (default: "/var/lib/containers/storage" for UID 0, "$HOME/.local/share/containers/storage" for other users). -Default root dir is configured in `/etc/containers/storage.conf`. +Default root dir configured in `/etc/containers/storage.conf`. **--runroot**=*value* Storage state directory where all state information is stored (default: "/var/run/containers/storage" for UID 0, "/var/run/user/$UID/run" for other users). -Default state dir is configured in `/etc/containers/storage.conf`. +Default state dir configured in `/etc/containers/storage.conf`. **--runtime**=*value* |