diff options
author | baude <bbaude@redhat.com> | 2019-06-20 13:32:26 -0500 |
---|---|---|
committer | baude <bbaude@redhat.com> | 2019-06-20 13:32:26 -0500 |
commit | 484b4a7c4b26a9dcccee3c79ef912b721f638747 (patch) | |
tree | a6fc30126e6abaae9d049556a5fa36aaf79cbf44 /pkg/adapter/client_windows.go | |
parent | 1fad6b74f2a6360b26afbeea1a1705cfd42b6ca7 (diff) | |
download | podman-484b4a7c4b26a9dcccee3c79ef912b721f638747.tar.gz podman-484b4a7c4b26a9dcccee3c79ef912b721f638747.tar.bz2 podman-484b4a7c4b26a9dcccee3c79ef912b721f638747.zip |
add windows bridge format
when using podman-remote on windows, the bridge format must account for
how windows deals with escape quoting. in this case, it does not need
any.
also, reduced duplicated code around generating the bridge endpoint for
the unix and windows platforms.
Signed-off-by: baude <bbaude@redhat.com>
Diffstat (limited to 'pkg/adapter/client_windows.go')
-rw-r--r-- | pkg/adapter/client_windows.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkg/adapter/client_windows.go b/pkg/adapter/client_windows.go index 088550667..31e5d9830 100644 --- a/pkg/adapter/client_windows.go +++ b/pkg/adapter/client_windows.go @@ -3,13 +3,13 @@ package adapter import ( + "fmt" + "github.com/containers/libpod/cmd/podman/remoteclientconfig" - "github.com/containers/libpod/libpod" ) -func newBridgeConnection(formattedBridge string, remoteConn *remoteclientconfig.RemoteConnection, logLevel string) (*Endpoint, error) { - // TODO - // Unix and Windows appear to quote their ssh implementations differently therefore once we figure out what - // windows ssh is doing here, we can then get the format correct. - return nil, libpod.ErrNotImplemented +func formatDefaultBridge(remoteConn *remoteclientconfig.RemoteConnection, logLevel string) string { + return fmt.Sprintf( + `ssh -T %s@%s -- /usr/bin/varlink -A '/usr/bin/podman --log-level=%s varlink $VARLINK_ADDRESS' bridge`, + remoteConn.Username, remoteConn.Destination, logLevel) } |