Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix podman system connection panic #6988

Merged
merged 1 commit into from
Jul 16, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion cmd/podman/system/connection.go
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@ func init() {
})

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)")
}

Expand Down
6 changes: 6 additions & 0 deletions docs/source/markdown/podman-system-connection.1.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@ The user will be prompted for the remote ssh login password or key file pass phr

## 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*

Port for ssh destination. The default value is `22`.
Expand Down