@@ -1,8 +1,7 @@

 Solomon Hykes <solomon@dotcloud.com> (@shykes)

 Guillaume Charmes <guillaume@dotcloud.com> (@creack)

-Victor Vieux <victor@dotcloud.com> (@vieux)

+Victor Vieux <vieux@docker.com> (@vieux)

 Michael Crosby <michael@crosbymichael.com> (@crosbymichael)

 .travis.yml: Tianon Gravi <admwiggin@gmail.com> (@tianon)

-api.go: Victor Vieux <victor@dotcloud.com> (@vieux)

 Dockerfile: Tianon Gravi <admwiggin@gmail.com> (@tianon)

 Makefile: Tianon Gravi <admwiggin@gmail.com> (@tianon)

@@ -32,10 +32,10 @@ shell: build

 	$(DOCKER_RUN_DOCKER) bash

 build: bundles

-	docker build -rm -t "$(DOCKER_IMAGE)" .

+	docker build -t "$(DOCKER_IMAGE)" .

 docs-build:

-	docker build -rm -t "$(DOCKER_DOCS_IMAGE)" docs

+	docker build -t "$(DOCKER_DOCS_IMAGE)" docs

 bundles:

 	mkdir bundles

new file mode 100644

@@ -0,0 +1 @@

+Victor Vieux <vieux@docker.com> (@vieux)

@@ -138,7 +138,7 @@ func (cli *DockerCli) CmdBuild(args ...string) error {

 	tag := cmd.String([]string{"t", "-tag"}, "", "Repository name (and optionally a tag) to be applied to the resulting image in case of success")

 	suppressOutput := cmd.Bool([]string{"q", "-quiet"}, false, "Suppress the verbose output generated by the containers")

 	noCache := cmd.Bool([]string{"#no-cache", "-no-cache"}, false, "Do not use cache when building the image")

-	rm := cmd.Bool([]string{"#rm", "-rm"}, false, "Remove intermediate containers after a successful build")

+	rm := cmd.Bool([]string{"#rm", "-rm"}, true, "Remove intermediate containers after a successful build")

 	if err := cmd.Parse(args); err != nil {

 		return nil

 	}

@@ -780,7 +780,10 @@ func (cli *DockerCli) CmdPort(args ...string) error {

 // 'docker rmi IMAGE' removes all images with the name IMAGE

 func (cli *DockerCli) CmdRmi(args ...string) error {

-	cmd := cli.Subcmd("rmi", "IMAGE [IMAGE...]", "Remove one or more images")

+	var (

+		cmd   = cli.Subcmd("rmi", "IMAGE [IMAGE...]", "Remove one or more images")

+		force = cmd.Bool([]string{"f", "-force"}, false, "Force")

+	)

 	if err := cmd.Parse(args); err != nil {

 		return nil

 	}

@@ -789,9 +792,14 @@ func (cli *DockerCli) CmdRmi(args ...string) error {

 		return nil

 	}

+	v := url.Values{}

+	if *force {

+		v.Set("force", "1")

+	}

+

 	var encounteredError error

 	for _, name := range cmd.Args() {

-		body, _, err := readBody(cli.call("DELETE", "/images/"+name, nil, false))

+		body, _, err := readBody(cli.call("DELETE", "/images/"+name+"?"+v.Encode(), nil, false))

 		if err != nil {

 			fmt.Fprintf(cli.err, "%s\n", err)

 			encounteredError = fmt.Errorf("Error: failed to remove one or more images")

@@ -2032,7 +2040,7 @@ func (cli *DockerCli) call(method, path string, data interface{}, passAuthInfo b

 	re := regexp.MustCompile("/+")

 	path = re.ReplaceAllString(path, "/")

-	req, err := http.NewRequest(method, fmt.Sprintf("/v%g%s", APIVERSION, path), params)

+	req, err := http.NewRequest(method, fmt.Sprintf("/v%s%s", APIVERSION, path), params)

 	if err != nil {

 		return nil, -1, err

 	}

@@ -2109,7 +2117,7 @@ func (cli *DockerCli) stream(method, path string, in io.Reader, out io.Writer, h

 	re := regexp.MustCompile("/+")

 	path = re.ReplaceAllString(path, "/")

-	req, err := http.NewRequest(method, fmt.Sprintf("/v%g%s", APIVERSION, path), in)

+	req, err := http.NewRequest(method, fmt.Sprintf("/v%s%s", APIVERSION, path), in)

 	if err != nil {

 		return err

 	}

@@ -2173,7 +2181,7 @@ func (cli *DockerCli) hijack(method, path string, setRawTerminal bool, in io.Rea

 	re := regexp.MustCompile("/+")

 	path = re.ReplaceAllString(path, "/")

-	req, err := http.NewRequest(method, fmt.Sprintf("/v%g%s", APIVERSION, path), nil)

+	req, err := http.NewRequest(method, fmt.Sprintf("/v%s%s", APIVERSION, path), nil)

 	if err != nil {

 		return err

 	}

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

 )

 const (

-	APIVERSION        = 1.9

+	APIVERSION        = "1.10"

 	DEFAULTHTTPHOST   = "127.0.0.1"

 	DEFAULTUNIXSOCKET = "/var/run/docker.sock"

 )

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

 	"github.com/dotcloud/docker/engine"

 	"github.com/dotcloud/docker/pkg/listenbuffer"

 	"github.com/dotcloud/docker/pkg/systemd"

+	"github.com/dotcloud/docker/pkg/user"

+	"github.com/dotcloud/docker/pkg/version"

 	"github.com/dotcloud/docker/utils"

 	"github.com/gorilla/mux"

 	"io"

@@ -21,7 +23,6 @@ import (

 	"net/http"

 	"net/http/pprof"

 	"os"

-	"regexp"

 	"strconv"

 	"strings"

 	"syscall"

@@ -32,7 +33,7 @@ var (

 	activationLock chan struct{}

 )

-type HttpApiFunc func(eng *engine.Engine, version float64, w http.ResponseWriter, r *http.Request, vars map[string]string) error

+type HttpApiFunc func(eng *engine.Engine, version version.Version, w http.ResponseWriter, r *http.Request, vars map[string]string) error

 func hijackServer(w http.ResponseWriter) (io.ReadCloser, io.Writer, error) {

 	conn, _, err := w.(http.Hijacker).Hijack()

@@ -113,7 +114,7 @@ func getBoolParam(value string) (bool, error) {

 	return ret, nil

 }

-func postAuth(eng *engine.Engine, version float64, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

+func postAuth(eng *engine.Engine, version version.Version, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

 	var (

 		authConfig, err = ioutil.ReadAll(r.Body)

 		job             = eng.Job("auth")

@@ -136,13 +137,13 @@ func postAuth(eng *engine.Engine, version float64, w http.ResponseWriter, r *htt

 	return nil

 }

-func getVersion(eng *engine.Engine, version float64, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

+func getVersion(eng *engine.Engine, version version.Version, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

 	w.Header().Set("Content-Type", "application/json")

 	eng.ServeHTTP(w, r)

 	return nil

 }

-func postContainersKill(eng *engine.Engine, version float64, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

+func postContainersKill(eng *engine.Engine, version version.Version, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

 	if vars == nil {

 		return fmt.Errorf("Missing parameter")

 	}

@@ -160,7 +161,7 @@ func postContainersKill(eng *engine.Engine, version float64, w http.ResponseWrit

 	return nil

 }

-func getContainersExport(eng *engine.Engine, version float64, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

+func getContainersExport(eng *engine.Engine, version version.Version, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

 	if vars == nil {

 		return fmt.Errorf("Missing parameter")

 	}

@@ -172,7 +173,7 @@ func getContainersExport(eng *engine.Engine, version float64, w http.ResponseWri

 	return nil

 }

-func getImagesJSON(eng *engine.Engine, version float64, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

+func getImagesJSON(eng *engine.Engine, version version.Version, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

 	if err := parseForm(r); err != nil {

 		return err

 	}

@@ -186,7 +187,7 @@ func getImagesJSON(eng *engine.Engine, version float64, w http.ResponseWriter, r

 	job.Setenv("filter", r.Form.Get("filter"))

 	job.Setenv("all", r.Form.Get("all"))

-	if version >= 1.7 {

+	if version.GreaterThanOrEqualTo("1.7") {

 		streamJSON(job, w, false)

 	} else if outs, err = job.Stdout.AddListTable(); err != nil {

 		return err

@@ -196,7 +197,7 @@ func getImagesJSON(eng *engine.Engine, version float64, w http.ResponseWriter, r

 		return err

 	}

-	if version < 1.7 && outs != nil { // Convert to legacy format

+	if version.LessThan("1.7") && outs != nil { // Convert to legacy format

 		outsLegacy := engine.NewTable("Created", 0)

 		for _, out := range outs.Data {

 			for _, repoTag := range out.GetList("RepoTags") {

@@ -219,8 +220,8 @@ func getImagesJSON(eng *engine.Engine, version float64, w http.ResponseWriter, r

 	return nil

 }

-func getImagesViz(eng *engine.Engine, version float64, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

-	if version > 1.6 {

+func getImagesViz(eng *engine.Engine, version version.Version, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

+	if version.GreaterThan("1.6") {

 		w.WriteHeader(http.StatusNotFound)

 		return fmt.Errorf("This is now implemented in the client.")

 	}

@@ -228,13 +229,13 @@ func getImagesViz(eng *engine.Engine, version float64, w http.ResponseWriter, r

 	return nil

 }

-func getInfo(eng *engine.Engine, version float64, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

+func getInfo(eng *engine.Engine, version version.Version, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

 	w.Header().Set("Content-Type", "application/json")

 	eng.ServeHTTP(w, r)

 	return nil

 }

-func getEvents(eng *engine.Engine, version float64, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

+func getEvents(eng *engine.Engine, version version.Version, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

 	if err := parseForm(r); err != nil {

 		return err

 	}

@@ -245,7 +246,7 @@ func getEvents(eng *engine.Engine, version float64, w http.ResponseWriter, r *ht

 	return job.Run()

 }

-func getImagesHistory(eng *engine.Engine, version float64, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

+func getImagesHistory(eng *engine.Engine, version version.Version, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

 	if vars == nil {

 		return fmt.Errorf("Missing parameter")

 	}

@@ -259,7 +260,7 @@ func getImagesHistory(eng *engine.Engine, version float64, w http.ResponseWriter

 	return nil

 }

-func getContainersChanges(eng *engine.Engine, version float64, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

+func getContainersChanges(eng *engine.Engine, version version.Version, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

 	if vars == nil {

 		return fmt.Errorf("Missing parameter")

 	}

@@ -269,8 +270,8 @@ func getContainersChanges(eng *engine.Engine, version float64, w http.ResponseWr

 	return job.Run()

 }

-func getContainersTop(eng *engine.Engine, version float64, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

-	if version < 1.4 {

+func getContainersTop(eng *engine.Engine, version version.Version, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

+	if version.LessThan("1.4") {

 		return fmt.Errorf("top was improved a lot since 1.3, Please upgrade your docker client.")

 	}

 	if vars == nil {

@@ -285,7 +286,7 @@ func getContainersTop(eng *engine.Engine, version float64, w http.ResponseWriter

 	return job.Run()

 }

-func getContainersJSON(eng *engine.Engine, version float64, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

+func getContainersJSON(eng *engine.Engine, version version.Version, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

 	if err := parseForm(r); err != nil {

 		return err

 	}

@@ -301,7 +302,7 @@ func getContainersJSON(eng *engine.Engine, version float64, w http.ResponseWrite

 	job.Setenv("before", r.Form.Get("before"))

 	job.Setenv("limit", r.Form.Get("limit"))

-	if version >= 1.5 {

+	if version.GreaterThanOrEqualTo("1.5") {

 		streamJSON(job, w, false)

 	} else if outs, err = job.Stdout.AddTable(); err != nil {

 		return err

@@ -309,7 +310,7 @@ func getContainersJSON(eng *engine.Engine, version float64, w http.ResponseWrite

 	if err = job.Run(); err != nil {

 		return err

 	}

-	if version < 1.5 { // Convert to legacy format

+	if version.LessThan("1.5") { // Convert to legacy format

 		for _, out := range outs.Data {

 			ports := engine.NewTable("", 0)

 			ports.ReadListFrom([]byte(out.Get("Ports")))

@@ -323,7 +324,7 @@ func getContainersJSON(eng *engine.Engine, version float64, w http.ResponseWrite

 	return nil

 }

-func postImagesTag(eng *engine.Engine, version float64, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

+func postImagesTag(eng *engine.Engine, version version.Version, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

 	if err := parseForm(r); err != nil {

 		return err

 	}

@@ -340,7 +341,7 @@ func postImagesTag(eng *engine.Engine, version float64, w http.ResponseWriter, r

 	return nil

 }

-func postCommit(eng *engine.Engine, version float64, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

+func postCommit(eng *engine.Engine, version version.Version, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

 	if err := parseForm(r); err != nil {

 		return err

 	}

@@ -369,7 +370,7 @@ func postCommit(eng *engine.Engine, version float64, w http.ResponseWriter, r *h

 }

 // Creates an image from Pull or from Import

-func postImagesCreate(eng *engine.Engine, version float64, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

+func postImagesCreate(eng *engine.Engine, version version.Version, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

 	if err := parseForm(r); err != nil {

 		return err

 	}

@@ -389,9 +390,6 @@ func postImagesCreate(eng *engine.Engine, version float64, w http.ResponseWriter

 			authConfig = &auth.AuthConfig{}

 		}

 	}

-	if version > 1.0 {

-		w.Header().Set("Content-Type", "application/json")

-	}

 	if image != "" { //pull

 		metaHeaders := map[string][]string{}

 		for k, v := range r.Header {

@@ -400,7 +398,7 @@ func postImagesCreate(eng *engine.Engine, version float64, w http.ResponseWriter

 			}

 		}

 		job = eng.Job("pull", r.Form.Get("fromImage"), tag)

-		job.SetenvBool("parallel", version > 1.3)

+		job.SetenvBool("parallel", version.GreaterThan("1.3"))

 		job.SetenvJson("metaHeaders", metaHeaders)

 		job.SetenvJson("authConfig", authConfig)

 	} else { //import

@@ -408,7 +406,7 @@ func postImagesCreate(eng *engine.Engine, version float64, w http.ResponseWriter

 		job.Stdin.Add(r.Body)

 	}

-	if version > 1.0 {

+	if version.GreaterThan("1.0") {

 		job.SetenvBool("json", true)

 		streamJSON(job, w, true)

 	} else {

@@ -418,14 +416,14 @@ func postImagesCreate(eng *engine.Engine, version float64, w http.ResponseWriter

 		if !job.Stdout.Used() {

 			return err

 		}

-		sf := utils.NewStreamFormatter(version > 1.0)

+		sf := utils.NewStreamFormatter(version.GreaterThan("1.0"))

 		w.Write(sf.FormatError(err))

 	}

 	return nil

 }

-func getImagesSearch(eng *engine.Engine, version float64, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

+func getImagesSearch(eng *engine.Engine, version version.Version, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

 	if err := parseForm(r); err != nil {

 		return err

 	}

@@ -457,19 +455,15 @@ func getImagesSearch(eng *engine.Engine, version float64, w http.ResponseWriter,

 	return job.Run()

 }

-func postImagesInsert(eng *engine.Engine, version float64, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

+func postImagesInsert(eng *engine.Engine, version version.Version, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

 	if err := parseForm(r); err != nil {

 		return err

 	}

 	if vars == nil {

 		return fmt.Errorf("Missing parameter")

 	}

-	if version > 1.0 {

-		w.Header().Set("Content-Type", "application/json")

-	}

-

 	job := eng.Job("insert", vars["name"], r.Form.Get("url"), r.Form.Get("path"))

-	if version > 1.0 {

+	if version.GreaterThan("1.0") {

 		job.SetenvBool("json", true)

 		streamJSON(job, w, false)

 	} else {

@@ -479,14 +473,14 @@ func postImagesInsert(eng *engine.Engine, version float64, w http.ResponseWriter

 		if !job.Stdout.Used() {

 			return err

 		}

-		sf := utils.NewStreamFormatter(version > 1.0)

+		sf := utils.NewStreamFormatter(version.GreaterThan("1.0"))

 		w.Write(sf.FormatError(err))

 	}

 	return nil

 }

-func postImagesPush(eng *engine.Engine, version float64, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

+func postImagesPush(eng *engine.Engine, version version.Version, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

 	if vars == nil {

 		return fmt.Errorf("Missing parameter")

 	}

@@ -517,13 +511,10 @@ func postImagesPush(eng *engine.Engine, version float64, w http.ResponseWriter,

 		}

 	}

-	if version > 1.0 {

-		w.Header().Set("Content-Type", "application/json")

-	}

 	job := eng.Job("push", vars["name"])

 	job.SetenvJson("metaHeaders", metaHeaders)

 	job.SetenvJson("authConfig", authConfig)

-	if version > 1.0 {

+	if version.GreaterThan("1.0") {

 		job.SetenvBool("json", true)

 		streamJSON(job, w, true)

 	} else {

@@ -534,17 +525,17 @@ func postImagesPush(eng *engine.Engine, version float64, w http.ResponseWriter,

 		if !job.Stdout.Used() {

 			return err

 		}

-		sf := utils.NewStreamFormatter(version > 1.0)

+		sf := utils.NewStreamFormatter(version.GreaterThan("1.0"))

 		w.Write(sf.FormatError(err))

 	}

 	return nil

 }

-func getImagesGet(eng *engine.Engine, version float64, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

+func getImagesGet(eng *engine.Engine, version version.Version, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

 	if vars == nil {

 		return fmt.Errorf("Missing parameter")

 	}

-	if version > 1.0 {

+	if version.GreaterThan("1.0") {

 		w.Header().Set("Content-Type", "application/x-tar")

 	}

 	job := eng.Job("image_export", vars["name"])

@@ -552,13 +543,13 @@ func getImagesGet(eng *engine.Engine, version float64, w http.ResponseWriter, r

 	return job.Run()

 }

-func postImagesLoad(eng *engine.Engine, version float64, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

+func postImagesLoad(eng *engine.Engine, version version.Version, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

 	job := eng.Job("load")

 	job.Stdin.Add(r.Body)

 	return job.Run()

 }

-func postContainersCreate(eng *engine.Engine, version float64, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

+func postContainersCreate(eng *engine.Engine, version version.Version, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

 	if err := parseForm(r); err != nil {

 		return nil

 	}

@@ -589,7 +580,7 @@ func postContainersCreate(eng *engine.Engine, version float64, w http.ResponseWr

 	return writeJSON(w, http.StatusCreated, out)

 }

-func postContainersRestart(eng *engine.Engine, version float64, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

+func postContainersRestart(eng *engine.Engine, version version.Version, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

 	if err := parseForm(r); err != nil {

 		return err

 	}

@@ -605,7 +596,7 @@ func postContainersRestart(eng *engine.Engine, version float64, w http.ResponseW

 	return nil

 }

-func deleteContainers(eng *engine.Engine, version float64, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

+func deleteContainers(eng *engine.Engine, version version.Version, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

 	if err := parseForm(r); err != nil {

 		return err

 	}

@@ -622,7 +613,7 @@ func deleteContainers(eng *engine.Engine, version float64, w http.ResponseWriter

 	return nil

 }

-func deleteImages(eng *engine.Engine, version float64, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

+func deleteImages(eng *engine.Engine, version version.Version, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

 	if err := parseForm(r); err != nil {

 		return err

 	}

@@ -631,12 +622,12 @@ func deleteImages(eng *engine.Engine, version float64, w http.ResponseWriter, r

 	}

 	var job = eng.Job("image_delete", vars["name"])

 	streamJSON(job, w, false)

-	job.SetenvBool("autoPrune", version > 1.1)

+	job.Setenv("force", r.Form.Get("force"))

 	return job.Run()

 }

-func postContainersStart(eng *engine.Engine, version float64, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

+func postContainersStart(eng *engine.Engine, version version.Version, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

 	if vars == nil {

 		return fmt.Errorf("Missing parameter")

 	}

@@ -657,7 +648,7 @@ func postContainersStart(eng *engine.Engine, version float64, w http.ResponseWri

 	return nil

 }

-func postContainersStop(eng *engine.Engine, version float64, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

+func postContainersStop(eng *engine.Engine, version version.Version, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

 	if err := parseForm(r); err != nil {

 		return err

 	}

@@ -673,7 +664,7 @@ func postContainersStop(eng *engine.Engine, version float64, w http.ResponseWrit

 	return nil

 }

-func postContainersWait(eng *engine.Engine, version float64, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

+func postContainersWait(eng *engine.Engine, version version.Version, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

 	if vars == nil {

 		return fmt.Errorf("Missing parameter")

 	}

@@ -695,7 +686,7 @@ func postContainersWait(eng *engine.Engine, version float64, w http.ResponseWrit

 	return writeJSON(w, http.StatusOK, env)

 }

-func postContainersResize(eng *engine.Engine, version float64, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

+func postContainersResize(eng *engine.Engine, version version.Version, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

 	if err := parseForm(r); err != nil {

 		return err

 	}

@@ -708,7 +699,7 @@ func postContainersResize(eng *engine.Engine, version float64, w http.ResponseWr

 	return nil

 }

-func postContainersAttach(eng *engine.Engine, version float64, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

+func postContainersAttach(eng *engine.Engine, version version.Version, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

 	if err := parseForm(r); err != nil {

 		return err

 	}

@@ -750,7 +741,7 @@ func postContainersAttach(eng *engine.Engine, version float64, w http.ResponseWr

 	fmt.Fprintf(outStream, "HTTP/1.1 200 OK\r\nContent-Type: application/vnd.docker.raw-stream\r\n\r\n")

-	if c.GetSubEnv("Config") != nil && !c.GetSubEnv("Config").GetBool("Tty") && version >= 1.6 {

+	if c.GetSubEnv("Config") != nil && !c.GetSubEnv("Config").GetBool("Tty") && version.GreaterThanOrEqualTo("1.6") {

 		errStream = utils.NewStdWriter(outStream, utils.Stderr)

 		outStream = utils.NewStdWriter(outStream, utils.Stdout)

 	} else {

@@ -773,7 +764,7 @@ func postContainersAttach(eng *engine.Engine, version float64, w http.ResponseWr

 	return nil

 }

-func wsContainersAttach(eng *engine.Engine, version float64, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

+func wsContainersAttach(eng *engine.Engine, version version.Version, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

 	if err := parseForm(r); err != nil {

 		return err

 	}

@@ -805,7 +796,7 @@ func wsContainersAttach(eng *engine.Engine, version float64, w http.ResponseWrit

 	return nil

 }

-func getContainersByName(eng *engine.Engine, version float64, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

+func getContainersByName(eng *engine.Engine, version version.Version, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

 	if vars == nil {

 		return fmt.Errorf("Missing parameter")

 	}

@@ -815,7 +806,7 @@ func getContainersByName(eng *engine.Engine, version float64, w http.ResponseWri

 	return job.Run()

 }

-func getImagesByName(eng *engine.Engine, version float64, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

+func getImagesByName(eng *engine.Engine, version version.Version, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

 	if vars == nil {

 		return fmt.Errorf("Missing parameter")

 	}

@@ -825,8 +816,8 @@ func getImagesByName(eng *engine.Engine, version float64, w http.ResponseWriter,

 	return job.Run()

 }

-func postBuild(eng *engine.Engine, version float64, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

-	if version < 1.3 {

+func postBuild(eng *engine.Engine, version version.Version, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

+	if version.LessThan("1.3") {

 		return fmt.Errorf("Multipart upload for build is no longer supported. Please upgrade your docker client.")

 	}

 	var (

@@ -841,7 +832,7 @@ func postBuild(eng *engine.Engine, version float64, w http.ResponseWriter, r *ht

 	// Both headers will be parsed and sent along to the daemon, but if a non-empty

 	// ConfigFile is present, any value provided as an AuthConfig directly will

 	// be overridden. See BuildFile::CmdFrom for details.

-	if version < 1.9 && authEncoded != "" {

+	if version.LessThan("1.9") && authEncoded != "" {

 		authJson := base64.NewDecoder(base64.URLEncoding, strings.NewReader(authEncoded))

 		if err := json.NewDecoder(authJson).Decode(authConfig); err != nil {

 			// for a pull it is not an error if no auth was given

@@ -859,7 +850,7 @@ func postBuild(eng *engine.Engine, version float64, w http.ResponseWriter, r *ht

 		}

 	}

-	if version >= 1.8 {

+	if version.GreaterThanOrEqualTo("1.8") {

 		job.SetenvBool("json", true)

 		streamJSON(job, w, true)

 	} else {

@@ -878,13 +869,13 @@ func postBuild(eng *engine.Engine, version float64, w http.ResponseWriter, r *ht

 		if !job.Stdout.Used() {

 			return err

 		}

-		sf := utils.NewStreamFormatter(version >= 1.8)

+		sf := utils.NewStreamFormatter(version.GreaterThanOrEqualTo("1.8"))

 		w.Write(sf.FormatError(err))

 	}

 	return nil

 }

-func postContainersCopy(eng *engine.Engine, version float64, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

+func postContainersCopy(eng *engine.Engine, version version.Version, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

 	if vars == nil {

 		return fmt.Errorf("Missing parameter")

 	}

@@ -907,7 +898,7 @@ func postContainersCopy(eng *engine.Engine, version float64, w http.ResponseWrit

 	}

 	job := eng.Job("container_copy", vars["name"], copyData.Get("Resource"))

-	streamJSON(job, w, false)

+	job.Stdout.Add(w)

 	if err := job.Run(); err != nil {

 		utils.Errorf("%s", err.Error())

 		if strings.Contains(err.Error(), "No such container") {

@@ -917,7 +908,7 @@ func postContainersCopy(eng *engine.Engine, version float64, w http.ResponseWrit

 	return nil

 }

-func optionsHandler(eng *engine.Engine, version float64, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

+func optionsHandler(eng *engine.Engine, version version.Version, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

 	w.WriteHeader(http.StatusOK)

 	return nil

 }

@@ -927,7 +918,7 @@ func writeCorsHeaders(w http.ResponseWriter, r *http.Request) {

 	w.Header().Add("Access-Control-Allow-Methods", "GET, POST, DELETE, PUT, OPTIONS")

 }

-func makeHttpHandler(eng *engine.Engine, logging bool, localMethod string, localRoute string, handlerFunc HttpApiFunc, enableCors bool, dockerVersion string) http.HandlerFunc {

+func makeHttpHandler(eng *engine.Engine, logging bool, localMethod string, localRoute string, handlerFunc HttpApiFunc, enableCors bool, dockerVersion version.Version) http.HandlerFunc {

 	return func(w http.ResponseWriter, r *http.Request) {

 		// log the request

 		utils.Debugf("Calling %s %s", localMethod, localRoute)

@@ -938,20 +929,20 @@ func makeHttpHandler(eng *engine.Engine, logging bool, localMethod string, local

 		if strings.Contains(r.Header.Get("User-Agent"), "Docker-Client/") {

 			userAgent := strings.Split(r.Header.Get("User-Agent"), "/")

-			if len(userAgent) == 2 && userAgent[1] != dockerVersion {

+			if len(userAgent) == 2 && !dockerVersion.Equal(userAgent[1]) {

 				utils.Debugf("Warning: client and server don't have the same version (client: %s, server: %s)", userAgent[1], dockerVersion)

 			}

 		}

-		version, err := strconv.ParseFloat(mux.Vars(r)["version"], 64)

-		if err != nil {

+		version := version.Version(mux.Vars(r)["version"])

+		if version == "" {

 			version = APIVERSION

 		}

 		if enableCors {

 			writeCorsHeaders(w, r)

 		}

-		if version == 0 || version > APIVERSION {

-			http.Error(w, fmt.Errorf("client and server don't have same version (client : %g, server: %g)", version, APIVERSION).Error(), http.StatusNotFound)

+		if version.GreaterThan(APIVERSION) {

+			http.Error(w, fmt.Errorf("client and server don't have same version (client : %s, server: %s)", version, APIVERSION).Error(), http.StatusNotFound)

 			return

 		}

@@ -1049,7 +1040,7 @@ func createRouter(eng *engine.Engine, logging, enableCors bool, dockerVersion st

 			localMethod := method

 			// build the handler function

-			f := makeHttpHandler(eng, logging, localMethod, localRoute, localFct, enableCors, dockerVersion)

+			f := makeHttpHandler(eng, logging, localMethod, localRoute, localFct, enableCors, version.Version(dockerVersion))

 			// add the new route

 			if localRoute == "" {

@@ -1067,13 +1058,13 @@ func createRouter(eng *engine.Engine, logging, enableCors bool, dockerVersion st

 // ServeRequest processes a single http request to the docker remote api.

 // FIXME: refactor this to be part of Server and not require re-creating a new

 // router each time. This requires first moving ListenAndServe into Server.

-func ServeRequest(eng *engine.Engine, apiversion float64, w http.ResponseWriter, req *http.Request) error {

+func ServeRequest(eng *engine.Engine, apiversion version.Version, w http.ResponseWriter, req *http.Request) error {

 	router, err := createRouter(eng, false, true, "")

 	if err != nil {

 		return err

 	}

 	// Insert APIVERSION into the request as a convenience

-	req.URL.Path = fmt.Sprintf("/v%g%s", apiversion, req.URL.Path)

+	req.URL.Path = fmt.Sprintf("/v%s%s", apiversion, req.URL.Path)

 	router.ServeHTTP(w, req)

 	return nil

 }

@@ -1142,18 +1133,15 @@ func ListenAndServe(proto, addr string, eng *engine.Engine, logging, enableCors

 			return err

 		}

-		groups, err := ioutil.ReadFile("/etc/group")

+		groups, err := user.ParseGroupFilter(func(g *user.Group) bool {

+			return g.Name == "docker"

+		})

 		if err != nil {

 			return err

 		}

-		re := regexp.MustCompile("(^|\n)docker:.*?:([0-9]+)")

-		if gidMatch := re.FindStringSubmatch(string(groups)); gidMatch != nil {

-			gid, err := strconv.Atoi(gidMatch[2])

-			if err != nil {

-				return err

-			}

-			utils.Debugf("docker group found. gid: %d", gid)

-			if err := os.Chown(addr, 0, gid); err != nil {

+		if len(groups) > 0 {

+			utils.Debugf("docker group found. gid: %d", groups[0].Gid)

+			if err := os.Chown(addr, 0, groups[0].Gid); err != nil {

 				return err

 			}

 		}

@@ -790,6 +790,19 @@ func (container *Container) monitor(callback execdriver.StartCallback) error {

 		utils.Errorf("Error running container: %s", err)

 	}

+	container.State.SetStopped(exitCode)

+

+	// FIXME: there is a race condition here which causes this to fail during the unit tests.

+	// If another goroutine was waiting for Wait() to return before removing the container's root

+	// from the filesystem... At this point it may already have done so.

+	// This is because State.setStopped() has already been called, and has caused Wait()

+	// to return.

+	// FIXME: why are we serializing running state to disk in the first place?

+	//log.Printf("%s: Failed to dump configuration to the disk: %s", container.ID, err)

+	if err := container.ToDisk(); err != nil {

+		utils.Errorf("Error dumping container state to disk: %s\n", err)

+	}

+

 	// Cleanup

 	container.cleanup()

@@ -798,23 +811,12 @@ func (container *Container) monitor(callback execdriver.StartCallback) error {

 		container.stdin, container.stdinPipe = io.Pipe()

 	}

-	container.State.SetStopped(exitCode)

-

 	if container.runtime != nil && container.runtime.srv != nil {

 		container.runtime.srv.LogEvent("die", container.ID, container.runtime.repositories.ImageName(container.Image))

 	}

 	close(container.waitLock)

-	// FIXME: there is a race condition here which causes this to fail during the unit tests.

-	// If another goroutine was waiting for Wait() to return before removing the container's root

-	// from the filesystem... At this point it may already have done so.

-	// This is because State.setStopped() has already been called, and has caused Wait()

-	// to return.

-	// FIXME: why are we serializing running state to disk in the first place?

-	//log.Printf("%s: Failed to dump configuration to the disk: %s", container.ID, err)

-	container.ToDisk()

-

 	return err

 }

@@ -76,7 +76,7 @@ rm -rf "$target"/var/cache/ldconfig/*

 version=

 if [ -r "$target"/etc/redhat-release ]; then

-    version="$(sed 's/^[^0-9\]*\([0-9.]\+\).*$/\1/' /etc/redhat-release)"

+    version="$(sed 's/^[^0-9\]*\([0-9.]\+\).*$/\1/' "$target"/etc/redhat-release)"

 fi

 if [ -z "$version" ]; then

@@ -122,7 +122,10 @@ If the test are successful then the tail of the output should look something lik

 	PASS

 	ok  	github.com/dotcloud/docker/utils	0.017s

+If $TESTFLAGS is set in the environment, it is passed as extra arguments to 'go test'.

+You can use this to select certain tests to run, eg.

+    TESTFLAGS='-run ^TestBuild$' make test

 Step 6: Use Docker

@@ -26,15 +26,31 @@ Docker Remote API

 2. Versions

 ===========

-The current version of the API is 1.9

+The current version of the API is 1.10

 Calling /images/<name>/insert is the same as calling

-/v1.9/images/<name>/insert

+/v1.10/images/<name>/insert

 You can still call an old version of the api using

 /v1.0/images/<name>/insert

+v1.10

+*****

+

+Full Documentation

+------------------

+

+:doc:`docker_remote_api_v1.10`

+

+What's new

+----------

+

+.. http:delete:: /images/(name)

+

+   **New!** You can now use the force parameter to force delete of an image, even if it's

+   tagged in multiple repositories.

+

 v1.9

 ****

new file mode 100644

@@ -0,0 +1,1282 @@

+:title: Remote API v1.10

+:description: API Documentation for Docker

+:keywords: API, Docker, rcli, REST, documentation

+

+:orphan:

+

+=======================

+Docker Remote API v1.10

+=======================

+

+.. contents:: Table of Contents

+

+1. Brief introduction

+=====================

+

+- The Remote API has replaced rcli

+- The daemon listens on ``unix:///var/run/docker.sock``, but you can

+  :ref:`bind_docker`.

+- The API tends to be REST, but for some complex commands, like

+  ``attach`` or ``pull``, the HTTP connection is hijacked to transport

+  ``stdout, stdin`` and ``stderr``

+

+2. Endpoints

+============

+

+2.1 Containers

+--------------

+

+List containers

+***************

+

+.. http:get:: /containers/json

+

+        List containers

+

+        **Example request**:

+

+        .. sourcecode:: http

+

+           GET /containers/json?all=1&before=8dfafdbc3a40&size=1 HTTP/1.1

+

+        **Example response**:

+

+        .. sourcecode:: http

+

+           HTTP/1.1 200 OK

+           Content-Type: application/json

+

+           [

+                {

+                        "Id": "8dfafdbc3a40",

+                        "Image": "base:latest",

+                        "Command": "echo 1",

+                        "Created": 1367854155,

+                        "Status": "Exit 0",

+                        "Ports":[{"PrivatePort": 2222, "PublicPort": 3333, "Type": "tcp"}],

+                        "SizeRw":12288,

+                        "SizeRootFs":0

+                },

+                {

+                        "Id": "9cd87474be90",

+                        "Image": "base:latest",

+                        "Command": "echo 222222",

+                        "Created": 1367854155,

+                        "Status": "Exit 0",

+                        "Ports":[],

+                        "SizeRw":12288,

+                        "SizeRootFs":0

+                },

+                {

+                        "Id": "3176a2479c92",

+                        "Image": "base:latest",

+                        "Command": "echo 3333333333333333",

+                        "Created": 1367854154,

+                        "Status": "Exit 0",

+                        "Ports":[],

+                        "SizeRw":12288,

+                        "SizeRootFs":0

+                },

+                {

+                        "Id": "4cb07b47f9fb",

+                        "Image": "base:latest",

+                        "Command": "echo 444444444444444444444444444444444",

+                        "Created": 1367854152,

+                        "Status": "Exit 0",

+                        "Ports":[],

+                        "SizeRw":12288,

+                        "SizeRootFs":0

+                }

+           ]

+