- Fix wait for docker start on macos

- Better logging while waiting for docker
- Enable docker autostart by default on macos

launcher/internal/config/config.go

@@ -4,6 +4,7 @@ import (
  "fmt"
  "os"
  "path"
+ "runtime"
 
  "github.com/keinenclue/sasm-docker/launcher/internal/util"
  "github.com/spf13/viper"
@@ -25,7 +26,7 @@ func SetupWithName(configPath string, configName string) error {
  viper.AddConfigPath(".")
  viper.SetDefault("dataPath", configPath)
  viper.SetDefault("autostart.docker.path", util.GetDockerExecPath())
- viper.SetDefault("autostart.docker.enabled", false)
+ viper.SetDefault("autostart.docker.enabled", runtime.GOOS == "darwin")
  viper.SetDefault("autostart.xserver.path", util.GetXserverExecPath())
  viper.SetDefault("autostart.xserver.enabled", false)
 

launcher/internal/container/container.go

@@ -6,6 +6,7 @@ import (
  "encoding/json"
  "fmt"
  "io"
+ "strings"
  "time"
 
  "github.com/containerd/containerd/log"
@@ -198,12 +199,17 @@ func (c *LaunchableContainer) WaitForDockerDaemon() error {
  var retryCount = 0
 
  _, err = dockerClient.ContainerList(context.Background(), types.ContainerListOptions{})
- for err != nil && client.IsErrConnectionFailed(err) && retryCount < 12 {
+ for err != nil && (client.IsErrConnectionFailed(err) ||
+ strings.HasSuffix(err.Error(), "connection refused")) && retryCount < 12 {
  retryCount++
  c.handleContainerEvent(Event{
- Type: LogMessage,
+ Type: ConsoleOutput,
  Data: err.Error() + ", retrying in 5 seconds...",
  })
+ c.handleContainerEvent(Event{
+ Type: LogMessage,
+ Data: fmt.Sprintf("Waiting for the docker daemon to start, tried %d times to connect", retryCount),
+ })
  _, err = dockerClient.ContainerList(context.Background(), types.ContainerListOptions{})
  time.Sleep(time.Second * 5)
  }