@@ -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 a6dca654f28f26b648115649f6382252ada81119

+clone git github.com/docker/engine-api a2999dbd3471ffe167f2aec7dccb9fa9b016dcbc

 clone git github.com/RackSec/srslog 259aed10dfa74ea2961eddd1d9847619f6e98837

 clone git github.com/imdario/mergo 0.2.1

@@ -30,17 +30,17 @@ func (cli *Client) ContainerStatPath(ctx context.Context, containerID, path stri

 }

 // CopyToContainer copies content into the container filesystem.

-func (cli *Client) CopyToContainer(ctx context.Context, options types.CopyToContainerOptions) error {

+func (cli *Client) CopyToContainer(ctx context.Context, container, path string, content io.Reader, options types.CopyToContainerOptions) error {

 	query := url.Values{}

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

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

 	// Do not allow for an existing directory to be overwritten by a non-directory and vice versa.

 	if !options.AllowOverwriteDirWithFile {

 		query.Set("noOverwriteDirNonDir", "true")

 	}

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

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

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

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

 	if err != nil {

 		return err

 	}

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

 // CopyFromContainer gets the content from the container and returns it as a Reader

 // to manipulate it in the host. It's up to the caller to close the reader.

-func (cli *Client) CopyFromContainer(ctx context.Context, containerID, srcPath string) (io.ReadCloser, types.ContainerPathStat, error) {

+func (cli *Client) CopyFromContainer(ctx context.Context, container, srcPath string) (io.ReadCloser, types.ContainerPathStat, error) {

 	query := make(url.Values, 1)

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

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

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

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

 	if err != nil {

 		return nil, types.ContainerPathStat{}, err

@@ -44,7 +44,7 @@ type APIClient interface {

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

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

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

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

+	CopyToContainer(ctx context.Context, container, path string, content io.Reader, options types.CopyToContainerOptions) error

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

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

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

deleted file mode 100644

@@ -1 +0,0 @@

-package client

@@ -69,9 +69,6 @@ type ContainerRemoveOptions struct {

 // CopyToContainerOptions holds information

 // about files to copy into a container

 type CopyToContainerOptions struct {

-	ContainerID               string

-	Path                      string

-	Content                   io.Reader

 	AllowOverwriteDirWithFile bool

 }

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

 	"errors"

 	"fmt"

 	"regexp"

-	"strconv"

 	"strings"

+

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

 )

 // Args stores filter arguments as map key:{map key: bool}.

@@ -80,7 +81,7 @@ func ToParamWithVersion(version string, a Args) (string, error) {

 	// for daemons older than v1.10, filter must be of the form map[string][]string

 	buf := []byte{}

 	err := errors.New("")

-	if version != "" && compareTo(version, "1.22") == -1 {

+	if version != "" && versions.LessThan(version, "1.22") {

 		buf, err = json.Marshal(convertArgsToSlice(a.fields))

 	} else {

 		buf, err = json.Marshal(a.fields)

@@ -292,34 +293,3 @@ func convertArgsToSlice(f map[string]map[string]bool) map[string][]string {

 	}

 	return m

 }

-

-// compareTo compares two version strings

-// returns -1 if v1 < v2, 1 if v1 > v2, 0 otherwise

-func compareTo(v1, v2 string) int {

-	var (

-		currTab  = strings.Split(v1, ".")

-		otherTab = strings.Split(v2, ".")

-	)

-

-	max := len(currTab)

-	if len(otherTab) > max {

-		max = len(otherTab)

-	}

-	for i := 0; i < max; i++ {

-		var currInt, otherInt int

-

-		if len(currTab) > i {

-			currInt, _ = strconv.Atoi(currTab[i])

-		}

-		if len(otherTab) > i {

-			otherInt, _ = strconv.Atoi(otherTab[i])

-		}

-		if currInt > otherInt {

-			return 1

-		}

-		if otherInt > currInt {

-			return -1

-		}

-	}

-	return 0

-}

new file mode 100644

@@ -0,0 +1,14 @@

+## Legacy API type versions

+

+This package includes types for legacy API versions. The stable version of the API types live in `api/types/*.go`.

+

+Consider moving a type here when you need to keep backwards compatibility in the API. This legacy types are organized by the latest API version they appear in. For instance, types in the `v1p19` package are valid for API versions below or equal `1.19`. Types in the `v1p20` package are valid for the API version `1.20`, since the versions below that will use the legacy types in `v1p19`.

+

+### Package name conventions

+

+The package name convention is to use `v` as a prefix for the version number and `p`(patch) as a separator. We use this nomenclature due to a few restrictions in the Go package name convention:

+

+1. We cannot use `.` because it's interpreted by the language, think of `v1.20.CallFunction`.

+2. We cannot use `_` because golint complains abount it. The code is actually valid, but it looks probably more weird: `v1_20.CallFunction`.

+

+For instance, if you want to modify a type that was available in the version `1.21` of the API but it will have different fields in the version `1.22`, you want to create a new package under `api/types/versions/v1p21`.

new file mode 100644

@@ -0,0 +1,62 @@

+package versions

+

+import (

+	"strconv"

+	"strings"

+)

+

+// compare compares two version strings

+// returns -1 if v1 < v2, 1 if v1 > v2, 0 otherwise.

+func compare(v1, v2 string) int {

+	var (

+		currTab  = strings.Split(v1, ".")

+		otherTab = strings.Split(v2, ".")

+	)

+

+	max := len(currTab)

+	if len(otherTab) > max {

+		max = len(otherTab)

+	}

+	for i := 0; i < max; i++ {

+		var currInt, otherInt int

+

+		if len(currTab) > i {

+			currInt, _ = strconv.Atoi(currTab[i])

+		}

+		if len(otherTab) > i {

+			otherInt, _ = strconv.Atoi(otherTab[i])

+		}

+		if currInt > otherInt {

+			return 1

+		}

+		if otherInt > currInt {

+			return -1

+		}

+	}

+	return 0

+}

+

+// LessThan checks if a version is less than another

+func LessThan(v, other string) bool {

+	return compare(v, other) == -1

+}

+

+// LessThanOrEqualTo checks if a version is less than or equal to another

+func LessThanOrEqualTo(v, other string) bool {

+	return compare(v, other) <= 0

+}

+

+// GreaterThan checks if a version is greater than another

+func GreaterThan(v, other string) bool {

+	return compare(v, other) == 1

+}

+

+// GreaterThanOrEqualTo checks if a version is greater than or equal to another

+func GreaterThanOrEqualTo(v, other string) bool {

+	return compare(v, other) >= 0

+}

+

+// Equal checks if a version is equal to another

+func Equal(v, other string) bool {

+	return compare(v, other) == 0

+}