store: replace namesgenerator with neutral builder IDs

go.mod

@@ -19,7 +19,6 @@ require (
 	github.com/distribution/reference v0.6.0
 	github.com/docker/cli v29.6.1+incompatible
 	github.com/docker/cli-docs-tool v0.11.0
-	github.com/docker/docker v28.5.2+incompatible
 	github.com/docker/go-units v0.5.0
 	github.com/gofrs/flock v0.13.0
 	github.com/golang/snappy v1.0.0

go.sum

@@ -185,8 +185,6 @@ github.com/docker/cli-docs-tool v0.11.0 h1:7d8QARFb7QEobizqxmEM7fOteZEHwH/zWgHQt
 github.com/docker/cli-docs-tool v0.11.0/go.mod h1:ma8BKiisUo8D6W05XEYIh3oa1UbgrZhi1nowyKFJa8Q=
 github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk=
 github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
-github.com/docker/docker v28.5.2+incompatible h1:DBX0Y0zAjZbSrm1uzOkdr1onVghKaftjlSWt4AFexzM=
-github.com/docker/docker v28.5.2+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/docker-credential-helpers v0.9.8 h1:bIREROb7So6PRlq6KTtdS9MPEjC29OQRkFNlvK2OX8Q=
 github.com/docker/docker-credential-helpers v0.9.8/go.mod h1:v1S+hepowrQXITkEfw6o4+BMbGot02wiKpzWhGUZK6c=
 github.com/docker/go-connections v0.7.0 h1:6SsRfJddP22WMrCkj19x9WKjEDTB+ahsdiGYf0mN39c=

store/nodegroup_test.go

@@ -42,3 +42,17 @@ func TestNodeGroupUpdate(t *testing.T) {
 	require.Equal(t, 1, len(ng.Nodes))
 	require.Equal(t, []string{"linux/arm64"}, platformutil.Format(ng.Nodes[0].Platforms))
 }
+
+func TestNodeGroupNextNodeName(t *testing.T) {
+	t.Parallel()
+
+	ng := &NodeGroup{
+		Name: "foo",
+		Nodes: []Node{
+			{Name: "foo0"},
+			{Name: "foo1"},
+		},
+	}
+
+	require.Equal(t, "foo2", ng.nextNodeName())
+}

store/store_test.go

@@ -2,6 +2,7 @@ package store
 
 import (
 	"os"
+	"strings"
 	"testing"
 	"time"
 
@@ -260,3 +261,66 @@ func TestNodeInvalidName(t *testing.T) {
 	require.Error(t, err)
 	require.True(t, IsErrInvalidName(err))
 }
+
+func TestGenerateName(t *testing.T) {
+	tmpdir := t.TempDir()
+
+	s, err := New(confutil.NewConfig(nil, confutil.WithDir(tmpdir)))
+	require.NoError(t, err)
+
+	txn, release, err := s.Txn()
+	require.NoError(t, err)
+	defer release()
+
+	oldNewID := newID
+	newID = func() string {
+		return "abc123def456ghi789jklmno"
+	}
+	defer func() {
+		newID = oldNewID
+	}()
+
+	name, err := GenerateName(txn)
+	require.NoError(t, err)
+	require.Equal(t, "builder_abc123def456", name)
+	require.True(t, strings.HasPrefix(name, generatedNamePrefix))
+
+	validated, err := ValidateName(name)
+	require.NoError(t, err)
+	require.Equal(t, name, validated)
+}
+
+func TestGenerateNameCollisionRetry(t *testing.T) {
+	tmpdir := t.TempDir()
+
+	s, err := New(confutil.NewConfig(nil, confutil.WithDir(tmpdir)))
+	require.NoError(t, err)
+
+	txn, release, err := s.Txn()
+	require.NoError(t, err)
+	defer release()
+
+	err = txn.Save(&NodeGroup{
+		Name:   "builder_collisionabc",
+		Driver: "docker-container",
+	})
+	require.NoError(t, err)
+
+	oldNewID := newID
+	ids := []string{
+		"collisionabc0000000000000",
+		"freshnamexyz0000000000000",
+	}
+	newID = func() string {
+		id := ids[0]
+		ids = ids[1:]
+		return id
+	}
+	defer func() {
+		newID = oldNewID
+	}()
+
+	name, err := GenerateName(txn)
+	require.NoError(t, err)
+	require.Equal(t, "builder_freshnamexyz", name)
+}

store/util.go

@@ -5,12 +5,16 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/docker/docker/pkg/namesgenerator"
+	"github.com/moby/buildkit/identity"
 	"github.com/pkg/errors"
 )
 
 var namePattern = regexp.MustCompile(`^[a-zA-Z][a-zA-Z0-9\.\-_]*$`)
 
+const generatedNamePrefix = "builder_"
+
+var newID = identity.NewID
+
 type errInvalidName struct {
 	error
 }
@@ -39,8 +43,8 @@ func ValidateName(s string) (string, error) {
 
 func GenerateName(txn *Txn) (string, error) {
 	var name string
-	for i := range 6 {
-		name = namesgenerator.GetRandomName(i)
+	for range 6 {
+		name = generatedNamePrefix + newID()[:12]
 		if _, err := txn.NodeGroupByName(name); err != nil {
 			if !os.IsNotExist(errors.Cause(err)) {
 				return "", err