@@ -1,3 +1,8 @@

+# This file lists all individuals having contributed content to the repository.

+# If you're submitting a patch, please add your name here in alphabetical order as part of the patch.

+#

+# For a list of active project maintainers, see the MAINTAINERS file.

+#

 Al Tobey <al@ooyala.com>

 Alexey Shamrin <shamrin@gmail.com>

 Andrea Luzzardi <aluzzardi@gmail.com>

@@ -1,9 +1,6 @@

 # Contributing to Docker

-Want to hack on Docker? Awesome! There are instructions to get you

-started on the website: http://docker.io/gettingstarted.html

-

-They are probably not perfect, please let us know if anything feels

+Want to hack on Docker? Awesome! Here are instructions to get you started. They are probably not perfect, please let us know if anything feels

 wrong or incomplete.

 ## Contribution guidelines

@@ -91,3 +88,73 @@ Add your name to the AUTHORS file, but make sure the list is sorted and your

 name and email address match your git configuration. The AUTHORS file is

 regenerated occasionally from the git commit history, so a mismatch may result

 in your changes being overwritten.

+

+

+## Decision process

+

+### How are decisions made?

+

+Short answer: with pull requests to the docker repository.

+

+Docker is an open-source project with an open design philosophy. This means that the repository is the source of truth for EVERY aspect of the project,

+including its philosophy, design, roadmap and APIs. *If it's part of the project, it's in the repo. It's in the repo, it's part of the project.*

+

+As a result, all decisions can be expressed as changes to the repository. An implementation change is a change to the source code. An API change is a change to

+the API specification. A philosophy change is a change to the philosophy manifesto. And so on.

+

+All decisions affecting docker, big and small, follow the same 3 steps:

+

+* Step 1: Open a pull request. Anyone can do this.

+

+* Step 2: Discuss the pull request. Anyone can do this.

+

+* Step 3: Accept or refuse a pull request. The relevant maintainer does this (see below "Who decides what?")

+

+

+### Who decides what?

+

+So all decisions are pull requests, and the relevant maintainer makes the decision by accepting or refusing the pull request.

+But how do we identify the relevant maintainer for a given pull request?

+

+Docker follows the timeless, highly efficient and totally unfair system known as [Benevolent dictator for life](http://en.wikipedia.org/wiki/Benevolent_Dictator_for_Life),

+with yours truly, Solomon Hykes, in the role of BDFL.

+This means that all decisions are made by default by me. Since making every decision myself would be highly unscalable, in practice decisions are spread across multiple maintainers.

+

+The relevant maintainer for a pull request is assigned in 3 steps:

+

+* Step 1: Determine the subdirectory affected by the pull request. This might be src/registry, docs/source/api, or any other part of the repo.

+

+* Step 2: Find the MAINTAINERS file which affects this directory. If the directory itself does not have a MAINTAINERS file, work your way up the the repo hierarchy until you find one.

+

+* Step 3: The first maintainer listed is the primary maintainer. The pull request is assigned to him. He may assign it to other listed maintainers, at his discretion.

+

+

+### I'm a maintainer, should I make pull requests too?

+

+Primary maintainers are not required to create pull requests when changing their own subdirectory, but secondary maintainers are.

+

+### Who assigns maintainers?

+

+Solomon.

+

+### How can I become a maintainer?

+

+* Step 1: learn the component inside out

+* Step 2: make yourself useful by contributing code, bugfixes, support etc.

+* Step 3: volunteer on the irc channel (#docker@freenode)

+

+Don't forget: being a maintainer is a time investment. Make sure you will have time to make yourself available.

+You don't have to be a maintainer to make a difference on the project!

+

+### What are a maintainer's responsibility?

+

+It is every maintainer's responsibility to:

+

+* 1) Expose a clear roadmap for improving their component.

+* 2) Deliver prompt feedback and decisions on pull requests.

+* 3) Be available to anyone with questions, bug reports, criticism etc. on their component. This includes irc, github requests and the mailing list.

+* 4) Make sure their component respects the philosophy, design and roadmap of the project.

+

+### How is this process changed?

+

+Just like everything else: by making a pull request :)

new file mode 100644

@@ -0,0 +1,4 @@

+Solomon Hykes <solomon@dotcloud.com>

+Guillaume Charmes <guillaume@dotcloud.com>

+api.go: Victor Vieux <victor@dotcloud.com>

+Vagrantfile: Daniel Mizyrycki <daniel@dotcloud.com>

deleted file mode 100644

@@ -1,71 +0,0 @@

-

-## Spec for data volumes

-

-Spec owner: Solomon Hykes <solomon@dotcloud.com>

-

-Data volumes (issue #111) are a much-requested feature which trigger much discussion and debate. Below is the current authoritative spec for implementing data volumes.

-This spec will be deprecated once the feature is fully implemented.

-

-Discussion, requests, trolls, demands, offerings, threats and other forms of supplications concerning this spec should be addressed to Solomon here: https://github.com/dotcloud/docker/issues/111

-

-

-### 1. Creating data volumes

-

-At container creation, parts of a container's filesystem can be mounted as separate data volumes. Volumes are defined with the -v flag.

-

-For example:

-

-```bash

-$ docker run -v /var/lib/postgres -v /var/log postgres /usr/bin/postgres

-```

-

-In this example, a new container is created from the 'postgres' image. At the same time, docker creates 2 new data volumes: one will be mapped to the container at /var/lib/postgres, the other at /var/log.

-

-2 important notes:

-

-1) Volumes don't have top-level names. At no point does the user provide a name, or is a name given to him. Volumes are identified by the path at which they are mounted inside their container.

-

-2) The user doesn't choose the source of the volume. Docker only mounts volumes it created itself, in the same way that it only runs containers that it created itself. That is by design.

-

-

-### 2. Sharing data volumes

-

-Instead of creating its own volumes, a container can share another container's volumes. For example:

-

-```bash

-$ docker run --volumes-from $OTHER_CONTAINER_ID postgres /usr/local/bin/postgres-backup

-```

-

-In this example, a new container is created from the 'postgres' example. At the same time, docker will *re-use* the 2 data volumes created in the previous example. One volume will be mounted on the /var/lib/postgres of *both* containers, and the other will be mounted on the /var/log of both containers.

-

-### 3. Under the hood

-

-Docker stores volumes in /var/lib/docker/volumes. Each volume receives a globally unique ID at creation, and is stored at /var/lib/docker/volumes/ID.

-

-At creation, volumes are attached to a single container - the source of truth for this mapping will be the container's configuration.

-

-Mounting a volume consists of calling "mount --bind" from the volume's directory to the appropriate sub-directory of the container mountpoint. This may be done by Docker itself, or farmed out to lxc (which supports mount-binding) if possible.

-

-

-### 4. Backups, transfers and other volume operations

-

-Volumes sometimes need to be backed up, transfered between hosts, synchronized, etc. These operations typically are application-specific or site-specific, eg. rsync vs. S3 upload vs. replication vs...

-

-Rather than attempting to implement all these scenarios directly, Docker will allow for custom implementations using an extension mechanism.

-

-### 5. Custom volume handlers

-

-Docker allows for arbitrary code to be executed against a container's volumes, to implement any custom action: backup, transfer, synchronization across hosts, etc.

-

-Here's an example:

-

-```bash

-$ DB=$(docker run -d -v /var/lib/postgres -v /var/log postgres /usr/bin/postgres)

-

-$ BACKUP_JOB=$(docker run -d --volumes-from $DB shykes/backuper /usr/local/bin/backup-postgres --s3creds=$S3CREDS)

-

-$ docker wait $BACKUP_JOB

-```

-

-Congratulations, you just implemented a custom volume handler, using Docker's built-in ability to 1) execute arbitrary code and 2) share volumes between containers.

-

@@ -33,6 +33,13 @@ func parseForm(r *http.Request) error {

 	return nil

 }

+func parseMultipartForm(r *http.Request) error {

+	if err := r.ParseMultipartForm(4096); err != nil && !strings.HasPrefix(err.Error(), "mime:") {

+		return err

+	}

+	return nil

+}

+

 func httpError(w http.ResponseWriter, err error) {

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

 		http.Error(w, err.Error(), http.StatusNotFound)

@@ -206,7 +213,7 @@ func getContainersChanges(srv *Server, version float64, w http.ResponseWriter, r

 	return nil

 }

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

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

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

 		return err

 	}

@@ -347,13 +354,18 @@ func postImagesInsert(srv *Server, version float64, w http.ResponseWriter, r *ht

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

 	}

 	sf := utils.NewStreamFormatter(version > 1.0)

-	if err := srv.ImageInsert(name, url, path, w, sf); err != nil {

+	imgId, err := srv.ImageInsert(name, url, path, w, sf)

+	if err != nil {

 		if sf.Used() {

 			w.Write(sf.FormatError(err))

 			return nil

 		}

+	}

+	b, err := json.Marshal(&ApiId{Id: imgId})

+	if err != nil {

 		return err

 	}

+	writeJson(w, b)

 	return nil

 }

@@ -564,6 +576,10 @@ func postContainersAttach(srv *Server, version float64, w http.ResponseWriter, r

 	}

 	name := vars["name"]

+	if _, err := srv.ContainerInspect(name); err != nil {

+		return err

+	}

+

 	in, out, err := hijackServer(w)

 	if err != nil {

 		return err

@@ -636,6 +652,30 @@ func postImagesGetCache(srv *Server, version float64, w http.ResponseWriter, r *

 	return nil

 }

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

+	if err := r.ParseMultipartForm(4096); err != nil {

+		return err

+	}

+

+	dockerfile, _, err := r.FormFile("Dockerfile")

+	if err != nil {

+		return err

+	}

+

+	context, _, err := r.FormFile("Context")

+	if err != nil {

+		if err != http.ErrMissingFile {

+			return err

+		}

+	}

+

+	b := NewBuildFile(srv, utils.NewWriteFlusher(w))

+	if _, err := b.Build(dockerfile, context); err != nil {

+		fmt.Fprintf(w, "Error build: %s\n", err)

+	}

+	return nil

+}

+

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

 	r := mux.NewRouter()

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

@@ -650,7 +690,8 @@ func ListenAndServe(addr string, srv *Server, logging bool) error {

 			"/images/search":                getImagesSearch,

 			"/images/{name:.*}/history":     getImagesHistory,

 			"/images/{name:.*}/json":        getImagesByName,

-			"/containers/ps":                getContainersPs,

+			"/containers/ps":                getContainersJson,

+			"/containers/json":              getContainersJson,

 			"/containers/{name:.*}/export":  getContainersExport,

 			"/containers/{name:.*}/changes": getContainersChanges,

 			"/containers/{name:.*}/json":    getContainersByName,

@@ -658,6 +699,7 @@ func ListenAndServe(addr string, srv *Server, logging bool) error {

 		"POST": {

 			"/auth":                         postAuth,

 			"/commit":                       postCommit,

+			"/build":                        postBuild,

 			"/images/create":                postImagesCreate,

 			"/images/{name:.*}/insert":      postImagesInsert,

 			"/images/{name:.*}/push":        postImagesPush,

@@ -318,7 +318,7 @@ func TestGetImagesByName(t *testing.T) {

 	}

 }

-func TestGetContainersPs(t *testing.T) {

+func TestGetContainersJson(t *testing.T) {

 	runtime, err := newTestRuntime()

 	if err != nil {

 		t.Fatal(err)

@@ -336,13 +336,13 @@ func TestGetContainersPs(t *testing.T) {

 	}

 	defer runtime.Destroy(container)

-	req, err := http.NewRequest("GET", "/containers?quiet=1&all=1", nil)

+	req, err := http.NewRequest("GET", "/containers/json?all=1", nil)

 	if err != nil {

 		t.Fatal(err)

 	}

 	r := httptest.NewRecorder()

-	if err := getContainersPs(srv, API_VERSION, r, req, nil); err != nil {

+	if err := getContainersJson(srv, API_VERSION, r, req, nil); err != nil {

 		t.Fatal(err)

 	}

 	containers := []ApiContainers{}

@@ -2,6 +2,7 @@ package docker

 import (

 	"errors"

+	"fmt"

 	"io"

 	"io/ioutil"

 	"os"

@@ -31,6 +32,20 @@ func (compression *Compression) Flag() string {

 	return ""

 }

+func (compression *Compression) Extension() string {

+	switch *compression {

+	case Uncompressed:

+		return "tar"

+	case Bzip2:

+		return "tar.bz2"

+	case Gzip:

+		return "tar.gz"

+	case Xz:

+		return "tar.xz"

+	}

+	return ""

+}

+

 func Tar(path string, compression Compression) (io.Reader, error) {

 	cmd := exec.Command("bsdtar", "-f", "-", "-C", path, "-c"+compression.Flag(), ".")

 	return CmdStream(cmd)

@@ -41,7 +56,7 @@ func Untar(archive io.Reader, path string) error {

 	cmd.Stdin = archive

 	output, err := cmd.CombinedOutput()

 	if err != nil {

-		return errors.New(err.Error() + ": " + string(output))

+		return fmt.Errorf("%s: %s", err, output)

 	}

 	return nil

 }

new file mode 120000

@@ -0,0 +1 @@

+../registry/MAINTAINERS

\ No newline at end of file

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

 	"strings"

 )

-type BuilderClient interface {

-	Build(io.Reader) (string, error)

-	CmdFrom(string) error

-	CmdRun(string) error

-}

-

 type builderClient struct {

 	cli *DockerCli

@@ -158,8 +152,23 @@ func (b *builderClient) CmdExpose(args string) error {

 }

 func (b *builderClient) CmdInsert(args string) error {

-	// FIXME: Reimplement this once the remove_hijack branch gets merged.

-	// We need to retrieve the resulting Id

+	// tmp := strings.SplitN(args, "\t ", 2)

+	// sourceUrl, destPath := tmp[0], tmp[1]

+

+	// v := url.Values{}

+	// v.Set("url", sourceUrl)

+	// v.Set("path", destPath)

+	// body, _, err := b.cli.call("POST", "/images/insert?"+v.Encode(), nil)

+	// if err != nil {

+	// 	return err

+	// }

+

+	// apiId := &ApiId{}

+	// if err := json.Unmarshal(body, apiId); err != nil {

+	// 	return err

+	// }

+

+	// FIXME: Reimplement this, we need to retrieve the resulting Id

 	return fmt.Errorf("INSERT not implemented")

 }

@@ -240,7 +249,7 @@ func (b *builderClient) commit(id string) error {

 	return nil

 }

-func (b *builderClient) Build(dockerfile io.Reader) (string, error) {

+func (b *builderClient) Build(dockerfile, context io.Reader) (string, error) {

 	defer b.clearTmp(b.tmpContainers, b.tmpImages)

 	file := bufio.NewReader(dockerfile)

 	for {

@@ -263,18 +272,18 @@ func (b *builderClient) Build(dockerfile io.Reader) (string, error) {

 		instruction := strings.ToLower(strings.Trim(tmp[0], " "))

 		arguments := strings.Trim(tmp[1], " ")

-		fmt.Printf("%s %s (%s)\n", strings.ToUpper(instruction), arguments, b.image)

+		fmt.Fprintf(os.Stderr, "%s %s (%s)\n", strings.ToUpper(instruction), arguments, b.image)

 		method, exists := reflect.TypeOf(b).MethodByName("Cmd" + strings.ToUpper(instruction[:1]) + strings.ToLower(instruction[1:]))

 		if !exists {

-			fmt.Printf("Skipping unknown instruction %s\n", strings.ToUpper(instruction))

+			fmt.Fprintf(os.Stderr, "Skipping unknown instruction %s\n", strings.ToUpper(instruction))

 		}

 		ret := method.Func.Call([]reflect.Value{reflect.ValueOf(b), reflect.ValueOf(arguments)})[0].Interface()

 		if ret != nil {

 			return "", ret.(error)

 		}

-		fmt.Printf("===> %v\n", b.image)

+		fmt.Fprintf(os.Stderr, "===> %v\n", b.image)

 	}

 	if b.needCommit {

 		if err := b.commit(""); err != nil {

@@ -289,13 +298,13 @@ func (b *builderClient) Build(dockerfile io.Reader) (string, error) {

 		for i := range b.tmpContainers {

 			delete(b.tmpContainers, i)

 		}

-		fmt.Printf("Build finished. image id: %s\n", b.image)

+		fmt.Fprintf(os.Stderr, "Build finished. image id: %s\n", b.image)

 		return b.image, nil

 	}

 	return "", fmt.Errorf("An error occured during the build\n")

 }

-func NewBuilderClient(addr string, port int) BuilderClient {

+func NewBuilderClient(addr string, port int) BuildFile {

 	return &builderClient{

 		cli:           NewDockerCli(addr, port),

 		config:        &Config{},

new file mode 100644

@@ -0,0 +1,377 @@

+package docker

+

+import (

+	"bufio"

+	"encoding/json"

+	"fmt"

+	"github.com/dotcloud/docker/utils"

+	"io"

+	"io/ioutil"

+	"os"

+	"path"

+	"reflect"

+	"strings"

+)

+

+type BuildFile interface {

+	Build(io.Reader, io.Reader) (string, error)

+	CmdFrom(string) error

+	CmdRun(string) error

+}

+

+type buildFile struct {

+	runtime *Runtime

+	builder *Builder

+	srv     *Server

+

+	image      string

+	maintainer string

+	config     *Config

+	context    string

+

+	tmpContainers map[string]struct{}

+	tmpImages     map[string]struct{}

+

+	needCommit bool

+

+	out io.Writer

+}

+

+func (b *buildFile) clearTmp(containers, images map[string]struct{}) {

+	for c := range containers {

+		tmp := b.runtime.Get(c)

+		b.runtime.Destroy(tmp)

+		utils.Debugf("Removing container %s", c)

+	}

+	for i := range images {

+		b.runtime.graph.Delete(i)

+		utils.Debugf("Removing image %s", i)

+	}

+}

+

+func (b *buildFile) CmdFrom(name string) error {

+	image, err := b.runtime.repositories.LookupImage(name)

+	if err != nil {

+		if b.runtime.graph.IsNotExist(err) {

+

+			var tag, remote string

+			if strings.Contains(name, ":") {

+				remoteParts := strings.Split(name, ":")

+				tag = remoteParts[1]

+				remote = remoteParts[0]

+			} else {

+				remote = name

+			}

+

+			if err := b.srv.ImagePull(remote, tag, "", b.out, utils.NewStreamFormatter(false)); err != nil {

+				return err

+			}

+

+			image, err = b.runtime.repositories.LookupImage(name)

+			if err != nil {

+				return err

+			}

+		} else {

+			return err

+		}

+	}

+	b.image = image.Id

+	b.config = &Config{}

+	return nil

+}

+

+func (b *buildFile) CmdMaintainer(name string) error {

+	b.needCommit = true

+	b.maintainer = name

+	return nil

+}

+

+func (b *buildFile) CmdRun(args string) error {

+	if b.image == "" {

+		return fmt.Errorf("Please provide a source image with `from` prior to run")

+	}

+	config, _, err := ParseRun([]string{b.image, "/bin/sh", "-c", args}, nil)

+	if err != nil {

+		return err

+	}

+

+	cmd, env := b.config.Cmd, b.config.Env

+	b.config.Cmd = nil

+	MergeConfig(b.config, config)

+

+	if cache, err := b.srv.ImageGetCached(b.image, config); err != nil {

+		return err

+	} else if cache != nil {

+		utils.Debugf("Use cached version")

+		b.image = cache.Id

+		return nil

+	}

+

+	cid, err := b.run()

+	if err != nil {

+		return err

+	}

+	b.config.Cmd, b.config.Env = cmd, env

+	return b.commit(cid)

+}

+

+func (b *buildFile) CmdEnv(args string) error {

+	b.needCommit = true

+	tmp := strings.SplitN(args, " ", 2)

+	if len(tmp) != 2 {

+		return fmt.Errorf("Invalid ENV format")

+	}

+	key := strings.Trim(tmp[0], " ")

+	value := strings.Trim(tmp[1], " ")

+

+	for i, elem := range b.config.Env {

+		if strings.HasPrefix(elem, key+"=") {

+			b.config.Env[i] = key + "=" + value

+			return nil

+		}

+	}

+	b.config.Env = append(b.config.Env, key+"="+value)

+	return nil

+}

+

+func (b *buildFile) CmdCmd(args string) error {

+	b.needCommit = true

+	var cmd []string

+	if err := json.Unmarshal([]byte(args), &cmd); err != nil {

+		utils.Debugf("Error unmarshalling: %s, using /bin/sh -c", err)

+		b.config.Cmd = []string{"/bin/sh", "-c", args}

+	} else {

+		b.config.Cmd = cmd

+	}

+	return nil

+}

+

+func (b *buildFile) CmdExpose(args string) error {

+	ports := strings.Split(args, " ")

+	b.config.PortSpecs = append(ports, b.config.PortSpecs...)

+	return nil

+}

+

+func (b *buildFile) CmdInsert(args string) error {

+	if b.image == "" {

+		return fmt.Errorf("Please provide a source image with `from` prior to insert")

+	}

+	tmp := strings.SplitN(args, " ", 2)

+	if len(tmp) != 2 {

+		return fmt.Errorf("Invalid INSERT format")

+	}

+	sourceUrl := strings.Trim(tmp[0], " ")

+	destPath := strings.Trim(tmp[1], " ")

+

+	file, err := utils.Download(sourceUrl, b.out)

+	if err != nil {

+		return err

+	}

+	defer file.Body.Close()

+

+	b.config.Cmd = []string{"echo", "INSERT", sourceUrl, "in", destPath}

+	cid, err := b.run()

+	if err != nil {

+		return err

+	}

+

+	container := b.runtime.Get(cid)

+	if container == nil {

+		return fmt.Errorf("An error occured while creating the container")

+	}

+

+	if err := container.Inject(file.Body, destPath); err != nil {

+		return err

+	}

+

+	return b.commit(cid)

+}

+

+func (b *buildFile) CmdAdd(args string) error {

+	if b.context == "" {

+		return fmt.Errorf("No context given. Impossible to use ADD")

+	}

+	tmp := strings.SplitN(args, " ", 2)

+	if len(tmp) != 2 {

+		return fmt.Errorf("Invalid INSERT format")

+	}

+	orig := strings.Trim(tmp[0], " ")

+	dest := strings.Trim(tmp[1], " ")

+

+	b.config.Cmd = []string{"echo", "PUSH", orig, "in", dest}

+	cid, err := b.run()

+	if err != nil {

+		return err

+	}

+

+	container := b.runtime.Get(cid)

+	if container == nil {

+		return fmt.Errorf("Error while creating the container (CmdAdd)")

+	}

+

+	if err := os.MkdirAll(path.Join(container.rwPath(), dest), 0700); err != nil {

+		return err

+	}

+

+	origPath := path.Join(b.context, orig)

+	destPath := path.Join(container.rwPath(), dest)

+

+	fi, err := os.Stat(origPath)

+	if err != nil {

+		return err

+	}

+	if fi.IsDir() {

+		files, err := ioutil.ReadDir(path.Join(b.context, orig))

+		if err != nil {

+			return err

+		}

+		for _, fi := range files {

+			if err := utils.CopyDirectory(path.Join(origPath, fi.Name()), path.Join(destPath, fi.Name())); err != nil {

+				return err

+			}

+		}

+	} else {

+		if err := utils.CopyDirectory(origPath, destPath); err != nil {

+			return err

+		}

+	}

+

+	return b.commit(cid)

+}

+

+func (b *buildFile) run() (string, error) {

+	if b.image == "" {

+		return "", fmt.Errorf("Please provide a source image with `from` prior to run")

+	}

+	b.config.Image = b.image

+

+	// Create the container and start it

+	c, err := b.builder.Create(b.config)

+	if err != nil {

+		return "", err

+	}

+	b.tmpContainers[c.Id] = struct{}{}

+

+	//start the container

+	if err := c.Start(); err != nil {

+		return "", err

+	}

+

+	// Wait for it to finish

+	if ret := c.Wait(); ret != 0 {

+		return "", fmt.Errorf("The command %v returned a non-zero code: %d", b.config.Cmd, ret)

+	}

+

+	return c.Id, nil

+}

+

+func (b *buildFile) commit(id string) error {

+	if b.image == "" {

+		return fmt.Errorf("Please provide a source image with `from` prior to commit")

+	}

+	b.config.Image = b.image

+	if id == "" {

+		cmd := b.config.Cmd

+		b.config.Cmd = []string{"true"}

+		if cid, err := b.run(); err != nil {

+			return err

+		} else {

+			id = cid

+		}

+		b.config.Cmd = cmd

+	}

+

+	container := b.runtime.Get(id)

+	if container == nil {

+		return fmt.Errorf("An error occured while creating the container")

+	}

+

+	// Commit the container

+	image, err := b.builder.Commit(container, "", "", "", b.maintainer, nil)

+	if err != nil {

+		return err

+	}

+	b.tmpImages[image.Id] = struct{}{}

+	b.image = image.Id

+	b.needCommit = false

+	return nil

+}

+

+func (b *buildFile) Build(dockerfile, context io.Reader) (string, error) {

+	defer b.clearTmp(b.tmpContainers, b.tmpImages)

+

+	if context != nil {

+		name, err := ioutil.TempDir("/tmp", "docker-build")

+		if err != nil {

+			return "", err

+		}

+		if err := Untar(context, name); err != nil {

+			return "", err

+		}

+		defer os.RemoveAll(name)

+		b.context = name

+	}

+	file := bufio.NewReader(dockerfile)

+	for {

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

+		if err != nil {

+			if err == io.EOF {

+				break

+			}

+			return "", err

+		}

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

+		// Skip comments and empty line

+		if len(line) == 0 || line[0] == '#' {

+			continue

+		}

+		tmp := strings.SplitN(line, " ", 2)

+		if len(tmp) != 2 {

+			return "", fmt.Errorf("Invalid Dockerfile format")

+		}

+		instruction := strings.ToLower(strings.Trim(tmp[0], " "))

+		arguments := strings.Trim(tmp[1], " ")

+

+		fmt.Fprintf(b.out, "%s %s (%s)\n", strings.ToUpper(instruction), arguments, b.image)

+

+		method, exists := reflect.TypeOf(b).MethodByName("Cmd" + strings.ToUpper(instruction[:1]) + strings.ToLower(instruction[1:]))

+		if !exists {

+			fmt.Fprintf(b.out, "Skipping unknown instruction %s\n", strings.ToUpper(instruction))

+		}

+		ret := method.Func.Call([]reflect.Value{reflect.ValueOf(b), reflect.ValueOf(arguments)})[0].Interface()

+		if ret != nil {

+			return "", ret.(error)

+		}

+

+		fmt.Fprintf(b.out, "===> %v\n", b.image)

+	}

+	if b.needCommit {

+		if err := b.commit(""); err != nil {

+			return "", err

+		}

+	}

+	if b.image != "" {

+		// The build is successful, keep the temporary containers and images

+		for i := range b.tmpImages {

+			delete(b.tmpImages, i)

+		}

+		fmt.Fprintf(b.out, "Build success.\n Image id:\n%s\n", b.image)

+		return b.image, nil

+	}

+	for i := range b.tmpContainers {

+		delete(b.tmpContainers, i)

+	}

+	return "", fmt.Errorf("An error occured during the build\n")

+}

+

+func NewBuildFile(srv *Server, out io.Writer) BuildFile {

+	return &buildFile{

+		builder:       NewBuilder(srv.runtime),

+		runtime:       srv.runtime,

+		srv:           srv,

+		config:        &Config{},

+		out:           out,

+		tmpContainers: make(map[string]struct{}),

+		tmpImages:     make(map[string]struct{}),

+	}

+}

new file mode 100644

@@ -0,0 +1,72 @@

+package docker

+

+import (

+	"github.com/dotcloud/docker/utils"

+	"strings"

+	"testing"

+)

+

+const Dockerfile = `

+# 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)

+

+	srv := &Server{runtime: runtime}

+

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

+

+	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)

+

+	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{