Use a volume for Go build cache

swiatekm · swiatekm · commit c9c3e20c7212 · 2025-09-11T13:29:45.000+02:00
diff --git a/dev-tools/mage/build.go b/dev-tools/mage/build.go
@@ -166,6 +166,17 @@ func GolangCrossBuild(params BuildArgs) error {
 			"only be executed within the golang-crossbuild docker environment")
 	}
 
+	defer DockerChown(filepath.Join(params.OutputDir, params.Name+binaryExtension(GOOS)))
+	defer DockerChown(filepath.Join(params.OutputDir))
+
+	mountPoint, err := ElasticBeatsDir()
+	if err != nil {
+		return err
+	}
+	if err := sh.Run("git", "config", "--global", "--add", "safe.directory", mountPoint); err != nil {
+		return err
+	}
+
 	return Build(params)
 }
 
diff --git a/dev-tools/mage/clean.go b/dev-tools/mage/clean.go
@@ -25,7 +25,7 @@ var DefaultCleanPaths = []string{
 	"_meta/kibana/7/index-pattern/{{.BeatName}}.json",
 }
 
-// Clean clean generated build artifacts.
+// Clean clean generated build artifacts and caches.
 func Clean(pathLists ...[]string) error {
 	if len(pathLists) == 0 {
 		pathLists = [][]string{DefaultCleanPaths}
@@ -38,5 +38,8 @@ func Clean(pathLists ...[]string) error {
 			}
 		}
 	}
+	if CrossBuildMountBuildCache {
+		return sh.Run("docker", "volume", "rm", "-f", CrossBuildBuildCacheVolumeName)
+	}
 	return nil
 }
diff --git a/dev-tools/mage/crossbuild.go b/dev-tools/mage/crossbuild.go
@@ -9,7 +9,6 @@ import (
 	"go/build"
 	"log"
 	"os"
-	"os/exec"
 	"path/filepath"
 	"runtime"
 	"strconv"
@@ -334,14 +333,9 @@ func (b GolangCrossBuilder) Build() error {
 
 	buildCacheLocation := "/tmp/.cache/go-build"
 	if CrossBuildMountBuildCache {
-		// Mount the go build cache into the container.
-		out, err := exec.Command("go", "env", "GOCACHE").Output()
-		if err != nil {
-			return fmt.Errorf("failed to get GOCACHE: %w", err)
-		}
-		cacheDir := strings.TrimSpace(string(out))
+		// Mount the go build cache volume into the container.
 		args = append(args,
-			"-v", fmt.Sprintf("%s:%s", cacheDir, buildCacheLocation),
+			"-v", fmt.Sprintf("%s:%s", CrossBuildBuildCacheVolumeName, buildCacheLocation),
 		)
 	}
 
@@ -368,7 +362,6 @@ func (b GolangCrossBuilder) Build() error {
 		"--env", fmt.Sprintf("DEV=%v", DevBuild),
 		"--env", fmt.Sprintf("EXTERNAL=%v", ExternalBuild),
 		"--env", fmt.Sprintf("FIPS=%v", FIPSBuild),
-		"--user", fmt.Sprintf("%d:%d", uid, gid),
 		"-v", repoInfo.RootDir+":"+mountPoint,
 		"-w", workDir,
 		image,
diff --git a/dev-tools/mage/settings.go b/dev-tools/mage/settings.go
@@ -75,7 +75,8 @@ var (
 	CrossBuildMountModcache = EnvOr("CROSSBUILD_MOUNT_MODCACHE", "true") == "true"
 
 	// CrossBuildMountBuildCache mounts the Go build cache into golang-crossbuild containers
-	CrossBuildMountBuildCache = EnvOr("CROSSBUILD_MOUNT_GOCACHE", "true") == "true"
+	CrossBuildMountBuildCache      = EnvOr("CROSSBUILD_MOUNT_GOCACHE", "true") == "true"
+	CrossBuildBuildCacheVolumeName = "elastic-agent-crossbuild-build-cache"
 
 	BeatName        = EnvOr("BEAT_NAME", defaultName)
 	BeatServiceName = EnvOr("BEAT_SERVICE_NAME", BeatName)

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ var DefaultCleanPaths = []string{`
`25`	`25`	`"_meta/kibana/7/index-pattern/{{.BeatName}}.json",`
`26`	`26`	`}`
`27`	`27`
`28`		`-// Clean clean generated build artifacts.`
	`28`	`+// Clean clean generated build artifacts and caches.`
`29`	`29`	`func Clean(pathLists ...[]string) error {`
`30`	`30`	`if len(pathLists) == 0 {`
`31`	`31`	`pathLists = [][]string{DefaultCleanPaths}`
`@@ -38,5 +38,8 @@ func Clean(pathLists ...[]string) error {`
`38`	`38`	`}`
`39`	`39`	`}`
`40`	`40`	`}`
	`41`	`+ if CrossBuildMountBuildCache {`
	`42`	`+ return sh.Run("docker", "volume", "rm", "-f", CrossBuildBuildCacheVolumeName)`
	`43`	`+ }`
`41`	`44`	`return nil`
`42`	`45`	`}`