projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
15370: Bump docker API version to 1.35.
[arvados.git]
/
cmd
/
arvados-package
/
build.go
diff --git
a/cmd/arvados-package/build.go
b/cmd/arvados-package/build.go
index 68dda8a5e296069abd42905186d66c16c5a8c7af..9841c890b78a9f8363817d135e915bea29c6b472 100644
(file)
--- a/
cmd/arvados-package/build.go
+++ b/
cmd/arvados-package/build.go
@@
-16,6
+16,7
@@
import (
"path/filepath"
"strings"
"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"
"git.arvados.org/arvados.git/sdk/go/ctxlog"
"github.com/docker/docker/api/types"
"github.com/docker/docker/client"
@@
-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 {
}
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
}