From 988f48164346f5cae713c630d884089958748238 Mon Sep 17 00:00:00 2001 From: Brian Goff Date: Fri, 29 Apr 2016 14:01:54 -0400 Subject: [PATCH] Update engine-api Signed-off-by: Brian Goff --- hack/vendor.sh | 2 +- .../src/github.com/docker/engine-api/client/container_logs.go | 4 ++++ vendor/src/github.com/docker/engine-api/client/image_load.go | 4 ++-- vendor/src/github.com/docker/engine-api/types/client.go | 2 ++ vendor/src/github.com/docker/engine-api/types/types.go | 1 + 5 files changed, 10 insertions(+), 3 deletions(-) diff --git a/hack/vendor.sh b/hack/vendor.sh index 46c4bfb113..6827b1efab 100755 --- a/hack/vendor.sh +++ b/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 diff --git a/vendor/src/github.com/docker/engine-api/client/container_logs.go b/vendor/src/github.com/docker/engine-api/client/container_logs.go index 9699ac7dde..08b9b91876 100644 --- a/vendor/src/github.com/docker/engine-api/client/container_logs.go +++ b/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") } diff --git a/vendor/src/github.com/docker/engine-api/client/image_load.go b/vendor/src/github.com/docker/engine-api/client/image_load.go index 84ee19c309..72f55fdc01 100644 --- a/vendor/src/github.com/docker/engine-api/client/image_load.go +++ b/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 -// this function. +// It's up to the caller to close the io.ReadCloser in the +// 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") diff --git a/vendor/src/github.com/docker/engine-api/types/client.go b/vendor/src/github.com/docker/engine-api/types/client.go index ab61103842..8218b17420 100644 --- a/vendor/src/github.com/docker/engine-api/types/client.go +++ b/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 } diff --git a/vendor/src/github.com/docker/engine-api/types/types.go b/vendor/src/github.com/docker/engine-api/types/types.go index 406b561a6e..cb2dc9ac9d 100644 --- a/vendor/src/github.com/docker/engine-api/types/types.go +++ b/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: