Merge pull request #4161 from afbjorklund/machine-env

Handle environment variables from podman-machine

1 files changed, 25 insertions, 5 deletions

diff --git a/cmd/podman/main_remote.go b/cmd/podman/main_remote.go
index f617422e6..623f4098e 100644
--- a/cmd/podman/main_remote.go
+++ b/cmd/podman/main_remote.go
@@ -3,9 +3,11 @@
 package main
 
 import (
-	"github.com/pkg/errors"
+	"os"
 	"os/user"
+	"strconv"
 
+	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )
 
@@ -13,14 +15,32 @@ const remote = true
 
 func init() {
 	var username string
-	if curruser, err := user.Current(); err == nil {
-		username = curruser.Username
+	if username = os.Getenv("PODMAN_USER"); username == "" {
+		if curruser, err := user.Current(); err == nil {
+			username = curruser.Username
+		}
+	}
+	host := os.Getenv("PODMAN_HOST")
+	port := 22
+	if portstr := os.Getenv("PODMAN_PORT"); portstr != "" {
+		if p, err := strconv.Atoi(portstr); err == nil {
+			port = p
+		}
+	}
+	key := os.Getenv("PODMAN_IDENTITY_FILE")
+	ignore := false
+	if ignorestr := os.Getenv("PODMAN_IGNORE_HOSTS"); ignorestr != "" {
+		if b, err := strconv.ParseBool(ignorestr); err == nil {
+			ignore = b
+		}
 	}
 	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, "username on the remote host")
-	rootCmd.PersistentFlags().IntVar(&MainGlobalOpts.Port, "port", 22, "port on remote host")
-	rootCmd.PersistentFlags().StringVar(&MainGlobalOpts.RemoteHost, "remote-host", "", "remote host")
+	rootCmd.PersistentFlags().IntVar(&MainGlobalOpts.Port, "port", port, "port on remote host")
+	rootCmd.PersistentFlags().StringVar(&MainGlobalOpts.RemoteHost, "remote-host", host, "remote host")
+	rootCmd.PersistentFlags().StringVar(&MainGlobalOpts.IdentityFile, "identity-file", key, "identity-file")
+	rootCmd.PersistentFlags().BoolVar(&MainGlobalOpts.IgnoreHosts, "ignore-hosts", ignore, "ignore hosts")
 	// 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")
 	rootCmd.PersistentFlags().StringVar(&MainGlobalOpts.LogLevel, "log-level", "error", "Log messages above specified level: debug, info, warn, error, fatal or panic. Logged to ~/.config/containers/podman.log")