opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-12-02 02:58:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

podman compose: correctly accept --connection/--url

Browse Source 
Make the logic here much simpler, we already pass all the conection info
before so just use the parsed URL here.

Fixes #20943

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
Paul Holzinger
2024-02-26 15:11:21 +01:00
parent 6d3571dcf5
commit 3cada04099
3 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/podman/compose_machine.go
View File

@@ -7,14 +7,13 @@ import (
"net/url"
"strconv"
"github.com/containers/common/pkg/config"
"github.com/containers/podman/v5/pkg/machine"
"github.com/containers/podman/v5/pkg/machine/define"
"github.com/containers/podman/v5/pkg/machine/provider"
"github.com/containers/podman/v5/pkg/machine/vmconfigs"
)
func getMachineConn(connection *config.Connection, parsedConnection *url.URL) (string, error) {
func getMachineConn(connectionURI string, parsedConnection *url.URL) (string, error) {
machineProvider, err := provider.Get()
if err != nil {
return "", fmt.Errorf("getting machine provider: %w", err)
@@ -64,6 +63,5 @@ func getMachineConn(connection *config.Connection, parsedConnection *url.URL) (s
// return "unix://" + info.ConnectionInfo.PodmanSocket.Path, nil
return "", nil
}
return "", fmt.Errorf("could not find a matching machine for connection %q", connection.URI)
return "", fmt.Errorf("could not find a matching machine for connection %q", connectionURI)
}