From 8ea051f01261c44512bcaa76569a7fb9a200bab6 Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Thu, 2 Jun 2016 16:55:49 +0200 Subject: [PATCH] Update engine-api to 009ba1641d669613b38818f6f6385b0e74c5728f Signed-off-by: Vincent Demeester --- hack/vendor.sh | 2 +- .../docker/engine-api/client/container_start.go | 8 ++++++-- .../docker/engine-api/client/image_search.go | 2 ++ .../github.com/docker/engine-api/client/interface.go | 2 +- .../src/github.com/docker/engine-api/types/client.go | 6 ++++++ .../docker/engine-api/types/container/host_config.go | 3 ++- .../github.com/docker/engine-api/types/seccomp.go | 5 +++++ .../src/github.com/docker/engine-api/types/types.go | 12 ++++++++++++ 8 files changed, 35 insertions(+), 5 deletions(-) diff --git a/hack/vendor.sh b/hack/vendor.sh index 4dfcecff40..73a4458af5 100755 --- a/hack/vendor.sh +++ b/hack/vendor.sh @@ -60,7 +60,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 6facb3f3c38717b8f618dcedc4c8ce20d1bfc61e +clone git github.com/docker/engine-api 009ba1641d669613b38818f6f6385b0e74c5728f 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_start.go b/vendor/src/github.com/docker/engine-api/client/container_start.go index ff11c4cf0e..1e22eec641 100644 --- a/vendor/src/github.com/docker/engine-api/client/container_start.go +++ b/vendor/src/github.com/docker/engine-api/client/container_start.go @@ -4,12 +4,16 @@ import ( "net/url" "golang.org/x/net/context" + + "github.com/docker/engine-api/types" ) // ContainerStart sends a request to the docker daemon to start a container. -func (cli *Client) ContainerStart(ctx context.Context, containerID string, checkpointID string) error { +func (cli *Client) ContainerStart(ctx context.Context, containerID string, options types.ContainerStartOptions) error { query := url.Values{} - query.Set("checkpoint", checkpointID) + if len(options.CheckpointID) != 0 { + query.Set("checkpoint", options.CheckpointID) + } resp, err := cli.post(ctx, "/containers/"+containerID+"/start", query, nil, nil) ensureReaderClosed(resp) diff --git a/vendor/src/github.com/docker/engine-api/client/image_search.go b/vendor/src/github.com/docker/engine-api/client/image_search.go index 312e5b1efa..3940dfd799 100644 --- a/vendor/src/github.com/docker/engine-api/client/image_search.go +++ b/vendor/src/github.com/docker/engine-api/client/image_search.go @@ -2,6 +2,7 @@ package client import ( "encoding/json" + "fmt" "net/http" "net/url" @@ -17,6 +18,7 @@ func (cli *Client) ImageSearch(ctx context.Context, term string, options types.I var results []registry.SearchResult query := url.Values{} query.Set("term", term) + query.Set("limit", fmt.Sprintf("%d", options.Limit)) if options.Filters.Len() > 0 { filterJSON, err := filters.ToParam(options.Filters) diff --git a/vendor/src/github.com/docker/engine-api/client/interface.go b/vendor/src/github.com/docker/engine-api/client/interface.go index 85d1a7d290..d561e4cd46 100644 --- a/vendor/src/github.com/docker/engine-api/client/interface.go +++ b/vendor/src/github.com/docker/engine-api/client/interface.go @@ -40,7 +40,7 @@ type APIClient interface { ContainerRestart(ctx context.Context, container string, timeout int) error ContainerStatPath(ctx context.Context, container, path string) (types.ContainerPathStat, error) ContainerStats(ctx context.Context, container string, stream bool) (io.ReadCloser, error) - ContainerStart(ctx context.Context, container string, checkpointID string) error + ContainerStart(ctx context.Context, container string, options types.ContainerStartOptions) error ContainerStop(ctx context.Context, container string, timeout int) error ContainerTop(ctx context.Context, container string, arguments []string) (types.ContainerProcessList, error) ContainerUnpause(ctx context.Context, container string) error 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 5e8fbbab48..05d6cfaeba 100644 --- a/vendor/src/github.com/docker/engine-api/types/client.go +++ b/vendor/src/github.com/docker/engine-api/types/client.go @@ -73,6 +73,11 @@ type ContainerRemoveOptions struct { Force bool } +// ContainerStartOptions holds parameters to start containers. +type ContainerStartOptions struct { + CheckpointID string +} + // CopyToContainerOptions holds information // about files to copy into a container type CopyToContainerOptions struct { @@ -213,6 +218,7 @@ type ImageSearchOptions struct { RegistryAuth string PrivilegeFunc RequestPrivilegeFunc Filters filters.Args + Limit int } // ResizeOptions holds parameters to resize a tty. diff --git a/vendor/src/github.com/docker/engine-api/types/container/host_config.go b/vendor/src/github.com/docker/engine-api/types/container/host_config.go index 039fa04e4e..43c33434c8 100644 --- a/vendor/src/github.com/docker/engine-api/types/container/host_config.go +++ b/vendor/src/github.com/docker/engine-api/types/container/host_config.go @@ -308,7 +308,8 @@ type HostConfig struct { UTSMode UTSMode // UTS namespace to use for the container UsernsMode UsernsMode // The user namespace to use for the container ShmSize int64 // Total shm memory usage - Sysctls map[string]string `json:",omitempty"` // List of Namespaced sysctls used for the container + Sysctls map[string]string `json:",omitempty"` // List of Namespaced sysctls used for the container + Runtime string `json:"runtime,omitempty"` // Runtime to use with this container // Applicable to Windows ConsoleSize [2]int // Initial console size diff --git a/vendor/src/github.com/docker/engine-api/types/seccomp.go b/vendor/src/github.com/docker/engine-api/types/seccomp.go index e0305a9e37..854f1c4538 100644 --- a/vendor/src/github.com/docker/engine-api/types/seccomp.go +++ b/vendor/src/github.com/docker/engine-api/types/seccomp.go @@ -24,6 +24,11 @@ const ( ArchMIPSEL Arch = "SCMP_ARCH_MIPSEL" ArchMIPSEL64 Arch = "SCMP_ARCH_MIPSEL64" ArchMIPSEL64N32 Arch = "SCMP_ARCH_MIPSEL64N32" + ArchPPC Arch = "SCMP_ARCH_PPC" + ArchPPC64 Arch = "SCMP_ARCH_PPC64" + ArchPPC64LE Arch = "SCMP_ARCH_PPC64LE" + ArchS390 Arch = "SCMP_ARCH_S390" + ArchS390X Arch = "SCMP_ARCH_S390X" ) // Action taken upon Seccomp rule match 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 83e56735be..c0858c747d 100644 --- a/vendor/src/github.com/docker/engine-api/types/types.go +++ b/vendor/src/github.com/docker/engine-api/types/types.go @@ -252,6 +252,8 @@ type Info struct { ClusterStore string ClusterAdvertise string SecurityOptions []string + Runtimes map[string]Runtime + DefaultRuntime string } // PluginsInfo is a temp struct holding Plugins name @@ -476,3 +478,13 @@ type NetworkDisconnect struct { type Checkpoint struct { Name string // Name is the name of the checkpoint } + +// DefaultRuntimeName is the reserved name/alias used to represent the +// OCI runtime being shipped with the docker daemon package. +var DefaultRuntimeName = "default" + +// Runtime describes an OCI runtime +type Runtime struct { + Path string `json:"path"` + Args []string `json:"runtimeArgs,omitempty"` +}