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_unix.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_unix.go')
-rw-r--r-- | pkg/adapter/client_unix.go | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/pkg/adapter/client_unix.go b/pkg/adapter/client_unix.go index e0406567c..4781acd06 100644 --- a/pkg/adapter/client_unix.go +++ b/pkg/adapter/client_unix.go @@ -7,24 +7,10 @@ import ( "fmt" "github.com/containers/libpod/cmd/podman/remoteclientconfig" - "github.com/pkg/errors" ) -// newBridgeConnection creates a bridge type endpoint with username, destination, and log-level -func newBridgeConnection(formattedBridge string, remoteConn *remoteclientconfig.RemoteConnection, logLevel string) (*Endpoint, error) { - endpoint := Endpoint{ - Type: BridgeConnection, - } - - if len(formattedBridge) < 1 && remoteConn == nil { - return nil, errors.New("bridge connections must either be created by string or remoteconnection") - } - if len(formattedBridge) > 0 { - endpoint.Connection = formattedBridge - return &endpoint, nil - } - endpoint.Connection = fmt.Sprintf( +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) - return &endpoint, nil } |