diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-10-03 12:45:43 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-03 12:45:43 -0700 |
| commit | 7af4074c6f96d0fabd2ab5dd6c5773053f80aa08 (patch) | |
| tree | 804d6ca257d7c6649b1fda6ea6a00e3a06ab3bee /pkg/adapter/client.go | |
| parent | 86c8650c2328a4a611e614c7220627feae4d4eae (diff) | |
| parent | c831a64bb1dbce86109d1c2e00535e89a7fc5f81 (diff) | |
| download | podman-7af4074c6f96d0fabd2ab5dd6c5773053f80aa08.tar.gz podman-7af4074c6f96d0fabd2ab5dd6c5773053f80aa08.tar.bz2 podman-7af4074c6f96d0fabd2ab5dd6c5773053f80aa08.zip | |
Merge pull request #4161 from afbjorklund/machine-env
Handle environment variables from podman-machine
Diffstat (limited to 'pkg/adapter/client.go')
| -rw-r--r-- | pkg/adapter/client.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/adapter/client.go b/pkg/adapter/client.go index 1805c758d..da4670892 100644 --- a/pkg/adapter/client.go +++ b/pkg/adapter/client.go @@ -35,7 +35,7 @@ func (r RemoteRuntime) RemoteEndpoint() (remoteEndpoint *Endpoint, err error) { if len(r.cmd.RemoteUserName) < 1 { return nil, errors.New("you must provide a username when providing a remote host name") } - rc := remoteclientconfig.RemoteConnection{r.cmd.RemoteHost, r.cmd.RemoteUserName, false, r.cmd.Port} + rc := remoteclientconfig.RemoteConnection{r.cmd.RemoteHost, r.cmd.RemoteUserName, false, r.cmd.Port, r.cmd.IdentityFile, r.cmd.IgnoreHosts} remoteEndpoint, err = newBridgeConnection("", &rc, r.cmd.LogLevel) // if the user has a config file with connections in it } else if len(remoteConfigConnections.Connections) > 0 { |