opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-27 05:26:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3386 from baude/windowsbridge

Browse Source 
add windows bridge format
This commit is contained in:
OpenShift Merge Robot
2019-06-21 14:36:55 +02:00
committed by GitHub
parent c3b75b2328 484b4a7c4b
commit 54920601ae
3 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
pkg/adapter/client.go
View File

@ -91,3 +91,20 @@ func newSocketConnection(address string) (*Endpoint, error) {
}
return &endpoint, nil
}
// 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 = formatDefaultBridge(remoteConn, logLevel)
return &endpoint, nil
}

18
pkg/adapter/client_unix.go
View File

@ -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
}

12
pkg/adapter/client_windows.go
View File

@ -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)
}