Merge pull request #22422 from cpuguy83/vendor_engine-api

Update engine-api

hack/vendor.sh

@@ -25,7 +25,7 @@ clone git golang.org/x/net 78cb2c067747f08b343f20614155233ab4ea2ad3 https://gith
 clone git golang.org/x/sys eb2c74142fd19a79b3f237334c7384d5167b1b46 https://github.com/golang/sys.git
 clone git github.com/docker/go-units 651fc226e7441360384da338d0fd37f2440ffbe3
 clone git github.com/docker/go-connections v0.2.0
-clone git github.com/docker/engine-api b7e5e1ecd6121d7b643d607f20ced0cb5c93739c
+clone git github.com/docker/engine-api 009426d98aa84d199210a897dbb60bfee541877d
 clone git github.com/RackSec/srslog 259aed10dfa74ea2961eddd1d9847619f6e98837
 clone git github.com/imdario/mergo 0.2.1
 

vendor/src/github.com/docker/engine-api/client/container_logs.go

@@ -35,6 +35,10 @@ func (cli *Client) ContainerLogs(ctx context.Context, container string, options
 		query.Set("timestamps", "1")
 	}
 
+	if options.Details {
+		query.Set("details", "1")
+	}
+
 	if options.Follow {
 		query.Set("follow", "1")
 	}

vendor/src/github.com/docker/engine-api/client/image_load.go

@@ -10,8 +10,8 @@ import (
 )
 
 // ImageLoad loads an image in the docker host from the client host.
-// It's up to the caller to close the io.ReadCloser returned by
+// It's up to the caller to close the io.ReadCloser in the
-// this function.
+// ImageLoadResponse returned by this function.
 func (cli *Client) ImageLoad(ctx context.Context, input io.Reader, quiet bool) (types.ImageLoadResponse, error) {
 	v := url.Values{}
 	v.Set("quiet", "0")

vendor/src/github.com/docker/engine-api/types/client.go

@@ -57,6 +57,7 @@ type ContainerLogsOptions struct {
 	Timestamps bool
 	Follow     bool
 	Tail       string
+	Details    bool
 }
 
 // ContainerRemoveOptions holds parameters to remove containers.
@@ -172,6 +173,7 @@ type ImageListOptions struct {
 
 // ImageLoadResponse returns information to the client about a load process.
 type ImageLoadResponse struct {
+	// Body must be closed to avoid a resource leak
 	Body io.ReadCloser
 	JSON bool
 }

vendor/src/github.com/docker/engine-api/types/types.go

@@ -395,6 +395,7 @@ type Volume struct {
 	Mountpoint string                 // Mountpoint is the location on disk of the volume
 	Status     map[string]interface{} `json:",omitempty"` // Status provides low-level status information about the volume
 	Labels     map[string]string      // Labels is metadata specific to the volume
+	Scope      string                 // Scope describes the level at which the volume exists (e.g. `global` for cluster-wide or `local` for machine level)
 }
 
 // VolumesListResponse contains the response for the remote API: