fix(docker): Negotiate api version with server (#122)

Signed-off-by: Ce Gao <cegao@tensorchord.ai>
tensorchord · May 9, 2022 · 870cebd · 870cebd
1 parent da4d1a0
commit 870cebd
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/cmd/midi/destroy.go b/cmd/midi/destroy.go
@@ -32,7 +32,7 @@ var CommandDestroy = &cli.Command{
 }
 
 func destroy(clicontext *cli.Context) error {
-	dockerClient, err := docker.NewClient()
+	dockerClient, err := docker.NewClient(clicontext.Context)
 	if err != nil {
 		return err
 	}

diff --git a/cmd/midi/up.go b/cmd/midi/up.go
@@ -95,7 +95,7 @@ func up(clicontext *cli.Context) error {
 	}
 	gpu := builder.GPUEnabled()
 
-	dockerClient, err := docker.NewClient()
+	dockerClient, err := docker.NewClient(clicontext.Context)
 	if err != nil {
 		return err
 	}

diff --git a/pkg/builder/builder.go b/pkg/builder/builder.go
@@ -150,7 +150,7 @@ func (b generalBuilder) Build(ctx context.Context) error {
 	// Load the image to docker host.
 	eg.Go(func() error {
 		defer pipeR.Close()
-		dockerClient, err := docker.NewClient()
+		dockerClient, err := docker.NewClient(ctx)
 		if err != nil {
 			return errors.Wrap(err, "failed to new docker client")
 		}

diff --git a/pkg/buildkitd/buildkitd.go b/pkg/buildkitd/buildkitd.go
@@ -89,7 +89,7 @@ func (c generalClient) Close() error {
 // that can be used to connect to it.
 func (c *generalClient) maybeStart(ctx context.Context,
 	runningTimeout, connectingTimeout time.Duration) (string, error) {
-	dockerClient, err := docker.NewClient()
+	dockerClient, err := docker.NewClient(ctx)
 	if err != nil {
 		return "", err
 	}

diff --git a/pkg/docker/docker.go b/pkg/docker/docker.go
@@ -57,11 +57,12 @@ type generalClient struct {
 	*client.Client
 }
 
-func NewClient() (Client, error) {
+func NewClient(ctx context.Context) (Client, error) {
 	cli, err := client.NewClientWithOpts(client.FromEnv)
 	if err != nil {
 		return nil, err
 	}
+	cli.NegotiateAPIVersion(ctx)
 	return generalClient{cli}, nil
 }