kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Update engine-api

Browse source 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
This commit is contained in:
Brian Goff 2016-04-29 14:01:54 -04:00
parent 2f6e3b0ba0
commit 988f481643
5 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
hack/vendor.sh
View file

@ -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 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-units 651fc226e7441360384da338d0fd37f2440ffbe3
clone git github.com/docker/go-connections v0.2.0 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/RackSec/srslog 259aed10dfa74ea2961eddd1d9847619f6e98837
clone git github.com/imdario/mergo 0.2.1 clone git github.com/imdario/mergo 0.2.1

4
vendor/src/github.com/docker/engine-api/client/container_logs.go vendored
View file

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

4
vendor/src/github.com/docker/engine-api/client/image_load.go vendored
View file

@ -10,8 +10,8 @@ import (
) )
// ImageLoad loads an image in the docker host from the client host. // 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) { func (cli *Client) ImageLoad(ctx context.Context, input io.Reader, quiet bool) (types.ImageLoadResponse, error) {
v := url.Values{} v := url.Values{}
v.Set("quiet", "0") v.Set("quiet", "0")

2
vendor/src/github.com/docker/engine-api/types/client.go vendored
View file

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

1
vendor/src/github.com/docker/engine-api/types/types.go vendored
View file

@ -395,6 +395,7 @@ type Volume struct {
Mountpoint string // Mountpoint is the location on disk of the volume 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 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 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: // VolumesListResponse contains the response for the remote API: