diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-06-12 08:49:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-12 08:49:12 +0200 |
| commit | d4681fafe55340043fa421ae31b98681dd6902c4 (patch) | |
| tree | fbd4db9ab48c9eb66f88154353de14cfb7b8e217 | |
| parent | f8a84fdcff12fdc150bb303d0004d5ba0cd6087b (diff) | |
| parent | 91ce129eab96e1538bfe415c9c535a69b0e88890 (diff) | |
| download | podman-d4681fafe55340043fa421ae31b98681dd6902c4.tar.gz podman-d4681fafe55340043fa421ae31b98681dd6902c4.tar.bz2 podman-d4681fafe55340043fa421ae31b98681dd6902c4.zip | |
Merge pull request #3298 from ashley-cui/username
Fix podman-remote to user default username
| -rw-r--r-- | cmd/podman/main_remote.go | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/cmd/podman/main_remote.go b/cmd/podman/main_remote.go index de6c2c760..1b9430e92 100644 --- a/cmd/podman/main_remote.go +++ b/cmd/podman/main_remote.go @@ -3,15 +3,21 @@ package main import ( + "os/user" + "github.com/spf13/cobra" ) const remote = true func init() { + var username string + if curruser, err := user.Current(); err == nil { + username = curruser.Username + } rootCmd.PersistentFlags().StringVar(&MainGlobalOpts.ConnectionName, "connection", "", "remote connection name") rootCmd.PersistentFlags().StringVar(&MainGlobalOpts.RemoteConfigFilePath, "remote-config-path", "", "alternate path for configuration file") - rootCmd.PersistentFlags().StringVar(&MainGlobalOpts.RemoteUserName, "username", "", "username on the remote host") + rootCmd.PersistentFlags().StringVar(&MainGlobalOpts.RemoteUserName, "username", username, "username on the remote host") rootCmd.PersistentFlags().StringVar(&MainGlobalOpts.RemoteHost, "remote-host", "", "remote host") // TODO maybe we allow the altering of this for bridge connections? //rootCmd.PersistentFlags().StringVar(&MainGlobalOpts.VarlinkAddress, "varlink-address", adapter.DefaultAddress, "address of the varlink socket") |