Skip to content

Commit e58b48f

Browse files
committed
mount /var/run/docker.sock for --use-api-socket
Signed-off-by: Nicolas De Loof <[email protected]>
1 parent 3553aa2 commit e58b48f

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

pkg/compose/apiSocket.go

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ package compose
1818

1919
import (
2020
"bytes"
21+
"errors"
2122
"fmt"
22-
"strings"
2323

2424
"github.com/compose-spec/compose-go/v2/types"
2525
"github.com/docker/cli/cli/config/configfile"
@@ -41,11 +41,9 @@ func (s *composeService) useAPISocket(project *types.Project) (*types.Project, e
4141
return project, nil
4242
}
4343

44-
socket := s.dockerCli.DockerEndpoint().Host
45-
if !strings.HasPrefix(socket, "unix://") {
46-
return nil, fmt.Errorf("use_api_socket can only be used with unix sockets: docker endpoint %s is incompatible", socket)
44+
if s.dockerCli.ServerInfo().OSType == "Windows" {
45+
return nil, errors.New("use_api_socket can't be used with a Windows Docker Engine")
4746
}
48-
socket = strings.TrimPrefix(socket, "unix://") // should we confirm absolute path?
4947

5048
creds, err := s.dockerCli.ConfigFile().GetAllCredentials()
5149
if err != nil {
@@ -69,7 +67,7 @@ func (s *composeService) useAPISocket(project *types.Project) (*types.Project, e
6967
}
7068
service.Volumes = append(service.Volumes, types.ServiceVolumeConfig{
7169
Type: types.VolumeTypeBind,
72-
Source: socket,
70+
Source: "/var/run/docker.sock",
7371
Target: "/var/run/docker.sock",
7472
})
7573

0 commit comments

Comments
 (0)