driver: remove handling for legacy (docker < 23.0) version

Signed-off-by: Sebastiaan van Stijn <[email protected]>

Author: thaJeztah

builder/node.go

@@ -14,11 +14,9 @@ import (
 	"github.com/docker/buildx/util/imagetools"
 	"github.com/docker/buildx/util/platformutil"
 	"github.com/moby/buildkit/client"
-	"github.com/moby/buildkit/util/grpcerrors"
 	ocispecs "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/pkg/errors"
 	"golang.org/x/sync/errgroup"
-	"google.golang.org/grpc/codes"
 )
 
 type Node struct {
@@ -267,15 +265,9 @@ func (n *Node) loadData(ctx context.Context, clientOpt ...client.ClientOpt) erro
 		n.Platforms = platformutil.Dedupe(n.Platforms)
 		inf, err := driverClient.Info(ctx)
 		if err != nil {
-			if st, ok := grpcerrors.AsGRPCStatus(err); ok && st.Code() == codes.Unimplemented {
-				n.Version, err = n.Driver.Version(ctx)
-				if err != nil {
-					return errors.Wrap(err, "getting version")
-				}
-			}
-		} else {
-			n.Version = inf.BuildkitVersion.Version
+			return errors.Wrap(err, "getting version")
 		}
+		n.Version = inf.BuildkitVersion.Version
 	}
 	return nil
 }

driver/docker-container/driver.go

@@ -366,22 +366,6 @@ func (d *Driver) Info(ctx context.Context) (*driver.Info, error) {
 	}, nil
 }
 
-func (d *Driver) Version(ctx context.Context) (string, error) {
-	bufStdout := &bytes.Buffer{}
-	bufStderr := &bytes.Buffer{}
-	if err := d.run(ctx, []string{"buildkitd", "--version"}, bufStdout, bufStderr); err != nil {
-		if bufStderr.Len() > 0 {
-			return "", errors.Wrap(err, bufStderr.String())
-		}
-		return "", err
-	}
-	version := strings.Fields(bufStdout.String())
-	if len(version) != 4 {
-		return "", errors.Errorf("unexpected version format: %s", bufStdout.String())
-	}
-	return version[2], nil
-}
-
 func (d *Driver) Stop(ctx context.Context, force bool) error {
 	info, err := d.Info(ctx)
 	if err != nil {

driver/docker/driver.go

@@ -3,7 +3,6 @@ package docker
 import (
 	"context"
 	"net"
-	"strings"
 	"sync"
 
 	"github.com/docker/buildx/driver"
@@ -36,18 +35,6 @@ func (d *Driver) Info(ctx context.Context) (*driver.Info, error) {
 	}, nil
 }
 
-func (d *Driver) Version(ctx context.Context) (string, error) {
-	v, err := d.DockerAPI.ServerVersion(ctx)
-	if err != nil {
-		return "", errors.Wrap(driver.ErrNotConnecting{}, err.Error())
-	}
-	if bkversion, _ := resolveBuildKitVersion(v.Version); bkversion != "" {
-		return bkversion, nil
-	}
-	// https://github.com/moby/moby/blob/efc7a2abc3ab6dfa7d8d5d8c1c3b99138989b0f1/builder/builder-next/worker/worker.go#L176
-	return strings.TrimSuffix(v.Version, "-moby"), nil
-}
-
 func (d *Driver) Stop(ctx context.Context, force bool) error {
 	return nil
 }