Merge branch '21815-trigrams-exclude-ids'

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

diff --git a/cmd/arvados-package/build.go b/cmd/arvados-package/build.go
index 68dda8a5e296069abd42905186d66c16c5a8c7af..fe076b8f59a21d0348da9ce7b93107117f038592 100644 (file)
--- a/cmd/arvados-package/build.go
+++ b/cmd/arvados-package/build.go
@@ -16,8 +16,9 @@ import (
        "path/filepath"
        "strings"
 
        "path/filepath"
        "strings"
 

+       "git.arvados.org/arvados.git/lib/crunchrun"

        "git.arvados.org/arvados.git/sdk/go/ctxlog"
        "git.arvados.org/arvados.git/sdk/go/ctxlog"

-       "github.com/docker/docker/api/types"
+       "github.com/docker/docker/api/types/container"

        "github.com/docker/docker/client"
 )
 
        "github.com/docker/docker/client"
 )
 


@@ -132,23 +133,30 @@ func build(ctx context.Context, opts opts, stdin io.Reader, stdout, stderr io.Wr
        if err != nil {
                return err
        }
        if err != nil {
                return err
        }

+       cmd = exec.CommandContext(ctx, "ls", "-l", opts.PackageDir+"/"+packageFilename)
+       cmd.Stdout = stdout
+       cmd.Stderr = stderr
+       err = cmd.Run()
+       if err != nil {
+               return err
+       }

 
        return nil
 }
 
 func dockerRm(ctx context.Context, name string) error {
 
        return nil
 }
 
 func dockerRm(ctx context.Context, name string) error {

-       cli, err := client.NewClient(client.DefaultDockerHost, "1.21", nil, nil)
+       cli, err := client.NewClient(client.DefaultDockerHost, crunchrun.DockerAPIVersion, nil, nil)

        if err != nil {
                return err
        }
        if err != nil {
                return err
        }

-       ctrs, err := cli.ContainerList(ctx, types.ContainerListOptions{All: true, Limit: -1})
+       ctrs, err := cli.ContainerList(ctx, container.ListOptions{All: true, Limit: -1})

        if err != nil {
                return err
        }
        for _, ctr := range ctrs {
                for _, ctrname := range ctr.Names {
                        if ctrname == "/"+name {
        if err != nil {
                return err
        }
        for _, ctr := range ctrs {
                for _, ctrname := range ctr.Names {
                        if ctrname == "/"+name {

-                               err = cli.ContainerRemove(ctx, ctr.ID, types.ContainerRemoveOptions{})
+                               err = cli.ContainerRemove(ctx, ctr.ID, container.RemoveOptions{})

                                if err != nil {
                                        return fmt.Errorf("error removing container %s: %w", ctr.ID, err)
                                }
                                if err != nil {
                                        return fmt.Errorf("error removing container %s: %w", ctr.ID, err)
                                }