Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: mount correct socket on unix #3139

Merged
merged 5 commits into from
Feb 13, 2025
Merged

fix: mount correct socket on unix #3139

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f492bb1
mount correct socket on unix
Fractal-Tess Feb 13, 2025
2b09412
fix: mount user socket as default in container
sweatybridge Feb 13, 2025
5014448
Update start.go
sweatybridge Feb 13, 2025
67172db
Update start.go
sweatybridge Feb 13, 2025
443a941
Merge branch 'develop' into develop
sweatybridge Feb 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions internal/start/start.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ EOF
return errors.Errorf("failed to parse docker host: %w", err)
}
// Ref: https://vector.dev/docs/reference/configuration/sources/docker_logs/#docker_host
dindHost := url.URL{Scheme: "http", Host: net.JoinHostPort(utils.DinDHost, "2375")}
dindHost := &url.URL{Scheme: "http", Host: net.JoinHostPort(utils.DinDHost, "2375")}
switch parsed.Scheme {
case "tcp":
if _, port, err := net.SplitHostPort(parsed.Host); err == nil {
Expand All @@ -292,13 +292,10 @@ EOF
fmt.Fprintln(os.Stderr, utils.Yellow("WARNING:"), "analytics requires docker daemon exposed on tcp://localhost:2375")
env = append(env, "DOCKER_HOST="+dindHost.String())
case "unix":
if parsed, err = client.ParseHostURL(client.DefaultDockerHost); err != nil {
if dindHost, err = client.ParseHostURL(client.DefaultDockerHost); err != nil {
return errors.Errorf("failed to parse default host: %w", err)
}
if utils.Docker.DaemonHost() != client.DefaultDockerHost {
fmt.Fprintln(os.Stderr, utils.Yellow("WARNING:"), "analytics requires mounting default docker socket:", parsed.Host)
}
binds = append(binds, fmt.Sprintf("%[1]s:%[1]s:ro", parsed.Host))
binds = append(binds, fmt.Sprintf("%s:%s:ro", parsed.Host, dindHost.Host))
}
if _, err := utils.DockerStart(
ctx,
Expand Down
Loading