@@ -42,6 +42,7 @@ Ken Cochrane <kencochrane@gmail.com>

 Kevin J. Lynagh <kevin@keminglabs.com>

 Louis Opter <kalessin@kalessin.fr>

 Maxim Treskin <zerthurd@gmail.com>

+Michael Crosby <crosby.michael@gmail.com>

 Mikhail Sobolev <mss@mawhrin.net>

 Nate Jones <nate@endot.org>

 Nelson Chen <crazysim@gmail.com>

@@ -251,7 +251,7 @@ Note

 ----

 We also keep the documentation in this repository. The website documentation is generated using sphinx using these sources.

-Please find it under docs/sources/ and read more about it https://github.com/dotcloud/docker/master/docs/README.md

+Please find it under docs/sources/ and read more about it https://github.com/dotcloud/docker/tree/master/docs/README.md

 Please feel free to fix / update the documentation and send us pull requests. More tutorials are also welcome.

@@ -371,4 +371,7 @@ Standard Container Specification

 #### Security

+### Legal

+

+Transfers Docker shall be in accordance with any applicable export control or other legal requirements.

@@ -722,9 +722,18 @@ func postBuild(srv *Server, version float64, w http.ResponseWriter, r *http.Requ

 	return nil

 }

-func ListenAndServe(addr string, srv *Server, logging bool) error {

+func optionsHandler(srv *Server, version float64, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

+	w.WriteHeader(http.StatusOK)

+	return nil

+}

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

+	w.Header().Add("Access-Control-Allow-Origin", "*")

+	w.Header().Add("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept")

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

+}

+

+func createRouter(srv *Server, logging bool) (*mux.Router, error) {

 	r := mux.NewRouter()

-	log.Printf("Listening for HTTP on %s\n", addr)

 	m := map[string]map[string]func(*Server, float64, http.ResponseWriter, *http.Request, map[string]string) error{

 		"GET": {

@@ -764,6 +773,9 @@ func ListenAndServe(addr string, srv *Server, logging bool) error {

 			"/containers/{name:.*}": deleteContainers,

 			"/images/{name:.*}":     deleteImages,

 		},

+		"OPTIONS": {

+			"": optionsHandler,

+		},

 	}

 	for method, routes := range m {

@@ -788,6 +800,9 @@ func ListenAndServe(addr string, srv *Server, logging bool) error {

 				if err != nil {

 					version = APIVERSION

 				}

+				if srv.enableCors {

+					writeCorsHeaders(w, r)

+				}

 				if version == 0 || version > APIVERSION {

 					w.WriteHeader(http.StatusNotFound)

 					return

@@ -796,9 +811,24 @@ func ListenAndServe(addr string, srv *Server, logging bool) error {

 					httpError(w, err)

 				}

 			}

-			r.Path("/v{version:[0-9.]+}" + localRoute).Methods(localMethod).HandlerFunc(f)

-			r.Path(localRoute).Methods(localMethod).HandlerFunc(f)

+

+			if localRoute == "" {

+				r.Methods(localMethod).HandlerFunc(f)

+			} else {

+				r.Path("/v{version:[0-9.]+}" + localRoute).Methods(localMethod).HandlerFunc(f)

+				r.Path(localRoute).Methods(localMethod).HandlerFunc(f)

+			}

 		}

 	}

+	return r, nil

+}

+

+func ListenAndServe(addr string, srv *Server, logging bool) error {

+	log.Printf("Listening for HTTP on %s\n", addr)

+

+	r, err := createRouter(srv, logging)

+	if err != nil {

+		return err

+	}

 	return http.ListenAndServe(addr, r)

 }

@@ -1198,6 +1198,73 @@ func TestDeleteContainers(t *testing.T) {

 	}

 }

+func TestOptionsRoute(t *testing.T) {

+	runtime, err := newTestRuntime()

+	if err != nil {

+		t.Fatal(err)

+	}

+	defer nuke(runtime)

+

+	srv := &Server{runtime: runtime, enableCors: true}

+

+	r := httptest.NewRecorder()

+	router, err := createRouter(srv, false)

+	if err != nil {

+		t.Fatal(err)

+	}

+

+	req, err := http.NewRequest("OPTIONS", "/", nil)

+	if err != nil {

+		t.Fatal(err)

+	}

+

+	router.ServeHTTP(r, req)

+	if r.Code != http.StatusOK {

+		t.Errorf("Expected response for OPTIONS request to be \"200\", %v found.", r.Code)

+	}

+}

+

+func TestGetEnabledCors(t *testing.T) {

+	runtime, err := newTestRuntime()

+	if err != nil {

+		t.Fatal(err)

+	}

+	defer nuke(runtime)

+

+	srv := &Server{runtime: runtime, enableCors: true}

+

+	r := httptest.NewRecorder()

+

+	router, err := createRouter(srv, false)

+	if err != nil {

+		t.Fatal(err)

+	}

+

+	req, err := http.NewRequest("GET", "/version", nil)

+	if err != nil {

+		t.Fatal(err)

+	}

+

+	router.ServeHTTP(r, req)

+	if r.Code != http.StatusOK {

+		t.Errorf("Expected response for OPTIONS request to be \"200\", %v found.", r.Code)

+	}

+

+	allowOrigin := r.Header().Get("Access-Control-Allow-Origin")

+	allowHeaders := r.Header().Get("Access-Control-Allow-Headers")

+	allowMethods := r.Header().Get("Access-Control-Allow-Methods")

+

+	if allowOrigin != "*" {

+		t.Errorf("Expected header Access-Control-Allow-Origin to be \"*\", %s found.", allowOrigin)

+	}

+	if allowHeaders != "Origin, X-Requested-With, Content-Type, Accept" {

+		t.Errorf("Expected header Access-Control-Allow-Headers to be \"Origin, X-Requested-With, Content-Type, Accept\", %s found.", allowHeaders)

+	}

+	if allowMethods != "GET, POST, DELETE, PUT, OPTIONS" {

+		t.Errorf("Expected hearder Access-Control-Allow-Methods to be \"GET, POST, DELETE, PUT, OPTIONS\", %s found.", allowMethods)

+	}

+}

+

 func TestDeleteImages(t *testing.T) {

 	//FIXME: Implement this test

 	t.Log("Test not implemented")

@@ -313,10 +313,11 @@ func (b *buildFile) Build(dockerfile, context io.Reader) (string, error) {

 	for {

 		line, err := file.ReadString('\n')

 		if err != nil {

-			if err == io.EOF {

+			if err == io.EOF && line == "" {

 				break

+			} else if err != io.EOF {

+				return "", err

 			}

-			return "", err

 		}

 		line = strings.Replace(strings.TrimSpace(line), "	", " ", 1)

 		// Skip comments and empty line

@@ -15,58 +15,69 @@ run    sh -c 'echo root:testpass > /tmp/passwd'

 run    mkdir -p /var/run/sshd

 `

+const DockerfileNoNewLine = `

+# VERSION		0.1

+# DOCKER-VERSION	0.2

+

+from   ` + unitTestImageName + `

+run    sh -c 'echo root:testpass > /tmp/passwd'

+run    mkdir -p /var/run/sshd`

+

 func TestBuild(t *testing.T) {

-	runtime, err := newTestRuntime()

-	if err != nil {

-		t.Fatal(err)

-	}

-	defer nuke(runtime)

+	dockerfiles := []string{Dockerfile, DockerfileNoNewLine}

+	for _, Dockerfile := range dockerfiles {

+		runtime, err := newTestRuntime()

+		if err != nil {

+			t.Fatal(err)

+		}

+		defer nuke(runtime)

-	srv := &Server{runtime: runtime}

+		srv := &Server{runtime: runtime}

-	buildfile := NewBuildFile(srv, &utils.NopWriter{})

+		buildfile := NewBuildFile(srv, &utils.NopWriter{})

-	imgID, err := buildfile.Build(strings.NewReader(Dockerfile), nil)

-	if err != nil {

-		t.Fatal(err)

-	}

+		imgID, err := buildfile.Build(strings.NewReader(Dockerfile), nil)

+		if err != nil {

+			t.Fatal(err)

+		}

-	builder := NewBuilder(runtime)

-	container, err := builder.Create(

-		&Config{

-			Image: imgID,

-			Cmd:   []string{"cat", "/tmp/passwd"},

-		},

-	)

-	if err != nil {

-		t.Fatal(err)

-	}

-	defer runtime.Destroy(container)

+		builder := NewBuilder(runtime)

+		container, err := builder.Create(

+			&Config{

+				Image: imgID,

+				Cmd:   []string{"cat", "/tmp/passwd"},

+			},

+		)

+		if err != nil {

+			t.Fatal(err)

+		}

+		defer runtime.Destroy(container)

-	output, err := container.Output()

-	if err != nil {

-		t.Fatal(err)

-	}

-	if string(output) != "root:testpass\n" {

-		t.Fatalf("Unexpected output. Read '%s', expected '%s'", output, "root:testpass\n")

-	}

+		output, err := container.Output()

+		if err != nil {

+			t.Fatal(err)

+		}

+		if string(output) != "root:testpass\n" {

+			t.Fatalf("Unexpected output. Read '%s', expected '%s'", output, "root:testpass\n")

+		}

-	container2, err := builder.Create(

-		&Config{

-			Image: imgID,

-			Cmd:   []string{"ls", "-d", "/var/run/sshd"},

-		},

-	)

-	if err != nil {

-		t.Fatal(err)

-	}

-	defer runtime.Destroy(container2)

+		container2, err := builder.Create(

+			&Config{

+				Image: imgID,

+				Cmd:   []string{"ls", "-d", "/var/run/sshd"},

+			},

+		)

+		if err != nil {

+			t.Fatal(err)

+		}

+		defer runtime.Destroy(container2)

-	output, err = container2.Output()

-	if err != nil {

-		t.Fatal(err)

-	}

-	if string(output) != "/var/run/sshd\n" {

-		t.Fatal("/var/run/sshd has not been created")

+		output, err = container2.Output()

+		if err != nil {

+			t.Fatal(err)

+		}

+		if string(output) != "/var/run/sshd\n" {

+			t.Fatal("/var/run/sshd has not been created")

+		}

 	}

 }

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

 		if err != nil {

 			return err

 		}

-		return fmt.Errorf("error: %s", body)

+		if len(body) == 0 {

+			return fmt.Errorf("Error: %s", http.StatusText(resp.StatusCode))

+		}

+		return fmt.Errorf("Error: %s", body)

 	}

 	// Output the result

@@ -448,7 +451,7 @@ func (cli *DockerCli) CmdStop(args ...string) error {

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

 		_, _, err := cli.call("POST", "/containers/"+name+"/stop?"+v.Encode(), nil)

 		if err != nil {

-			fmt.Printf("%s", err)

+			fmt.Fprintf(os.Stderr, "%s", err)

 		} else {

 			fmt.Println(name)

 		}

@@ -473,7 +476,7 @@ func (cli *DockerCli) CmdRestart(args ...string) error {

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

 		_, _, err := cli.call("POST", "/containers/"+name+"/restart?"+v.Encode(), nil)

 		if err != nil {

-			fmt.Printf("%s", err)

+			fmt.Fprintf(os.Stderr, "%s", err)

 		} else {

 			fmt.Println(name)

 		}

@@ -494,7 +497,7 @@ func (cli *DockerCli) CmdStart(args ...string) error {

 	for _, name := range args {

 		_, _, err := cli.call("POST", "/containers/"+name+"/start", nil)

 		if err != nil {

-			fmt.Printf("%s", err)

+			fmt.Fprintf(os.Stderr, "%s", err)

 		} else {

 			fmt.Println(name)

 		}

@@ -503,29 +506,38 @@ func (cli *DockerCli) CmdStart(args ...string) error {

 }

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

-	cmd := Subcmd("inspect", "CONTAINER|IMAGE", "Return low-level information on a container/image")

+	cmd := Subcmd("inspect", "CONTAINER|IMAGE [CONTAINER|IMAGE...]", "Return low-level information on a container/image")

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

 		return nil

 	}

-	if cmd.NArg() != 1 {

+	if cmd.NArg() < 1 {

 		cmd.Usage()

 		return nil

 	}

-	obj, _, err := cli.call("GET", "/containers/"+cmd.Arg(0)+"/json", nil)

-	if err != nil {

-		obj, _, err = cli.call("GET", "/images/"+cmd.Arg(0)+"/json", nil)

+	fmt.Printf("[")

+	for i, name := range args {

+		if i > 0 {

+			fmt.Printf(",")

+		}

+		obj, _, err := cli.call("GET", "/containers/"+name+"/json", nil)

 		if err != nil {

-			return err

+			obj, _, err = cli.call("GET", "/images/"+name+"/json", nil)

+			if err != nil {

+				fmt.Fprintf(os.Stderr, "%s", err)

+				continue

+			}

 		}

-	}

-	indented := new(bytes.Buffer)

-	if err = json.Indent(indented, obj, "", "    "); err != nil {

-		return err

-	}

-	if _, err := io.Copy(os.Stdout, indented); err != nil {

-		return err

+		indented := new(bytes.Buffer)

+		if err = json.Indent(indented, obj, "", "    "); err != nil {

+			fmt.Fprintf(os.Stderr, "%s", err)

+			continue

+		}

+		if _, err := io.Copy(os.Stdout, indented); err != nil {

+			fmt.Fprintf(os.Stderr, "%s", err)

+		}

 	}

+	fmt.Printf("]")

 	return nil

 }

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

 	if frontend, exists := out.NetworkSettings.PortMapping[cmd.Arg(1)]; exists {

 		fmt.Println(frontend)

 	} else {

-		return fmt.Errorf("error: No private port '%s' allocated on %s", cmd.Arg(1), cmd.Arg(0))

+		return fmt.Errorf("Error: No private port '%s' allocated on %s", cmd.Arg(1), cmd.Arg(0))

 	}

 	return nil

 }

@@ -1074,7 +1086,12 @@ func (cli *DockerCli) CmdSearch(args ...string) error {

 	w := tabwriter.NewWriter(os.Stdout, 20, 1, 3, ' ', 0)

 	fmt.Fprintf(w, "NAME\tDESCRIPTION\n")

 	for _, out := range outs {

-		fmt.Fprintf(w, "%s\t%s\n", out.Name, out.Description)

+		desc := strings.Replace(out.Description, "\n", " ", -1)

+		desc = strings.Replace(desc, "\r", " ", -1)

+		if len(desc) > 45 {

+			desc = utils.Trunc(desc, 42) + "..."

+		}

+		fmt.Fprintf(w, "%s\t%s\n", out.Name, desc)

 	}

 	w.Flush()

 	return nil

@@ -1309,7 +1326,10 @@ func (cli *DockerCli) call(method, path string, data interface{}) ([]byte, int,

 		return nil, -1, err

 	}

 	if resp.StatusCode < 200 || resp.StatusCode >= 400 {

-		return nil, resp.StatusCode, fmt.Errorf("error: %s", body)

+		if len(body) == 0 {

+			return nil, resp.StatusCode, fmt.Errorf("Error: %s", http.StatusText(resp.StatusCode))

+		}

+		return nil, resp.StatusCode, fmt.Errorf("Error: %s", body)

 	}

 	return body, resp.StatusCode, nil

 }

@@ -1339,7 +1359,10 @@ func (cli *DockerCli) stream(method, path string, in io.Reader, out io.Writer) e

 		if err != nil {

 			return err

 		}

-		return fmt.Errorf("error: %s", body)

+		if len(body) == 0 {

+			return fmt.Errorf("Error :%s", http.StatusText(resp.StatusCode))

+		}

+		return fmt.Errorf("Error: %s", body)

 	}

 	if resp.Header.Get("Content-Type") == "application/json" {

@@ -1408,7 +1431,7 @@ func (cli *DockerCli) hijack(method, path string, setRawTerminal bool, in *os.Fi

 		return err

 	}

-	if !term.IsTerminal(os.Stdin.Fd()) {

+	if !term.IsTerminal(in.Fd()) {

 		if err := <-sendStdin; err != nil {

 			return err

 		}

deleted file mode 100644

@@ -1 +0,0 @@

-Solomon Hykes <solomon@dotcloud.com>

deleted file mode 100644

@@ -1,68 +0,0 @@

-# docker-build: build your software with docker

-

-## Description

-

-docker-build is a script to build docker images from source. It will be deprecated once the 'build' feature is incorporated into docker itself (See https://github.com/dotcloud/docker/issues/278)

-

-Author: Solomon Hykes <solomon@dotcloud.com>

-

-

-## Install

-

-docker-builder requires:

-

-1) A reasonably recent Python setup (tested on 2.7.2).

-

-2) A running docker daemon at version 0.1.4 or more recent (http://www.docker.io/gettingstarted)

-

-

-## Usage

-

-First create a valid Changefile, which defines a sequence of changes to apply to a base image.

-

-    $ cat Changefile

-    # Start build from a know base image

-    from	base:ubuntu-12.10

-    # Update ubuntu sources

-    run	echo 'deb http://archive.ubuntu.com/ubuntu quantal main universe multiverse' > /etc/apt/sources.list

-    run	apt-get update

-    # Install system packages

-    run	DEBIAN_FRONTEND=noninteractive apt-get install -y -q git

-    run DEBIAN_FRONTEND=noninteractive apt-get install -y -q curl

-    run DEBIAN_FRONTEND=noninteractive apt-get install -y -q golang

-    # Insert files from the host (./myscript must be present in the current directory)

-    copy	myscript /usr/local/bin/myscript

-

-

-Run docker-build, and pass the contents of your Changefile as standard input.

-

-    $ IMG=$(./docker-build < Changefile)

-

-This will take a while: for each line of the changefile, docker-build will:

-

-1. Create a new container to execute the given command or insert the given file

-2. Wait for the container to complete execution

-3. Commit the resulting changes as a new image

-4. Use the resulting image as the input of the next step

-

-

-If all the steps succeed, the result will be an image containing the combined results of each build step.

-You can trace back those build steps by inspecting the image's history:

-

-    $ docker history $IMG

-    ID                  CREATED             CREATED BY

-    1e9e2045de86        A few seconds ago   /bin/sh -c cat > /usr/local/bin/myscript; chmod +x /usr/local/bin/git

-    77db140aa62a        A few seconds ago   /bin/sh -c DEBIAN_FRONTEND=noninteractive apt-get install -y -q golang

-    77db140aa62a        A few seconds ago   /bin/sh -c DEBIAN_FRONTEND=noninteractive apt-get install -y -q curl

-    77db140aa62a        A few seconds ago   /bin/sh -c DEBIAN_FRONTEND=noninteractive apt-get install -y -q git 

-    83e85d155451        A few seconds ago   /bin/sh -c apt-get update

-    bfd53b36d9d3        A few seconds ago   /bin/sh -c echo 'deb http://archive.ubuntu.com/ubuntu quantal main universe multiverse' > /etc/apt/sources.list

-    base		2 weeks ago         /bin/bash

-    27cf78414709        2 weeks ago

-

-

-Note that your build started from 'base', as instructed by your Changefile. But that base image itself seems to have been built in 2 steps - hence the extra step in the history.

-

-

-You can use this build technique to create any image you want: a database, a web application, or anything else that can be build by a sequence of unix commands - in other words, anything else.

-

deleted file mode 100755

@@ -1,142 +0,0 @@

-#!/usr/bin/env python

-

-# docker-build is a script to build docker images from source.

-# It will be deprecated once the 'build' feature is incorporated into docker itself.

-# (See https://github.com/dotcloud/docker/issues/278)

-#

-# Author: Solomon Hykes <solomon@dotcloud.com>

-

-

-

-# First create a valid Changefile, which defines a sequence of changes to apply to a base image.

-# 

-#     $ cat Changefile

-#     # Start build from a know base image

-#     from	base:ubuntu-12.10

-#     # Update ubuntu sources

-#     run	echo 'deb http://archive.ubuntu.com/ubuntu quantal main universe multiverse' > /etc/apt/sources.list

-#     run	apt-get update

-#     # Install system packages

-#     run	DEBIAN_FRONTEND=noninteractive apt-get install -y -q git

-#     run DEBIAN_FRONTEND=noninteractive apt-get install -y -q curl

-#     run DEBIAN_FRONTEND=noninteractive apt-get install -y -q golang

-#     # Insert files from the host (./myscript must be present in the current directory)

-#     copy	myscript /usr/local/bin/myscript

-# 

-# 

-# Run docker-build, and pass the contents of your Changefile as standard input.

-# 

-#     $ IMG=$(./docker-build < Changefile)

-# 

-# This will take a while: for each line of the changefile, docker-build will:

-# 

-# 1. Create a new container to execute the given command or insert the given file

-# 2. Wait for the container to complete execution

-# 3. Commit the resulting changes as a new image

-# 4. Use the resulting image as the input of the next step

-

-

-import sys

-import subprocess

-import json

-import hashlib

-

-def docker(args, stdin=None):

-	print "# docker " + " ".join(args)

-	p = subprocess.Popen(["docker"] + list(args), stdin=stdin, stdout=subprocess.PIPE)

-	return p.stdout

-

-def image_exists(img):

-	return docker(["inspect", img]).read().strip() != ""

-

-def image_config(img):

-	return json.loads(docker(["inspect", img]).read()).get("config", {})

-

-def run_and_commit(img_in, cmd, stdin=None, author=None, run=None):

-	run_id = docker(["run"] + (["-i", "-a", "stdin"] if stdin else ["-d"]) + [img_in, "/bin/sh", "-c", cmd], stdin=stdin).read().rstrip()

-	print "---> Waiting for " + run_id

-	result=int(docker(["wait", run_id]).read().rstrip())

-	if result != 0:

-		print "!!! '{}' return non-zero exit code '{}'. Aborting.".format(cmd, result)

-		sys.exit(1)

-	return docker(["commit"] + (["-author", author] if author else []) + (["-run", json.dumps(run)] if run is not None else []) + [run_id]).read().rstrip()

-

-def insert(base, src, dst, author=None):

-	print "COPY {} to {} in {}".format(src, dst, base)

-	if dst == "":

-		raise Exception("Missing destination path")

-	stdin = file(src)

-	stdin.seek(0)

-	return run_and_commit(base, "cat > {0}; chmod +x {0}".format(dst), stdin=stdin, author=author)

-

-def add(base, src, dst, author=None):

-	print "PUSH to {} in {}".format(dst, base)

-	if src == ".":

-		tar = subprocess.Popen(["tar", "-c", "."], stdout=subprocess.PIPE).stdout

-	else:

-		tar = subprocess.Popen(["curl", src], stdout=subprocess.PIPE).stdout

-	if dst == "":

-		raise Exception("Missing argument to push")

-	return run_and_commit(base, "mkdir -p '{0}' && tar -C '{0}' -x".format(dst), stdin=tar, author=author)

-

-def main():

-	base=""

-	maintainer=""

-	steps = []

-	try:

-		for line in sys.stdin.readlines():

-			line = line.strip()

-			# Skip comments and empty lines

-			if line == "" or line[0] == "#":

-				continue

-			op, param = line.split(None, 1)

-			print op.upper() + " " + param

-			if op == "from":

-				base = param

-				steps.append(base)

-			elif op == "maintainer":

-				maintainer = param

-			elif op == "run":

-				result = run_and_commit(base, param, author=maintainer)

-				steps.append(result)

-				base = result

-				print "===> " + base

-			elif op == "copy":

-				src, dst = param.split("	", 1)

-				result = insert(base, src, dst, author=maintainer)

-				steps.append(result)

-				base = result

-				print "===> " + base

-			elif op == "add":

-				src, dst = param.split("	", 1)

-				result = add(base, src, dst, author=maintainer)

-				steps.append(result)

-				base=result

-				print "===> " + base

-			elif op == "expose":

-				config = image_config(base)

-				if config.get("PortSpecs") is None:

-					config["PortSpecs"] = []

-				portspec = param.strip()

-				config["PortSpecs"].append(portspec)

-				result = run_and_commit(base, "# (nop) expose port {}".format(portspec), author=maintainer, run=config)

-				steps.append(result)

-				base=result

-				print "===> " + base

-			elif op == "cmd":

-				config  = image_config(base)

-				cmd = list(json.loads(param))

-				config["Cmd"] = cmd

-				result = run_and_commit(base, "# (nop) set default command to '{}'".format(" ".join(cmd)), author=maintainer, run=config)

-				steps.append(result)

-				base=result

-				print "===> " + base

-			else:

-				print "Skipping uknown op " + op

-	except:

-		docker(["rmi"] + steps[1:])

-		raise

-	print base

-

-if __name__ == "__main__":

-	main()

deleted file mode 100644

@@ -1,13 +0,0 @@

-# Start build from a know base image

-maintainer	Solomon Hykes <solomon@dotcloud.com>

-from	base:ubuntu-12.10

-# Update ubuntu sources

-run	echo 'deb http://archive.ubuntu.com/ubuntu quantal main universe multiverse' > /etc/apt/sources.list

-run	apt-get update

-# Install system packages

-run	DEBIAN_FRONTEND=noninteractive apt-get install -y -q git

-run	DEBIAN_FRONTEND=noninteractive apt-get install -y -q curl

-run	DEBIAN_FRONTEND=noninteractive apt-get install -y -q golang

-# Insert files from the host (./myscript must be present in the current directory)

-copy	myscript	/usr/local/bin/myscript

-push	/src

deleted file mode 100644

@@ -1,3 +0,0 @@

-#!/bin/sh

-

-echo hello, world!

@@ -33,6 +33,7 @@ func main() {

 	bridgeName := flag.String("b", "", "Attach containers to a pre-existing network bridge")

 	pidfile := flag.String("p", "/var/run/docker.pid", "File containing process PID")

 	flHost := flag.String("H", fmt.Sprintf("%s:%d", host, port), "Host:port to bind/connect to")

+	flEnableCors := flag.Bool("api-enable-cors", false, "Enable CORS requests in the remote api.")

 	flag.Parse()

 	if *bridgeName != "" {

 		docker.NetworkBridgeIface = *bridgeName

@@ -65,7 +66,7 @@ func main() {

 			flag.Usage()

 			return

 		}

-		if err := daemon(*pidfile, host, port, *flAutoRestart); err != nil {

+		if err := daemon(*pidfile, host, port, *flAutoRestart, *flEnableCors); err != nil {

 			log.Fatal(err)

 			os.Exit(-1)

 		}

@@ -104,7 +105,7 @@ func removePidFile(pidfile string) {

 	}

 }

-func daemon(pidfile, addr string, port int, autoRestart bool) error {

+func daemon(pidfile, addr string, port int, autoRestart, enableCors bool) error {

 	if addr != "127.0.0.1" {

 		log.Println("/!\\ DON'T BIND ON ANOTHER IP ADDRESS THAN 127.0.0.1 IF YOU DON'T KNOW WHAT YOU'RE DOING /!\\")

 	}

@@ -122,7 +123,7 @@ func daemon(pidfile, addr string, port int, autoRestart bool) error {

 		os.Exit(0)

 	}()

-	server, err := docker.NewServer(autoRestart)

+	server, err := docker.NewServer(autoRestart, enableCors)

 	if err != nil {

 		return err

 	}

@@ -46,12 +46,11 @@ clean:

 	-rm -rf $(BUILDDIR)/*

 docs:

-	#-rm -rf $(BUILDDIR)/*

 	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/html

 	@echo

 	@echo "Build finished. The documentation pages are now in $(BUILDDIR)/html."

-server:

+server: docs

 	@cd $(BUILDDIR)/html; $(PYTHON) -m SimpleHTTPServer 8000

 site:

@@ -62,12 +61,13 @@ site:

 connect:

 	@echo connecting dotcloud to www.docker.io website, make sure to use user 1

-	@cd _build/website/ ; \

+	@echo or create your own "dockerwebsite" app

+	@cd $(BUILDDIR)/website/ ; \

 	dotcloud connect dockerwebsite ; \

 	dotcloud list

 push:

-	@cd _build/website/ ; \

+	@cd $(BUILDDIR)/website/ ; \

 	dotcloud push

 $(VERSIONS):

new file mode 100644

@@ -0,0 +1,5 @@

+This directory holds the authoritative specifications of APIs defined and implemented by Docker. Currently this includes:

+

+* The remote API by which a docker node can be queried over HTTP

+* The registry API by which a docker node can download and upload container images for storage and sharing

+* The index search API by which a docker node can search the public index for images to download

@@ -69,3 +69,27 @@ Initial version

 .. _a8ae398: https://github.com/dotcloud/docker/commit/a8ae398bf52e97148ee7bd0d5868de2e15bd297f

 .. _8d73740: https://github.com/dotcloud/docker/commit/8d73740343778651c09160cde9661f5f387b36f4

+

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

+Docker Remote API Client Libraries

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

+

+These libraries have been not tested by the Docker Maintainers for

+compatibility. Please file issues with the library owners.  If you

+find more library implementations, please list them in Docker doc bugs

+and we will add the libraries here.

+

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

+| Language/Framework   | Name           | Repository                                 |

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

+| Python               | docker-py      | https://github.com/dotcloud/docker-py      |

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

+| Ruby                 | docker-ruby    | https://github.com/ActiveState/docker-ruby |

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

+| Ruby                 | docker-client  | https://github.com/geku/docker-client      |

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

+| Javascript           | docker-js      | https://github.com/dgoujard/docker-js      |

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

+| Javascript (Angular) | dockerui       | https://github.com/crosbymichael/dockerui  |

+| **WebUI**            |                |                                            |

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

@@ -994,3 +994,11 @@ Here are the steps of 'docker run' :

 -------------

 In this version of the API, /attach, uses hijacking to transport stdin, stdout and stderr on the same socket. This might change in the future.

+

+3.3 CORS Requests

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

+

+To enable cross origin requests to the remote api add the flag "-api-enable-cors" when running docker in daemon mode.

+    

+    docker -d -H="192.168.1.9:4243" -api-enable-cors

+

@@ -5,13 +5,14 @@

 APIs

 ====

-This following :

+Your programs and scripts can access Docker's functionality via these interfaces:

 .. toctree::

   :maxdepth: 3

+  registry_index_spec

   registry_api

-  index_search_api

+  index_api

   docker_remote_api

new file mode 100644

@@ -0,0 +1,553 @@

+:title: Index API

+:description: API Documentation for Docker Index

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

+

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

+Docker Index API

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

+

+.. contents:: Table of Contents

+

+1. Brief introduction

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

+

+- This is the REST API for the Docker index

+- Authorization is done with basic auth over SSL

+- Not all commands require authentication, only those noted as such.

+

+2. Endpoints

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

+

+2.1 Repository

+^^^^^^^^^^^^^^

+

+Repositories

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

+

+User Repo

+~~~~~~~~~

+

+.. http:put:: /v1/repositories/(namespace)/(repo_name)/

+

+    Create a user repository with the given ``namespace`` and ``repo_name``.

+

+    **Example Request**:

+

+    .. sourcecode:: http

+

+        PUT /v1/repositories/foo/bar/ HTTP/1.1

+        Host: index.docker.io

+        Accept: application/json

+        Content-Type: application/json

+        Authorization: Basic akmklmasadalkm==

+        X-Docker-Token: true

+