@@ -24,7 +24,7 @@ clone git golang.org/x/net 47990a1ba55743e6ef1affd3a14e5bac8553615d 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 9bab0d5b73872e53dfadfa055dcc519e57b09439

+clone git github.com/docker/engine-api 6de18e18540cda038b00e71a1f2946d779e83f87

 clone git github.com/RackSec/srslog 259aed10dfa74ea2961eddd1d9847619f6e98837

 clone git github.com/imdario/mergo 0.2.1

@@ -4,13 +4,14 @@ import (

 	"net/url"

 	"github.com/docker/engine-api/types"

+	"golang.org/x/net/context"

 )

 // ContainerAttach attaches a connection to a container in the server.

 // It returns a types.HijackedConnection with the hijacked connection

 // and the a reader to get output. It's up to the called to close

 // the hijacked connection by calling types.HijackedResponse.Close.

-func (cli *Client) ContainerAttach(options types.ContainerAttachOptions) (types.HijackedResponse, error) {

+func (cli *Client) ContainerAttach(ctx context.Context, options types.ContainerAttachOptions) (types.HijackedResponse, error) {

 	query := url.Values{}

 	if options.Stream {

 		query.Set("stream", "1")

@@ -29,5 +30,5 @@ func (cli *Client) ContainerAttach(options types.ContainerAttachOptions) (types.

 	}

 	headers := map[string][]string{"Content-Type": {"text/plain"}}

-	return cli.postHijacked("/containers/"+options.ContainerID+"/attach", query, nil, headers)

+	return cli.postHijacked(ctx, "/containers/"+options.ContainerID+"/attach", query, nil, headers)

 }

@@ -5,10 +5,11 @@ import (

 	"net/url"

 	"github.com/docker/engine-api/types"

+	"golang.org/x/net/context"

 )

 // ContainerCommit applies changes into a container and creates a new tagged image.

-func (cli *Client) ContainerCommit(options types.ContainerCommitOptions) (types.ContainerCommitResponse, error) {

+func (cli *Client) ContainerCommit(ctx context.Context, options types.ContainerCommitOptions) (types.ContainerCommitResponse, error) {

 	query := url.Values{}

 	query.Set("container", options.ContainerID)

 	query.Set("repo", options.RepositoryName)

@@ -23,7 +24,7 @@ func (cli *Client) ContainerCommit(options types.ContainerCommitOptions) (types.

 	}

 	var response types.ContainerCommitResponse

-	resp, err := cli.post("/commit", query, options.Config, nil)

+	resp, err := cli.post(ctx, "/commit", query, options.Config, nil)

 	if err != nil {

 		return response, err

 	}

@@ -16,12 +16,12 @@ import (

 )

 // ContainerStatPath returns Stat information about a path inside the container filesystem.

-func (cli *Client) ContainerStatPath(containerID, path string) (types.ContainerPathStat, error) {

+func (cli *Client) ContainerStatPath(ctx context.Context, containerID, path string) (types.ContainerPathStat, error) {

 	query := url.Values{}

 	query.Set("path", filepath.ToSlash(path)) // Normalize the paths used in the API.

 	urlStr := fmt.Sprintf("/containers/%s/archive", containerID)

-	response, err := cli.head(urlStr, query, nil)

+	response, err := cli.head(ctx, urlStr, query, nil)

 	if err != nil {

 		return types.ContainerPathStat{}, err

 	}

@@ -40,7 +40,7 @@ func (cli *Client) CopyToContainer(ctx context.Context, options types.CopyToCont

 	path := fmt.Sprintf("/containers/%s/archive", options.ContainerID)

-	response, err := cli.putRawWithContext(ctx, path, query, options.Content, nil)

+	response, err := cli.putRaw(ctx, path, query, options.Content, nil)

 	if err != nil {

 		return err

 	}

@@ -60,7 +60,7 @@ func (cli *Client) CopyFromContainer(ctx context.Context, containerID, srcPath s

 	query.Set("path", filepath.ToSlash(srcPath)) // Normalize the paths used in the API.

 	apiPath := fmt.Sprintf("/containers/%s/archive", containerID)

-	response, err := cli.getWithContext(ctx, apiPath, query, nil)

+	response, err := cli.get(ctx, apiPath, query, nil)

 	if err != nil {

 		return nil, types.ContainerPathStat{}, err

 	}

@@ -8,6 +8,7 @@ import (

 	"github.com/docker/engine-api/types"

 	"github.com/docker/engine-api/types/container"

 	"github.com/docker/engine-api/types/network"

+	"golang.org/x/net/context"

 )

 type configWrapper struct {

@@ -18,7 +19,7 @@ type configWrapper struct {

 // ContainerCreate creates a new container based in the given configuration.

 // It can be associated with a name, but it's not mandatory.

-func (cli *Client) ContainerCreate(config *container.Config, hostConfig *container.HostConfig, networkingConfig *network.NetworkingConfig, containerName string) (types.ContainerCreateResponse, error) {

+func (cli *Client) ContainerCreate(ctx context.Context, config *container.Config, hostConfig *container.HostConfig, networkingConfig *network.NetworkingConfig, containerName string) (types.ContainerCreateResponse, error) {

 	var response types.ContainerCreateResponse

 	query := url.Values{}

 	if containerName != "" {

@@ -31,7 +32,7 @@ func (cli *Client) ContainerCreate(config *container.Config, hostConfig *contain

 		NetworkingConfig: networkingConfig,

 	}

-	serverResp, err := cli.post("/containers/create", query, body, nil)

+	serverResp, err := cli.post(ctx, "/containers/create", query, body, nil)

 	if err != nil {

 		if serverResp != nil && serverResp.statusCode == 404 && strings.Contains(err.Error(), "No such image") {

 			return response, imageNotFoundError{config.Image}

@@ -5,13 +5,14 @@ import (

 	"net/url"

 	"github.com/docker/engine-api/types"

+	"golang.org/x/net/context"

 )

 // ContainerDiff shows differences in a container filesystem since it was started.

-func (cli *Client) ContainerDiff(containerID string) ([]types.ContainerChange, error) {

+func (cli *Client) ContainerDiff(ctx context.Context, containerID string) ([]types.ContainerChange, error) {

 	var changes []types.ContainerChange

-	serverResp, err := cli.get("/containers/"+containerID+"/changes", url.Values{}, nil)

+	serverResp, err := cli.get(ctx, "/containers/"+containerID+"/changes", url.Values{}, nil)

 	if err != nil {

 		return changes, err

 	}

@@ -4,12 +4,13 @@ import (

 	"encoding/json"

 	"github.com/docker/engine-api/types"

+	"golang.org/x/net/context"

 )

 // ContainerExecCreate creates a new exec configuration to run an exec process.

-func (cli *Client) ContainerExecCreate(config types.ExecConfig) (types.ContainerExecCreateResponse, error) {

+func (cli *Client) ContainerExecCreate(ctx context.Context, config types.ExecConfig) (types.ContainerExecCreateResponse, error) {

 	var response types.ContainerExecCreateResponse

-	resp, err := cli.post("/containers/"+config.Container+"/exec", nil, config, nil)

+	resp, err := cli.post(ctx, "/containers/"+config.Container+"/exec", nil, config, nil)

 	if err != nil {

 		return response, err

 	}

@@ -19,8 +20,8 @@ func (cli *Client) ContainerExecCreate(config types.ExecConfig) (types.Container

 }

 // ContainerExecStart starts an exec process already create in the docker host.

-func (cli *Client) ContainerExecStart(execID string, config types.ExecStartCheck) error {

-	resp, err := cli.post("/exec/"+execID+"/start", nil, config, nil)

+func (cli *Client) ContainerExecStart(ctx context.Context, execID string, config types.ExecStartCheck) error {

+	resp, err := cli.post(ctx, "/exec/"+execID+"/start", nil, config, nil)

 	ensureReaderClosed(resp)

 	return err

 }

@@ -29,15 +30,15 @@ func (cli *Client) ContainerExecStart(execID string, config types.ExecStartCheck

 // It returns a types.HijackedConnection with the hijacked connection

 // and the a reader to get output. It's up to the called to close

 // the hijacked connection by calling types.HijackedResponse.Close.

-func (cli *Client) ContainerExecAttach(execID string, config types.ExecConfig) (types.HijackedResponse, error) {

+func (cli *Client) ContainerExecAttach(ctx context.Context, execID string, config types.ExecConfig) (types.HijackedResponse, error) {

 	headers := map[string][]string{"Content-Type": {"application/json"}}

-	return cli.postHijacked("/exec/"+execID+"/start", nil, config, headers)

+	return cli.postHijacked(ctx, "/exec/"+execID+"/start", nil, config, headers)

 }

 // ContainerExecInspect returns information about a specific exec process on the docker host.

-func (cli *Client) ContainerExecInspect(execID string) (types.ContainerExecInspect, error) {

+func (cli *Client) ContainerExecInspect(ctx context.Context, execID string) (types.ContainerExecInspect, error) {

 	var response types.ContainerExecInspect

-	resp, err := cli.get("/exec/"+execID+"/json", nil, nil)

+	resp, err := cli.get(ctx, "/exec/"+execID+"/json", nil, nil)

 	if err != nil {

 		return response, err

 	}

@@ -11,7 +11,7 @@ import (

 // and returns them as a io.ReadCloser. It's up to the caller

 // to close the stream.

 func (cli *Client) ContainerExport(ctx context.Context, containerID string) (io.ReadCloser, error) {

-	serverResp, err := cli.getWithContext(ctx, "/containers/"+containerID+"/export", url.Values{}, nil)

+	serverResp, err := cli.get(ctx, "/containers/"+containerID+"/export", url.Values{}, nil)

 	if err != nil {

 		return nil, err

 	}

@@ -8,11 +8,12 @@ import (

 	"net/url"

 	"github.com/docker/engine-api/types"

+	"golang.org/x/net/context"

 )

 // ContainerInspect returns the container information.

-func (cli *Client) ContainerInspect(containerID string) (types.ContainerJSON, error) {

-	serverResp, err := cli.get("/containers/"+containerID+"/json", nil, nil)

+func (cli *Client) ContainerInspect(ctx context.Context, containerID string) (types.ContainerJSON, error) {

+	serverResp, err := cli.get(ctx, "/containers/"+containerID+"/json", nil, nil)

 	if err != nil {

 		if serverResp.statusCode == http.StatusNotFound {

 			return types.ContainerJSON{}, containerNotFoundError{containerID}

@@ -27,12 +28,12 @@ func (cli *Client) ContainerInspect(containerID string) (types.ContainerJSON, er

 }

 // ContainerInspectWithRaw returns the container information and it's raw representation.

-func (cli *Client) ContainerInspectWithRaw(containerID string, getSize bool) (types.ContainerJSON, []byte, error) {

+func (cli *Client) ContainerInspectWithRaw(ctx context.Context, containerID string, getSize bool) (types.ContainerJSON, []byte, error) {

 	query := url.Values{}

 	if getSize {

 		query.Set("size", "1")

 	}

-	serverResp, err := cli.get("/containers/"+containerID+"/json", query, nil)

+	serverResp, err := cli.get(ctx, "/containers/"+containerID+"/json", query, nil)

 	if err != nil {

 		if serverResp.statusCode == http.StatusNotFound {

 			return types.ContainerJSON{}, nil, containerNotFoundError{containerID}

@@ -52,8 +53,8 @@ func (cli *Client) ContainerInspectWithRaw(containerID string, getSize bool) (ty

 	return response, body, err

 }

-func (cli *Client) containerInspectWithResponse(containerID string, query url.Values) (types.ContainerJSON, *serverResponse, error) {

-	serverResp, err := cli.get("/containers/"+containerID+"/json", nil, nil)

+func (cli *Client) containerInspectWithResponse(ctx context.Context, containerID string, query url.Values) (types.ContainerJSON, *serverResponse, error) {

+	serverResp, err := cli.get(ctx, "/containers/"+containerID+"/json", nil, nil)

 	if err != nil {

 		return types.ContainerJSON{}, serverResp, err

 	}

@@ -1,13 +1,17 @@

 package client

-import "net/url"

+import (

+	"net/url"

+

+	"golang.org/x/net/context"

+)

 // ContainerKill terminates the container process but does not remove the container from the docker host.

-func (cli *Client) ContainerKill(containerID, signal string) error {

+func (cli *Client) ContainerKill(ctx context.Context, containerID, signal string) error {

 	query := url.Values{}

 	query.Set("signal", signal)

-	resp, err := cli.post("/containers/"+containerID+"/kill", query, nil, nil)

+	resp, err := cli.post(ctx, "/containers/"+containerID+"/kill", query, nil, nil)

 	ensureReaderClosed(resp)

 	return err

 }

@@ -7,10 +7,11 @@ import (

 	"github.com/docker/engine-api/types"

 	"github.com/docker/engine-api/types/filters"

+	"golang.org/x/net/context"

 )

 // ContainerList returns the list of containers in the docker host.

-func (cli *Client) ContainerList(options types.ContainerListOptions) ([]types.Container, error) {

+func (cli *Client) ContainerList(ctx context.Context, options types.ContainerListOptions) ([]types.Container, error) {

 	query := url.Values{}

 	if options.All {

@@ -42,7 +43,7 @@ func (cli *Client) ContainerList(options types.ContainerListOptions) ([]types.Co

 		query.Set("filters", filterJSON)

 	}

-	resp, err := cli.get("/containers/json", query, nil)

+	resp, err := cli.get(ctx, "/containers/json", query, nil)

 	if err != nil {

 		return nil, err

 	}

@@ -40,7 +40,7 @@ func (cli *Client) ContainerLogs(ctx context.Context, options types.ContainerLog

 	}

 	query.Set("tail", options.Tail)

-	resp, err := cli.getWithContext(ctx, "/containers/"+options.ContainerID+"/logs", query, nil)

+	resp, err := cli.get(ctx, "/containers/"+options.ContainerID+"/logs", query, nil)

 	if err != nil {

 		return nil, err

 	}

@@ -1,8 +1,10 @@

 package client

+import "golang.org/x/net/context"

+

 // ContainerPause pauses the main process of a given container without terminating it.

-func (cli *Client) ContainerPause(containerID string) error {

-	resp, err := cli.post("/containers/"+containerID+"/pause", nil, nil, nil)

+func (cli *Client) ContainerPause(ctx context.Context, containerID string) error {

+	resp, err := cli.post(ctx, "/containers/"+containerID+"/pause", nil, nil, nil)

 	ensureReaderClosed(resp)

 	return err

 }

@@ -4,10 +4,11 @@ import (

 	"net/url"

 	"github.com/docker/engine-api/types"

+	"golang.org/x/net/context"

 )

 // ContainerRemove kills and removes a container from the docker host.

-func (cli *Client) ContainerRemove(options types.ContainerRemoveOptions) error {

+func (cli *Client) ContainerRemove(ctx context.Context, options types.ContainerRemoveOptions) error {

 	query := url.Values{}

 	if options.RemoveVolumes {

 		query.Set("v", "1")

@@ -20,7 +21,7 @@ func (cli *Client) ContainerRemove(options types.ContainerRemoveOptions) error {

 		query.Set("force", "1")

 	}

-	resp, err := cli.delete("/containers/"+options.ContainerID, query, nil)

+	resp, err := cli.delete(ctx, "/containers/"+options.ContainerID, query, nil)

 	ensureReaderClosed(resp)

 	return err

 }

@@ -1,12 +1,16 @@

 package client

-import "net/url"

+import (

+	"net/url"

+

+	"golang.org/x/net/context"

+)

 // ContainerRename changes the name of a given container.

-func (cli *Client) ContainerRename(containerID, newContainerName string) error {

+func (cli *Client) ContainerRename(ctx context.Context, containerID, newContainerName string) error {

 	query := url.Values{}

 	query.Set("name", newContainerName)

-	resp, err := cli.post("/containers/"+containerID+"/rename", query, nil, nil)

+	resp, err := cli.post(ctx, "/containers/"+containerID+"/rename", query, nil, nil)

 	ensureReaderClosed(resp)

 	return err

 }

@@ -5,24 +5,25 @@ import (

 	"strconv"

 	"github.com/docker/engine-api/types"

+	"golang.org/x/net/context"

 )

 // ContainerResize changes the size of the tty for a container.

-func (cli *Client) ContainerResize(options types.ResizeOptions) error {

-	return cli.resize("/containers/"+options.ID, options.Height, options.Width)

+func (cli *Client) ContainerResize(ctx context.Context, options types.ResizeOptions) error {

+	return cli.resize(ctx, "/containers/"+options.ID, options.Height, options.Width)

 }

 // ContainerExecResize changes the size of the tty for an exec process running inside a container.

-func (cli *Client) ContainerExecResize(options types.ResizeOptions) error {

-	return cli.resize("/exec/"+options.ID, options.Height, options.Width)

+func (cli *Client) ContainerExecResize(ctx context.Context, options types.ResizeOptions) error {

+	return cli.resize(ctx, "/exec/"+options.ID, options.Height, options.Width)

 }

-func (cli *Client) resize(basePath string, height, width int) error {

+func (cli *Client) resize(ctx context.Context, basePath string, height, width int) error {

 	query := url.Values{}

 	query.Set("h", strconv.Itoa(height))

 	query.Set("w", strconv.Itoa(width))

-	resp, err := cli.post(basePath+"/resize", query, nil, nil)

+	resp, err := cli.post(ctx, basePath+"/resize", query, nil, nil)

 	ensureReaderClosed(resp)

 	return err

 }

@@ -3,15 +3,17 @@ package client

 import (

 	"net/url"

 	"strconv"

+

+	"golang.org/x/net/context"

 )

 // ContainerRestart stops and starts a container again.

 // It makes the daemon to wait for the container to be up again for

 // a specific amount of time, given the timeout.

-func (cli *Client) ContainerRestart(containerID string, timeout int) error {

+func (cli *Client) ContainerRestart(ctx context.Context, containerID string, timeout int) error {

 	query := url.Values{}

 	query.Set("t", strconv.Itoa(timeout))

-	resp, err := cli.post("/containers/"+containerID+"/restart", query, nil, nil)

+	resp, err := cli.post(ctx, "/containers/"+containerID+"/restart", query, nil, nil)

 	ensureReaderClosed(resp)

 	return err

 }

@@ -1,8 +1,10 @@

 package client

+import "golang.org/x/net/context"

+

 // ContainerStart sends a request to the docker daemon to start a container.

-func (cli *Client) ContainerStart(containerID string) error {

-	resp, err := cli.post("/containers/"+containerID+"/start", nil, nil, nil)

+func (cli *Client) ContainerStart(ctx context.Context, containerID string) error {

+	resp, err := cli.post(ctx, "/containers/"+containerID+"/start", nil, nil, nil)

 	ensureReaderClosed(resp)

 	return err

 }

@@ -16,7 +16,7 @@ func (cli *Client) ContainerStats(ctx context.Context, containerID string, strea

 		query.Set("stream", "1")

 	}

-	resp, err := cli.getWithContext(ctx, "/containers/"+containerID+"/stats", query, nil)

+	resp, err := cli.get(ctx, "/containers/"+containerID+"/stats", query, nil)

 	if err != nil {

 		return nil, err

 	}

@@ -3,14 +3,16 @@ package client

 import (

 	"net/url"

 	"strconv"

+

+	"golang.org/x/net/context"

 )

 // ContainerStop stops a container without terminating the process.

 // The process is blocked until the container stops or the timeout expires.

-func (cli *Client) ContainerStop(containerID string, timeout int) error {

+func (cli *Client) ContainerStop(ctx context.Context, containerID string, timeout int) error {

 	query := url.Values{}

 	query.Set("t", strconv.Itoa(timeout))

-	resp, err := cli.post("/containers/"+containerID+"/stop", query, nil, nil)

+	resp, err := cli.post(ctx, "/containers/"+containerID+"/stop", query, nil, nil)

 	ensureReaderClosed(resp)

 	return err

 }

@@ -6,17 +6,18 @@ import (

 	"strings"

 	"github.com/docker/engine-api/types"

+	"golang.org/x/net/context"

 )

 // ContainerTop shows process information from within a container.

-func (cli *Client) ContainerTop(containerID string, arguments []string) (types.ContainerProcessList, error) {

+func (cli *Client) ContainerTop(ctx context.Context, containerID string, arguments []string) (types.ContainerProcessList, error) {

 	var response types.ContainerProcessList

 	query := url.Values{}

 	if len(arguments) > 0 {

 		query.Set("ps_args", strings.Join(arguments, " "))

 	}

-	resp, err := cli.get("/containers/"+containerID+"/top", query, nil)

+	resp, err := cli.get(ctx, "/containers/"+containerID+"/top", query, nil)

 	if err != nil {

 		return response, err

 	}

@@ -1,8 +1,10 @@

 package client

+import "golang.org/x/net/context"

+

 // ContainerUnpause resumes the process execution within a container

-func (cli *Client) ContainerUnpause(containerID string) error {

-	resp, err := cli.post("/containers/"+containerID+"/unpause", nil, nil, nil)

+func (cli *Client) ContainerUnpause(ctx context.Context, containerID string) error {

+	resp, err := cli.post(ctx, "/containers/"+containerID+"/unpause", nil, nil, nil)

 	ensureReaderClosed(resp)

 	return err

 }

@@ -2,11 +2,12 @@ package client

 import (

 	"github.com/docker/engine-api/types/container"

+	"golang.org/x/net/context"

 )

 // ContainerUpdate updates resources of a container

-func (cli *Client) ContainerUpdate(containerID string, updateConfig container.UpdateConfig) error {

-	resp, err := cli.post("/containers/"+containerID+"/update", nil, updateConfig, nil)

+func (cli *Client) ContainerUpdate(ctx context.Context, containerID string, updateConfig container.UpdateConfig) error {

+	resp, err := cli.post(ctx, "/containers/"+containerID+"/update", nil, updateConfig, nil)

 	ensureReaderClosed(resp)

 	return err

 }

@@ -11,7 +11,7 @@ import (

 // ContainerWait pauses execution util a container is exits.

 // It returns the API status code as response of its readiness.

 func (cli *Client) ContainerWait(ctx context.Context, containerID string) (int, error) {

-	resp, err := cli.postWithContext(ctx, "/containers/"+containerID+"/wait", nil, nil, nil)

+	resp, err := cli.post(ctx, "/containers/"+containerID+"/wait", nil, nil, nil)

 	if err != nil {

 		return -1, err

 	}

@@ -72,7 +72,7 @@ func (e volumeNotFoundError) Error() string {

 // IsErrVolumeNotFound returns true if the error is caused

 // when a volume is not found in the docker host.

 func IsErrVolumeNotFound(err error) bool {

-	_, ok := err.(networkNotFoundError)

+	_, ok := err.(volumeNotFoundError)

 	return ok

 }

@@ -40,7 +40,7 @@ func (cli *Client) Events(ctx context.Context, options types.EventsOptions) (io.

 		query.Set("filters", filterJSON)

 	}

-	serverResponse, err := cli.getWithContext(ctx, "/events", query, nil)

+	serverResponse, err := cli.get(ctx, "/events", query, nil)

 	if err != nil {

 		return nil, err

 	}

@@ -12,6 +12,7 @@ import (

 	"github.com/docker/engine-api/types"

 	"github.com/docker/go-connections/sockets"

+	"golang.org/x/net/context"

 )

 // tlsClientCon holds tls information and a dialed connection.

@@ -30,7 +31,7 @@ func (c *tlsClientCon) CloseWrite() error {

 }

 // postHijacked sends a POST request and hijacks the connection.

-func (cli *Client) postHijacked(path string, query url.Values, body interface{}, headers map[string][]string) (types.HijackedResponse, error) {

+func (cli *Client) postHijacked(ctx context.Context, path string, query url.Values, body interface{}, headers map[string][]string) (types.HijackedResponse, error) {

 	bodyEncoded, err := encodeData(body)

 	if err != nil {

 		return types.HijackedResponse{}, err

@@ -45,7 +46,8 @@ func (cli *Client) postHijacked(path string, query url.Values, body interface{},

 	req.Header.Set("Connection", "Upgrade")

 	req.Header.Set("Upgrade", "tcp")

-	conn, err := dial(cli.proto, cli.addr, cli.transport.TLSConfig())

+	tlsConfig := cli.transport.TLSConfig()

+	conn, err := dial(cli.proto, cli.addr, tlsConfig)

 	if err != nil {

 		if strings.Contains(err.Error(), "connection refused") {

 			return types.HijackedResponse{}, fmt.Errorf("Cannot connect to the Docker daemon. Is 'docker daemon' running on this host?")

@@ -124,21 +126,6 @@ func tlsDialWithDialer(dialer *net.Dialer, network, addr string, config *tls.Con

 		tcpConn.SetKeepAlivePeriod(30 * time.Second)

 	}

-	colonPos := strings.LastIndex(addr, ":")

-	if colonPos == -1 {

-		colonPos = len(addr)

-	}

-	hostname := addr[:colonPos]

-

-	// If no ServerName is set, infer the ServerName

-	// from the hostname we're connecting to.

-	if config.ServerName == "" {

-		// Make a copy to avoid polluting argument or default.

-		c := *config

-		c.ServerName = hostname

-		config = &c

-	}

-

 	conn := tls.Client(rawConn, config)

 	if timeout == 0 {

@@ -24,5 +24,5 @@ func (cli *Client) ImageCreate(ctx context.Context, options types.ImageCreateOpt

 func (cli *Client) tryImageCreate(ctx context.Context, query url.Values, registryAuth string) (*serverResponse, error) {

 	headers := map[string][]string{"X-Registry-Auth": {registryAuth}}

-	return cli.postWithContext(ctx, "/images/create", query, nil, headers)

+	return cli.post(ctx, "/images/create", query, nil, headers)

 }

@@ -5,12 +5,13 @@ import (

 	"net/url"

 	"github.com/docker/engine-api/types"

+	"golang.org/x/net/context"

 )

 // ImageHistory returns the changes in an image in history format.

-func (cli *Client) ImageHistory(imageID string) ([]types.ImageHistory, error) {

+func (cli *Client) ImageHistory(ctx context.Context, imageID string) ([]types.ImageHistory, error) {

 	var history []types.ImageHistory

-	serverResp, err := cli.get("/images/"+imageID+"/history", url.Values{}, nil)

+	serverResp, err := cli.get(ctx, "/images/"+imageID+"/history", url.Values{}, nil)

 	if err != nil {

 		return history, err

 	}

@@ -8,15 +8,16 @@ import (

 	"net/url"

 	"github.com/docker/engine-api/types"

+	"golang.org/x/net/context"

 )

 // ImageInspectWithRaw returns the image information and it's raw representation.

-func (cli *Client) ImageInspectWithRaw(imageID string, getSize bool) (types.ImageInspect, []byte, error) {

+func (cli *Client) ImageInspectWithRaw(ctx context.Context, imageID string, getSize bool) (types.ImageInspect, []byte, error) {

 	query := url.Values{}

 	if getSize {

 		query.Set("size", "1")

 	}

-	serverResp, err := cli.get("/images/"+imageID+"/json", query, nil)

+	serverResp, err := cli.get(ctx, "/images/"+imageID+"/json", query, nil)

 	if err != nil {

 		if serverResp.statusCode == http.StatusNotFound {

 			return types.ImageInspect{}, nil, imageNotFoundError{imageID}

@@ -6,10 +6,11 @@ import (

 	"github.com/docker/engine-api/types"

 	"github.com/docker/engine-api/types/filters"

+	"golang.org/x/net/context"

 )

 // ImageList returns a list of images in the docker host.

-func (cli *Client) ImageList(options types.ImageListOptions) ([]types.Image, error) {

+func (cli *Client) ImageList(ctx context.Context, options types.ImageListOptions) ([]types.Image, error) {

 	var images []types.Image

 	query := url.Values{}

@@ -28,7 +29,7 @@ func (cli *Client) ImageList(options types.ImageListOptions) ([]types.Image, err

 		query.Set("all", "1")

 	}

-	serverResp, err := cli.get("/images/json", query, nil)

+	serverResp, err := cli.get(ctx, "/images/json", query, nil)

 	if err != nil {

 		return images, err

 	}

@@ -34,5 +34,5 @@ func (cli *Client) ImagePush(ctx context.Context, options types.ImagePushOptions

 func (cli *Client) tryImagePush(ctx context.Context, imageID string, query url.Values, registryAuth string) (*serverResponse, error) {

 	headers := map[string][]string{"X-Registry-Auth": {registryAuth}}

-	return cli.postWithContext(ctx, "/images/"+imageID+"/push", query, nil, headers)

+	return cli.post(ctx, "/images/"+imageID+"/push", query, nil, headers)

 }

@@ -5,10 +5,11 @@ import (

 	"net/url"

 	"github.com/docker/engine-api/types"

+	"golang.org/x/net/context"

 )

 // ImageRemove removes an image from the docker host.

-func (cli *Client) ImageRemove(options types.ImageRemoveOptions) ([]types.ImageDelete, error) {

+func (cli *Client) ImageRemove(ctx context.Context, options types.ImageRemoveOptions) ([]types.ImageDelete, error) {

 	query := url.Values{}

 	if options.Force {

@@ -18,7 +19,7 @@ func (cli *Client) ImageRemove(options types.ImageRemoveOptions) ([]types.ImageD

 		query.Set("noprune", "1")

 	}

-	resp, err := cli.delete("/images/"+options.ImageID, query, nil)

+	resp, err := cli.delete(ctx, "/images/"+options.ImageID, query, nil)

 	if err != nil {

 		return nil, err

 	}

@@ -14,7 +14,7 @@ func (cli *Client) ImageSave(ctx context.Context, imageIDs []string) (io.ReadClo

 		"names": imageIDs,

 	}

-	resp, err := cli.getWithContext(ctx, "/images/get", query, nil)

+	resp, err := cli.get(ctx, "/images/get", query, nil)

 	if err != nil {

 		return nil, err

 	}

@@ -7,22 +7,23 @@ import (

 	"github.com/docker/engine-api/types"

 	"github.com/docker/engine-api/types/registry"

+	"golang.org/x/net/context"

 )

 // ImageSearch makes the docker host to search by a term in a remote registry.

 // The list of results is not sorted in any fashion.

-func (cli *Client) ImageSearch(options types.ImageSearchOptions, privilegeFunc RequestPrivilegeFunc) ([]registry.SearchResult, error) {

+func (cli *Client) ImageSearch(ctx context.Context, options types.ImageSearchOptions, privilegeFunc RequestPrivilegeFunc) ([]registry.SearchResult, error) {

 	var results []registry.SearchResult

 	query := url.Values{}

 	query.Set("term", options.Term)

-	resp, err := cli.tryImageSearch(query, options.RegistryAuth)

+	resp, err := cli.tryImageSearch(ctx, query, options.RegistryAuth)

 	if resp.statusCode == http.StatusUnauthorized {

 		newAuthHeader, privilegeErr := privilegeFunc()

 		if privilegeErr != nil {

 			return results, privilegeErr

 		}

-		resp, err = cli.tryImageSearch(query, newAuthHeader)

+		resp, err = cli.tryImageSearch(ctx, query, newAuthHeader)

 	}

 	if err != nil {

 		return results, err

@@ -33,7 +34,7 @@ func (cli *Client) ImageSearch(options types.ImageSearchOptions, privilegeFunc R

 	return results, err

 }

-func (cli *Client) tryImageSearch(query url.Values, registryAuth string) (*serverResponse, error) {

+func (cli *Client) tryImageSearch(ctx context.Context, query url.Values, registryAuth string) (*serverResponse, error) {

 	headers := map[string][]string{"X-Registry-Auth": {registryAuth}}

-	return cli.get("/images/search", query, headers)

+	return cli.get(ctx, "/images/search", query, headers)

 }

@@ -4,10 +4,11 @@ import (

 	"net/url"

 	"github.com/docker/engine-api/types"

+	"golang.org/x/net/context"

 )

 // ImageTag tags an image in the docker host

-func (cli *Client) ImageTag(options types.ImageTagOptions) error {

+func (cli *Client) ImageTag(ctx context.Context, options types.ImageTagOptions) error {

 	query := url.Values{}

 	query.Set("repo", options.RepositoryName)

 	query.Set("tag", options.Tag)

@@ -15,7 +16,7 @@ func (cli *Client) ImageTag(options types.ImageTagOptions) error {

 		query.Set("force", "1")

 	}

-	resp, err := cli.post("/images/"+options.ImageID+"/tag", query, nil, nil)

+	resp, err := cli.post(ctx, "/images/"+options.ImageID+"/tag", query, nil, nil)

 	ensureReaderClosed(resp)

 	return err

 }

@@ -6,12 +6,13 @@ import (

 	"net/url"

 	"github.com/docker/engine-api/types"

+	"golang.org/x/net/context"

 )

 // Info returns information about the docker server.

-func (cli *Client) Info() (types.Info, error) {

+func (cli *Client) Info(ctx context.Context) (types.Info, error) {

 	var info types.Info

-	serverResp, err := cli.get("/info", url.Values{}, nil)

+	serverResp, err := cli.get(ctx, "/info", url.Values{}, nil)

 	if err != nil {

 		return info, err

 	}

@@ -15,63 +15,63 @@ import (

 // APIClient is an interface that clients that talk with a docker server must implement.

 type APIClient interface {

 	ClientVersion() string

-	ContainerAttach(options types.ContainerAttachOptions) (types.HijackedResponse, error)

-	ContainerCommit(options types.ContainerCommitOptions) (types.ContainerCommitResponse, error)

-	ContainerCreate(config *container.Config, hostConfig *container.HostConfig, networkingConfig *network.NetworkingConfig, containerName string) (types.ContainerCreateResponse, error)

-	ContainerDiff(containerID string) ([]types.ContainerChange, error)

-	ContainerExecAttach(execID string, config types.ExecConfig) (types.HijackedResponse, error)

-	ContainerExecCreate(config types.ExecConfig) (types.ContainerExecCreateResponse, error)

-	ContainerExecInspect(execID string) (types.ContainerExecInspect, error)

-	ContainerExecResize(options types.ResizeOptions) error

-	ContainerExecStart(execID string, config types.ExecStartCheck) error

+	ContainerAttach(ctx context.Context, options types.ContainerAttachOptions) (types.HijackedResponse, error)

+	ContainerCommit(ctx context.Context, options types.ContainerCommitOptions) (types.ContainerCommitResponse, error)

+	ContainerCreate(ctx context.Context, config *container.Config, hostConfig *container.HostConfig, networkingConfig *network.NetworkingConfig, containerName string) (types.ContainerCreateResponse, error)

+	ContainerDiff(ctx context.Context, ontainerID string) ([]types.ContainerChange, error)

+	ContainerExecAttach(ctx context.Context, execID string, config types.ExecConfig) (types.HijackedResponse, error)

+	ContainerExecCreate(ctx context.Context, config types.ExecConfig) (types.ContainerExecCreateResponse, error)

+	ContainerExecInspect(ctx context.Context, execID string) (types.ContainerExecInspect, error)

+	ContainerExecResize(ctx context.Context, options types.ResizeOptions) error

+	ContainerExecStart(ctx context.Context, execID string, config types.ExecStartCheck) error

 	ContainerExport(ctx context.Context, containerID string) (io.ReadCloser, error)

-	ContainerInspect(containerID string) (types.ContainerJSON, error)

-	ContainerInspectWithRaw(containerID string, getSize bool) (types.ContainerJSON, []byte, error)

-	ContainerKill(containerID, signal string) error

-	ContainerList(options types.ContainerListOptions) ([]types.Container, error)

+	ContainerInspect(ctx context.Context, containerID string) (types.ContainerJSON, error)

+	ContainerInspectWithRaw(ctx context.Context, containerID string, getSize bool) (types.ContainerJSON, []byte, error)

+	ContainerKill(ctx context.Context, containerID, signal string) error

+	ContainerList(ctx context.Context, options types.ContainerListOptions) ([]types.Container, error)

 	ContainerLogs(ctx context.Context, options types.ContainerLogsOptions) (io.ReadCloser, error)

-	ContainerPause(containerID string) error

-	ContainerRemove(options types.ContainerRemoveOptions) error

-	ContainerRename(containerID, newContainerName string) error

-	ContainerResize(options types.ResizeOptions) error

-	ContainerRestart(containerID string, timeout int) error

-	ContainerStatPath(containerID, path string) (types.ContainerPathStat, error)

+	ContainerPause(ctx context.Context, containerID string) error

+	ContainerRemove(ctx context.Context, options types.ContainerRemoveOptions) error

+	ContainerRename(ctx context.Context, containerID, newContainerName string) error

+	ContainerResize(ctx context.Context, options types.ResizeOptions) error

+	ContainerRestart(ctx context.Context, containerID string, timeout int) error

+	ContainerStatPath(ctx context.Context, containerID, path string) (types.ContainerPathStat, error)

 	ContainerStats(ctx context.Context, containerID string, stream bool) (io.ReadCloser, error)

-	ContainerStart(containerID string) error

-	ContainerStop(containerID string, timeout int) error

-	ContainerTop(containerID string, arguments []string) (types.ContainerProcessList, error)

-	ContainerUnpause(containerID string) error

-	ContainerUpdate(containerID string, updateConfig container.UpdateConfig) error

+	ContainerStart(ctx context.Context, containerID string) error

+	ContainerStop(ctx context.Context, containerID string, timeout int) error

+	ContainerTop(ctx context.Context, containerID string, arguments []string) (types.ContainerProcessList, error)

+	ContainerUnpause(ctx context.Context, containerID string) error

+	ContainerUpdate(ctx context.Context, containerID string, updateConfig container.UpdateConfig) error

 	ContainerWait(ctx context.Context, containerID string) (int, error)

 	CopyFromContainer(ctx context.Context, containerID, srcPath string) (io.ReadCloser, types.ContainerPathStat, error)

 	CopyToContainer(ctx context.Context, options types.CopyToContainerOptions) error

 	Events(ctx context.Context, options types.EventsOptions) (io.ReadCloser, error)

 	ImageBuild(ctx context.Context, options types.ImageBuildOptions) (types.ImageBuildResponse, error)

 	ImageCreate(ctx context.Context, options types.ImageCreateOptions) (io.ReadCloser, error)

-	ImageHistory(imageID string) ([]types.ImageHistory, error)

+	ImageHistory(ctx context.Context, imageID string) ([]types.ImageHistory, error)

 	ImageImport(ctx context.Context, options types.ImageImportOptions) (io.ReadCloser, error)

-	ImageInspectWithRaw(imageID string, getSize bool) (types.ImageInspect, []byte, error)

-	ImageList(options types.ImageListOptions) ([]types.Image, error)

+	ImageInspectWithRaw(ctx context.Context, imageID string, getSize bool) (types.ImageInspect, []byte, error)

+	ImageList(ctx context.Context, options types.ImageListOptions) ([]types.Image, error)

 	ImageLoad(ctx context.Context, input io.Reader, quiet bool) (types.ImageLoadResponse, error)

 	ImagePull(ctx context.Context, options types.ImagePullOptions, privilegeFunc RequestPrivilegeFunc) (io.ReadCloser, error)

 	ImagePush(ctx context.Context, options types.ImagePushOptions, privilegeFunc RequestPrivilegeFunc) (io.ReadCloser, error)

-	ImageRemove(options types.ImageRemoveOptions) ([]types.ImageDelete, error)

-	ImageSearch(options types.ImageSearchOptions, privilegeFunc RequestPrivilegeFunc) ([]registry.SearchResult, error)

+	ImageRemove(ctx context.Context, options types.ImageRemoveOptions) ([]types.ImageDelete, error)

+	ImageSearch(ctx context.Context, options types.ImageSearchOptions, privilegeFunc RequestPrivilegeFunc) ([]registry.SearchResult, error)

 	ImageSave(ctx context.Context, imageIDs []string) (io.ReadCloser, error)

-	ImageTag(options types.ImageTagOptions) error

-	Info() (types.Info, error)

-	NetworkConnect(networkID, containerID string, config *network.EndpointSettings) error

-	NetworkCreate(options types.NetworkCreate) (types.NetworkCreateResponse, error)

-	NetworkDisconnect(networkID, containerID string, force bool) error

-	NetworkInspect(networkID string) (types.NetworkResource, error)

-	NetworkList(options types.NetworkListOptions) ([]types.NetworkResource, error)

-	NetworkRemove(networkID string) error

-	RegistryLogin(auth types.AuthConfig) (types.AuthResponse, error)

-	ServerVersion() (types.Version, error)

-	VolumeCreate(options types.VolumeCreateRequest) (types.Volume, error)

-	VolumeInspect(volumeID string) (types.Volume, error)

-	VolumeList(filter filters.Args) (types.VolumesListResponse, error)

-	VolumeRemove(volumeID string) error

+	ImageTag(ctx context.Context, options types.ImageTagOptions) error

+	Info(ctx context.Context) (types.Info, error)

+	NetworkConnect(ctx context.Context, networkID, containerID string, config *network.EndpointSettings) error

+	NetworkCreate(ctx context.Context, options types.NetworkCreate) (types.NetworkCreateResponse, error)

+	NetworkDisconnect(ctx context.Context, networkID, containerID string, force bool) error

+	NetworkInspect(ctx context.Context, networkID string) (types.NetworkResource, error)

+	NetworkList(ctx context.Context, options types.NetworkListOptions) ([]types.NetworkResource, error)

+	NetworkRemove(ctx context.Context, networkID string) error