@@ -114,7 +114,7 @@ github.com/googleapis/gax-go v2.0.0

 google.golang.org/genproto 694d95ba50e67b2e363f3483057db5d4910c18f9

 # containerd

-github.com/containerd/containerd v1.2.0-beta.0

+github.com/containerd/containerd 3f42445e38d1081f4b8c3b8d7d1ed1860198ed7a

 github.com/containerd/fifo 3d5202aec260678c48179c56f40e6f38a095738c

 github.com/containerd/continuity d3c23511c1bf5851696cba83143d9cbcd666869b

 github.com/containerd/cgroups 5e610833b72089b37d0e615de9a92dfc043757c2

@@ -259,7 +259,7 @@ func fileInfoFromHeader(hdr *tar.Header) (name string, size int64, fileInfo *win

 		if err != nil {

 			return "", 0, nil, err

 		}

-		fileInfo.FileAttributes = uintptr(attr)

+		fileInfo.FileAttributes = uint32(attr)

 	} else {

 		if hdr.Typeflag == tar.TypeDir {

 			fileInfo.FileAttributes |= syscall.FILE_ATTRIBUTE_DIRECTORY

@@ -82,6 +82,9 @@ func New(address string, opts ...ClientOpt) (*Client, error) {

 			return nil, err

 		}

 	}

+	if copts.timeout == 0 {

+		copts.timeout = 10 * time.Second

+	}

 	rt := fmt.Sprintf("%s.%s", plugin.RuntimePlugin, runtime.GOOS)

 	if copts.defaultRuntime != "" {

 		rt = copts.defaultRuntime

@@ -115,7 +118,7 @@ func New(address string, opts ...ClientOpt) (*Client, error) {

 			)

 		}

 		connector := func() (*grpc.ClientConn, error) {

-			ctx, cancel := context.WithTimeout(context.Background(), 60*time.Second)

+			ctx, cancel := context.WithTimeout(context.Background(), copts.timeout)

 			defer cancel()

 			conn, err := grpc.DialContext(ctx, dialer.DialAddress(address), gopts...)

 			if err != nil {

@@ -17,6 +17,8 @@

 package containerd

 import (

+	"time"

+

 	"github.com/containerd/containerd/images"

 	"github.com/containerd/containerd/platforms"

 	"github.com/containerd/containerd/remotes"

@@ -28,6 +30,7 @@ type clientOpts struct {

 	defaultRuntime string

 	services       *services

 	dialOptions    []grpc.DialOption

+	timeout        time.Duration

 }

 // ClientOpt allows callers to set options on the containerd client

@@ -71,6 +74,14 @@ func WithServices(opts ...ServicesOpt) ClientOpt {

 	}

 }

+// WithTimeout sets the connection timeout for the client

+func WithTimeout(d time.Duration) ClientOpt {

+	return func(c *clientOpts) error {

+		c.timeout = d

+		return nil

+	}

+}

+

 // RemoteOpt allows the caller to set distribution options for a remote

 type RemoteOpt func(*Client, *RemoteContext) error

@@ -20,7 +20,7 @@ github.com/gogo/protobuf v1.0.0

 github.com/gogo/googleapis 08a7655d27152912db7aaf4f983275eaf8d128ef

 github.com/golang/protobuf v1.1.0

 github.com/opencontainers/runtime-spec d810dbc60d8c5aeeb3d054bd1132fab2121968ce # v1.0.1-43-gd810dbc

-github.com/opencontainers/runc 69663f0bd4b60df09991c08812a60108003fa340

+github.com/opencontainers/runc 20aff4f0488c6d4b8df4d85b4f63f1f704c11abd

 github.com/sirupsen/logrus v1.0.0

 github.com/urfave/cli 7bc6a0acffa589f415f88aca16cc1de5ffd66f9c

 golang.org/x/net b3756b4b77d7b13260a0a2ec658753cf48922eac

@@ -32,8 +32,8 @@ github.com/opencontainers/image-spec v1.0.1

 golang.org/x/sync 450f422ab23cf9881c94e2db30cac0eb1b7cf80c

 github.com/BurntSushi/toml a368813c5e648fee92e5f6c30e3944ff9d5e8895

 github.com/grpc-ecosystem/go-grpc-prometheus 6b7015e65d366bf3f19b2b2a000a831940f0f7e0

-github.com/Microsoft/go-winio v0.4.7

-github.com/Microsoft/hcsshim v0.6.11

+github.com/Microsoft/go-winio v0.4.10

+github.com/Microsoft/hcsshim v0.6.14

 github.com/boltdb/bolt e9cf4fae01b5a8ff89d0ec6b32f0d9c9f79aefdd

 google.golang.org/genproto d80a6e20e776b0b17a324d0ba1ab50a39c8e8944

 golang.org/x/text 19e51611da83d6be54ddafce4a4af510cb3e9ea4