pass addr (#484)

* pass addr

* Detect buildkit IP address using docker inspect.

Co-authored-by: Alex Couture-Beil <alex@earthly.dev>
Co-authored-by: Vlad A. Ionescu <vladaionescu@users.noreply.github.com>

buildkitd/buildkitd.go

@@ -1,6 +1,7 @@
 package buildkitd
 
 import (
+	"bytes"
 	"context"
 	"encoding/base64"
 	"fmt"
@@ -305,6 +306,16 @@ func WaitUntilStarted(ctx context.Context, address string, opTimeout time.Durati
 	}
 }
 
+// GetContainerIP returns the IP of the buildkit container.
+func GetContainerIP(ctx context.Context) (string, error) {
+	cmd := exec.CommandContext(ctx, "docker", "inspect", "-f", "{{range.NetworkSettings.Networks}}{{.IPAddress}}{{end}}", ContainerName)
+	output, err := cmd.CombinedOutput()
+	if err != nil {
+		return "", errors.Wrap(err, "get combined output ip")
+	}
+	return string(bytes.TrimSpace(output)), nil
+}
+
 // WaitUntilStopped waits until the buildkitd daemon has stopped.
 func WaitUntilStopped(ctx context.Context, opTimeout time.Duration) error {
 	ctxTimeout, cancel := context.WithTimeout(ctx, opTimeout)

cmd/debugger/main.go

@@ -32,8 +32,6 @@ var (
 	ErrNoShellFound = fmt.Errorf("no shell found")
 )
 
-const remoteConsoleAddr = "127.0.0.1:8373"
-
 func getShellPath() (string, bool) {
 	for _, sh := range []string{
 		"bash", "ksh", "zsh", "ash", "sh",
@@ -238,7 +236,7 @@ func main() {
 				conslogger.Warnf("Failed to set term: %v", err)
 			}
 
-			err = interactiveMode(ctx, remoteConsoleAddr, quotedCmd)
+			err = interactiveMode(ctx, debuggerSettings.RepeaterAddr, quotedCmd)
 			if err != nil {
 				log.Error(err)
 			}

cmd/earth/main.go

@@ -1245,7 +1245,7 @@ func (app *earthApp) actionPrune(c *cli.Context) error {
 	}
 
 	// Prune via API.
-	bkClient, err := app.newBuildkitdClient(c.Context)
+	bkClient, _, err := app.newBuildkitdClient(c.Context)
 	if err != nil {
 		return errors.Wrap(err, "buildkitd new client")
 	}
@@ -1290,7 +1290,6 @@ func (app *earthApp) actionDocker2Earth(c *cli.Context) error {
 
 func (app *earthApp) actionBuild(c *cli.Context) error {
 	app.commandName = "build"
-	sockName := fmt.Sprintf("debugger.sock.%d", time.Now().UnixNano())
 
 	if app.imageMode && app.artifactMode {
 		return errors.New("both image and artifact modes cannot be active at the same time")
@@ -1354,7 +1353,7 @@ func (app *earthApp) actionBuild(c *cli.Context) error {
 			return errors.Wrapf(err, "parse target name %s", targetName)
 		}
 	}
-	bkClient, err := app.newBuildkitdClient(c.Context)
+	bkClient, bkIP, err := app.newBuildkitdClient(c.Context)
 	if err != nil {
 		return errors.Wrap(err, "buildkitd new client")
 	}
@@ -1377,7 +1376,7 @@ func (app *earthApp) actionBuild(c *cli.Context) error {
 	debuggerSettings := debuggercommon.DebuggerSettings{
 		DebugLevelLogging: app.debug,
 		Enabled:           app.interactiveDebugging,
-		SockPath:          fmt.Sprintf("/run/earthly/%s", sockName),
+		RepeaterAddr:      fmt.Sprintf("%s:8373", bkIP),
 		Term:              os.Getenv("TERM"),
 	}
 
@@ -1469,25 +1468,29 @@ func (app *earthApp) actionBuild(c *cli.Context) error {
 	return nil
 }
 
-func (app *earthApp) newBuildkitdClient(ctx context.Context, opts ...client.ClientOpt) (*client.Client, error) {
+func (app *earthApp) newBuildkitdClient(ctx context.Context, opts ...client.ClientOpt) (*client.Client, string, error) {
 	if app.buildkitHost == "" {
 		// Start our own.
 		app.buildkitdSettings.Debug = app.debug
 		opTimeout := time.Duration(app.cfg.Global.BuildkitRestartTimeoutS) * time.Second
 		bkClient, err := buildkitd.NewClient(
 			ctx, app.console, app.buildkitdImage, app.buildkitdSettings, opTimeout)
 		if err != nil {
-			return nil, errors.Wrap(err, "buildkitd new client (own)")
+			return nil, "", errors.Wrap(err, "buildkitd new client (own)")
 		}
-		return bkClient, nil
+		bkIP, err := buildkitd.GetContainerIP(ctx)
+		if err != nil {
+			return nil, "", errors.Wrap(err, "get container ip")
+		}
+		return bkClient, bkIP, nil
 	}
 
 	// Use provided.
 	bkClient, err := client.New(ctx, app.buildkitHost, opts...)
 	if err != nil {
-		return nil, errors.Wrap(err, "buildkitd new client (provided)")
+		return nil, "", errors.Wrap(err, "buildkitd new client (provided)")
 	}
-	return bkClient, nil
+	return bkClient, "", nil
 }
 
 func processSecrets(secrets []string, dotEnvMap map[string]string) (map[string][]byte, error) {

debugger/common/settings.go

@@ -7,6 +7,6 @@ const DebuggerSettingsSecretsKey = "earthly_debugger_settings"
 type DebuggerSettings struct {
 	DebugLevelLogging bool   `json:"debugLevel"`
 	Enabled           bool   `json:"enabled"`
-	SockPath          string `json:"sockPath"`
+	RepeaterAddr      string `json:"repeaterAddr"`
 	Term              string `json:"term"`
 }