15370: Fix unspecified docker API version requirement.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>

diff --git a/cmd/arvados-package/build.go b/cmd/arvados-package/build.go
index 27531d3bc3dcd871013849bd6b0efbda91175085..68dda8a5e296069abd42905186d66c16c5a8c7af 100644 (file)
--- a/cmd/arvados-package/build.go
+++ b/cmd/arvados-package/build.go
@@ -137,7 +137,7 @@ func build(ctx context.Context, opts opts, stdin io.Reader, stdout, stderr io.Wr
 }
 
 func dockerRm(ctx context.Context, name string) error {
 }
 
 func dockerRm(ctx context.Context, name string) error {

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

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

diff --git a/cmd/arvados-package/install.go b/cmd/arvados-package/install.go
index 6b6113b9522fb754e6dc8bc5454dc07add29ac25..437a1ad21bf43f60c054da1f256c09d4f0e4e84a 100644 (file)
--- a/cmd/arvados-package/install.go
+++ b/cmd/arvados-package/install.go
@@ -134,7 +134,7 @@ exec arvados-server boot -listen-host=0.0.0.0 -no-workbench2=false $bootargs
 }
 
 func dockerImageExists(ctx context.Context, name string) (bool, error) {
 }
 
 func dockerImageExists(ctx context.Context, name string) (bool, error) {

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

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