19175: Merge branch 'main' into 19175-doc-refactor-multi-host-installation

[arvados.git] / cmd / arvados-package / build.go

diff --git a/cmd/arvados-package/build.go b/cmd/arvados-package/build.go
index 8268ea9bac31b9948ecffbc5d492055c95b9c4d8..9841c890b78a9f8363817d135e915bea29c6b472 100644 (file)
--- a/cmd/arvados-package/build.go
+++ b/cmd/arvados-package/build.go
@@ -16,6 +16,7 @@ import (
        "path/filepath"
        "strings"
 
+       "git.arvados.org/arvados.git/lib/crunchrun"
        "git.arvados.org/arvados.git/sdk/go/ctxlog"
        "github.com/docker/docker/api/types"
        "github.com/docker/docker/client"
@@ -24,13 +25,13 @@ import (
 func build(ctx context.Context, opts opts, stdin io.Reader, stdout, stderr io.Writer) error {
        if opts.PackageVersion == "" {
                var buf bytes.Buffer
-               cmd := exec.CommandContext(ctx, "git", "describe", "--tag", "--dirty")
+               cmd := exec.CommandContext(ctx, "bash", "./build/version-at-commit.sh", "HEAD")
                cmd.Stdout = &buf
                cmd.Stderr = stderr
                cmd.Dir = opts.SourceDir
                err := cmd.Run()
                if err != nil {
-                       return fmt.Errorf("git describe: %w", err)
+                       return fmt.Errorf("%v: %w", cmd.Args, err)
                }
                opts.PackageVersion = strings.TrimSpace(buf.String())
                ctxlog.FromContext(ctx).Infof("version not specified; using %s", opts.PackageVersion)
@@ -137,7 +138,7 @@ func build(ctx context.Context, opts opts, stdin io.Reader, stdout, stderr io.Wr
 }
 
 func dockerRm(ctx context.Context, name string) error {
-       cli, err := client.NewEnvClient()
+       cli, err := client.NewClient(client.DefaultDockerHost, crunchrun.DockerAPIVersion, nil, nil)
        if err != nil {
                return err
        }