opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-23 02:18:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6988 from jwhonce/wip/connection

Browse Source 
Fix `podman system connection` panic
This commit is contained in:
OpenShift Merge Robot
2020-07-16 11:16:47 -04:00
committed by GitHub
parent ad388b9b54 74ca2716a8
commit f4766e01e3
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/podman/system/connection.go
View File

@ -60,7 +60,8 @@ func init() {
}) })
flags := connectionCmd.Flags() flags := connectionCmd.Flags()
flags.IntVarP(&cOpts.Port, "port", "p", 22, "port number for destination") flags.IntVarP(&cOpts.Port, "port", "p", 22, "SSH port number for destination")
flags.StringVar(&cOpts.Identity, "identity", "", "path to SSH identity file")
flags.StringVar(&cOpts.UDSPath, "socket-path", "", "path to podman socket on remote host. (default '/run/podman/podman.sock' or '/run/user/{uid}/podman/podman.sock)") flags.StringVar(&cOpts.UDSPath, "socket-path", "", "path to podman socket on remote host. (default '/run/podman/podman.sock' or '/run/user/{uid}/podman/podman.sock)")
} }

6
docs/source/markdown/podman-system-connection.1.md
View File

@ -15,6 +15,12 @@ The user will be prompted for the remote ssh login password or key file pass phr
## OPTIONS ## OPTIONS
**--identity**=*path*
Path to ssh identity file. If the identity file has been encrypted, Podman prompts the user for the passphrase.
If no identity file is provided and no user is given, Podman defaults to the user running the podman command.
Podman prompts for the login password on the remote server.
**-p**, **--port**=*port* **-p**, **--port**=*port*
Port for ssh destination. The default value is `22`. Port for ssh destination. The default value is `22`.