Skip to content

Commit

Permalink
fix: move docker socket warning to start cmd (#2467)
Browse files Browse the repository at this point in the history
  • Loading branch information
sweatybridge authored Jun 27, 2024
1 parent 3579053 commit 513cf15
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 10 deletions.
13 changes: 7 additions & 6 deletions internal/start/start.go
Original file line number Diff line number Diff line change
Expand Up @@ -183,14 +183,15 @@ func run(p utils.Program, ctx context.Context, fsys afero.Fs, excludedContainers
env := []string{
"VECTOR_CONFIG=/etc/vector/vector.yaml",
}
// Special case for GitLab pipeline
host := utils.Docker.DaemonHost()
if parsed, err := client.ParseHostURL(host); err == nil {
if parsed.Scheme == "tcp" {
// Special case for GitLab pipeline
env = append(env, "DOCKER_HOST="+host)
} else {
binds = append(binds, parsed.Host+":/var/run/docker.sock:ro")
if parsed, err := client.ParseHostURL(host); err == nil && parsed.Scheme == "tcp" {
env = append(env, "DOCKER_HOST="+host)
} else if parsed, err := client.ParseHostURL(client.DefaultDockerHost); err == nil {
if host != client.DefaultDockerHost {
fmt.Fprintln(os.Stderr, utils.Yellow("WARNING:"), "analytics requires mounting default docker socket:", parsed.Host)
}
binds = append(binds, parsed.Host+":/var/run/docker.sock:ro")
}
if _, err := utils.DockerStart(
ctx,
Expand Down
4 changes: 0 additions & 4 deletions internal/utils/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import (
"time"

"github.com/BurntSushi/toml"
"github.com/docker/docker/client"
"github.com/docker/go-units"
"github.com/go-errors/errors"
"github.com/golang-jwt/jwt/v5"
Expand Down Expand Up @@ -864,9 +863,6 @@ func LoadConfigFS(fsys afero.Fs) error {
}
// Validate logflare config
if Config.Analytics.Enabled {
if Docker.DaemonHost() != client.DefaultDockerHost {
fmt.Fprintln(os.Stderr, Yellow("WARNING:"), "running analytics in docker rootless mode is unsupported.")
}
switch Config.Analytics.Backend {
case LogflareBigQuery:
if len(Config.Analytics.GcpProjectId) == 0 {
Expand Down

0 comments on commit 513cf15

Please sign in to comment.