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

new file mode 100644

@@ -0,0 +1,18 @@

+

+## FIXME

+

+This file is a loose collection of things to improve in the codebase, for the internal

+use of the maintainers.

+

+They are not big enough to be in the roadmap, not user-facing enough to be github issues,

+and not important enough to be discussed in the mailing list.

+

+They are just like FIXME comments in the source code, except we're not sure where in the source

+to put them - so we put them here :)

+

+

+* Merge Runtime, Server and Builder into Runtime

+* Run linter on codebase

+* Unify build commands and regular commands

+* Move source code into src/ subdir for clarity

+* Clean up the Makefile, it's a mess

@@ -3,4 +3,9 @@ Copyright 2012-2013 dotCloud, inc.

 This product includes software developed at dotCloud, inc. (http://www.dotcloud.com).

-This product contains software (https://github.com/kr/pty) developed by Keith Rarick, licensed under the MIT License.

\ No newline at end of file

+This product contains software (https://github.com/kr/pty) developed by Keith Rarick, licensed under the MIT License.

+

+Transfers of Docker shall be in accordance with applicable export controls of any country and all other applicable

+legal requirements.  Docker shall not be distributed or downloaded to or in Cuba, Iran, North Korea, Sudan or Syria

+and shall not be distributed or downloaded to any person on the Denied Persons List administered by the U.S.

+Department of Commerce.

@@ -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,10 @@ Standard Container Specification

 #### Security

+### Legal

+

+Transfers of Docker shall be in accordance with applicable export controls of any country and all other applicable

+legal requirements.  Docker shall not be distributed or downloaded to or in Cuba, Iran, North Korea, Sudan or Syria

+and shall not be distributed or downloaded to any person on the Denied Persons List administered by the U.S.

+Department of Commerce.

@@ -13,7 +13,7 @@ import (

 	"strings"

 )

-const APIVERSION = 1.1

+const APIVERSION = 1.2

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

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

@@ -45,6 +45,8 @@ func httpError(w http.ResponseWriter, err error) {

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

 	} else if strings.HasPrefix(err.Error(), "Bad parameter") {

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

+	} else if strings.HasPrefix(err.Error(), "Conflict") {

+		http.Error(w, err.Error(), http.StatusConflict)

 	} else if strings.HasPrefix(err.Error(), "Impossible") {

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

 	} else {

@@ -69,8 +71,10 @@ func getBoolParam(value string) (bool, error) {

 }

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

-	// FIXME: Handle multiple login at once

-	// FIXME: return specific error code if config file missing?

+	if version > 1.1 {

+		w.WriteHeader(http.StatusNotFound)

+		return nil

+	}

 	authConfig, err := auth.LoadConfig(srv.runtime.root)

 	if err != nil {

 		if err != auth.ErrConfigFileMissing {

@@ -87,29 +91,34 @@ func getAuth(srv *Server, version float64, w http.ResponseWriter, r *http.Reques

 }

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

-	// FIXME: Handle multiple login at once

-	config := &auth.AuthConfig{}

-	if err := json.NewDecoder(r.Body).Decode(config); err != nil {

+	authConfig := &auth.AuthConfig{}

+	err := json.NewDecoder(r.Body).Decode(authConfig)

+	if err != nil {

 		return err

 	}

-

-	authConfig, err := auth.LoadConfig(srv.runtime.root)

-	if err != nil {

-		if err != auth.ErrConfigFileMissing {

+	status := ""

+	if version > 1.1 {

+		status, err = auth.Login(authConfig, false)

+		if err != nil {

 			return err

 		}

-		authConfig = &auth.AuthConfig{}

-	}

-	if config.Username == authConfig.Username {

-		config.Password = authConfig.Password

-	}

+	} else {

+		localAuthConfig, err := auth.LoadConfig(srv.runtime.root)

+		if err != nil {

+			if err != auth.ErrConfigFileMissing {

+				return err

+			}

+		}

+		if authConfig.Username == localAuthConfig.Username {

+			authConfig.Password = localAuthConfig.Password

+		}

-	newAuthConfig := auth.NewAuthConfig(config.Username, config.Password, config.Email, srv.runtime.root)

-	status, err := auth.Login(newAuthConfig)

-	if err != nil {

-		return err

+		newAuthConfig := auth.NewAuthConfig(authConfig.Username, authConfig.Password, authConfig.Email, srv.runtime.root)

+		status, err = auth.Login(newAuthConfig, true)

+		if err != nil {

+			return err

+		}

 	}

-

 	if status != "" {

 		b, err := json.Marshal(&APIAuth{Status: status})

 		if err != nil {

@@ -320,7 +329,7 @@ func postImagesCreate(srv *Server, version float64, w http.ResponseWriter, r *ht

 	sf := utils.NewStreamFormatter(version > 1.0)

 	if image != "" { //pull

 		registry := r.Form.Get("registry")

-		if err := srv.ImagePull(image, tag, registry, w, sf); err != nil {

+		if err := srv.ImagePull(image, tag, registry, w, sf, &auth.AuthConfig{}); err != nil {

 			if sf.Used() {

 				w.Write(sf.FormatError(err))

 				return nil

@@ -388,6 +397,18 @@ func postImagesInsert(srv *Server, version float64, w http.ResponseWriter, r *ht

 }

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

+	authConfig := &auth.AuthConfig{}

+	if version > 1.1 {

+		if err := json.NewDecoder(r.Body).Decode(authConfig); err != nil {

+			return err

+		}

+	} else {

+		localAuthConfig, err := auth.LoadConfig(srv.runtime.root)

+		if err != nil && err != auth.ErrConfigFileMissing {

+			return err

+		}

+		authConfig = localAuthConfig

+	}

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

 		return err

 	}

@@ -401,7 +422,7 @@ func postImagesPush(srv *Server, version float64, w http.ResponseWriter, r *http

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

 	}

 	sf := utils.NewStreamFormatter(version > 1.0)

-	if err := srv.ImagePush(name, registry, w, sf); err != nil {

+	if err := srv.ImagePush(name, registry, w, sf, authConfig); err != nil {

 		if sf.Used() {

 			w.Write(sf.FormatError(err))

 			return nil

@@ -481,14 +502,30 @@ func deleteContainers(srv *Server, version float64, w http.ResponseWriter, r *ht

 }

 func deleteImages(srv *Server, version float64, 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")

 	}

 	name := vars["name"]

-	if err := srv.ImageDelete(name); err != nil {

+	imgs, err := srv.ImageDelete(name, version > 1.1)

+	if err != nil {

 		return err

 	}

-	w.WriteHeader(http.StatusNoContent)

+	if imgs != nil {

+		if len(*imgs) != 0 {

+			b, err := json.Marshal(imgs)

+			if err != nil {

+				return err

+			}

+			writeJSON(w, b)

+		} else {

+			return fmt.Errorf("Conflict, %s wasn't deleted", name)

+		}

+	} else {

+		w.WriteHeader(http.StatusNoContent)

+	}

 	return nil

 }

@@ -703,9 +740,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": {

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

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

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

 		},

+		"OPTIONS": {

+			"": optionsHandler,

+		},

 	}

 	for method, routes := range m {

@@ -769,6 +818,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

@@ -777,9 +829,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)

 }

@@ -25,6 +25,11 @@ type APIInfo struct {

 	SwapLimit   bool `json:",omitempty"`

 }

+type APIRmi struct {

+	Deleted  string `json:",omitempty"`

+	Untagged string `json:",omitempty"`

+}

+

 type APIContainers struct {

 	ID         string `json:"Id"`

 	Image      string

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

 	"bytes"

 	"encoding/json"

 	"github.com/dotcloud/docker/auth"

-	"github.com/dotcloud/docker/registry"

 	"github.com/dotcloud/docker/utils"

 	"io"

 	"net"

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

 	"time"

 )

-func TestGetAuth(t *testing.T) {

+func TestPostAuth(t *testing.T) {

 	runtime, err := newTestRuntime()

 	if err != nil {

 		t.Fatal(err)

@@ -54,12 +53,6 @@ func TestGetAuth(t *testing.T) {

 	if r.Code != http.StatusOK && r.Code != 0 {

 		t.Fatalf("%d OK or 0 expected, received %d\n", http.StatusOK, r.Code)

 	}

-

-	newAuthConfig := registry.NewRegistry(runtime.root).GetAuthConfig(false)

-	if newAuthConfig.Username != authConfig.Username ||

-		newAuthConfig.Email != authConfig.Email {

-		t.Fatalf("The auth configuration hasn't been set correctly")

-	}

 }

 func TestGetVersion(t *testing.T) {

@@ -494,40 +487,6 @@ func TestGetContainersByName(t *testing.T) {

 	}

 }

-func TestPostAuth(t *testing.T) {

-	runtime, err := newTestRuntime()

-	if err != nil {

-		t.Fatal(err)

-	}

-	defer nuke(runtime)

-

-	srv := &Server{

-		runtime: runtime,

-	}

-

-	config := &auth.AuthConfig{

-		Username: "utest",

-		Email:    "utest@yopmail.com",

-	}

-

-	authStr := auth.EncodeAuth(config)

-	auth.SaveConfig(runtime.root, authStr, config.Email)

-

-	r := httptest.NewRecorder()

-	if err := getAuth(srv, APIVERSION, r, nil, nil); err != nil {

-		t.Fatal(err)

-	}

-

-	authConfig := &auth.AuthConfig{}

-	if err := json.Unmarshal(r.Body.Bytes(), authConfig); err != nil {

-		t.Fatal(err)

-	}

-

-	if authConfig.Username != config.Username || authConfig.Email != config.Email {

-		t.Errorf("The retrieve auth mismatch with the one set.")

-	}

-}

-

 func TestPostCommit(t *testing.T) {

 	runtime, err := newTestRuntime()

 	if err != nil {

@@ -1239,9 +1198,131 @@ 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")

+	runtime, err := newTestRuntime()

+	if err != nil {

+		t.Fatal(err)

+	}

+	defer nuke(runtime)

+

+	srv := &Server{runtime: runtime}

+

+	if err := srv.runtime.repositories.Set("test", "test", unitTestImageName, true); err != nil {

+		t.Fatal(err)

+	}

+

+	images, err := srv.Images(false, "")

+	if err != nil {

+		t.Fatal(err)

+	}

+

+	if len(images) != 2 {

+		t.Errorf("Excepted 2 images, %d found", len(images))

+	}

+

+	req, err := http.NewRequest("DELETE", "/images/test:test", nil)

+	if err != nil {

+		t.Fatal(err)

+	}

+

+	r := httptest.NewRecorder()

+	if err := deleteImages(srv, APIVERSION, r, req, map[string]string{"name": "test:test"}); err != nil {

+		t.Fatal(err)

+	}

+	if r.Code != http.StatusOK {

+		t.Fatalf("%d OK expected, received %d\n", http.StatusOK, r.Code)

+	}

+

+	var outs []APIRmi

+	if err := json.Unmarshal(r.Body.Bytes(), &outs); err != nil {

+		t.Fatal(err)

+	}

+	if len(outs) != 1 {

+		t.Fatalf("Expected %d event (untagged), got %d", 1, len(outs))

+	}

+	images, err = srv.Images(false, "")

+	if err != nil {

+		t.Fatal(err)

+	}

+

+	if len(images) != 1 {

+		t.Errorf("Excepted 1 image, %d found", len(images))

+	}

+

+	/*	if c := runtime.Get(container.Id); c != nil {

+			t.Fatalf("The container as not been deleted")

+		}

+

+		if _, err := os.Stat(path.Join(container.rwPath(), "test")); err == nil {

+			t.Fatalf("The test file has not been deleted")

+		} */

 }

 // Mocked types for tests

@@ -48,7 +48,7 @@ func IndexServerAddress() string {

 }

 // create a base64 encoded auth string to store in config

-func EncodeAuth(authConfig *AuthConfig) string {

+func encodeAuth(authConfig *AuthConfig) string {

 	authStr := authConfig.Username + ":" + authConfig.Password

 	msg := []byte(authStr)

 	encoded := make([]byte, base64.StdEncoding.EncodedLen(len(msg)))

@@ -57,7 +57,7 @@ func EncodeAuth(authConfig *AuthConfig) string {

 }

 // decode the auth string

-func DecodeAuth(authStr string) (*AuthConfig, error) {

+func decodeAuth(authStr string) (*AuthConfig, error) {

 	decLen := base64.StdEncoding.DecodedLen(len(authStr))

 	decoded := make([]byte, decLen)

 	authByte := []byte(authStr)

@@ -82,7 +82,7 @@ func DecodeAuth(authStr string) (*AuthConfig, error) {

 func LoadConfig(rootPath string) (*AuthConfig, error) {

 	confFile := path.Join(rootPath, CONFIGFILE)

 	if _, err := os.Stat(confFile); err != nil {

-		return nil, ErrConfigFileMissing

+		return &AuthConfig{rootPath:rootPath}, ErrConfigFileMissing

 	}

 	b, err := ioutil.ReadFile(confFile)

 	if err != nil {

@@ -94,7 +94,7 @@ func LoadConfig(rootPath string) (*AuthConfig, error) {

 	}

 	origAuth := strings.Split(arr[0], " = ")

 	origEmail := strings.Split(arr[1], " = ")

-	authConfig, err := DecodeAuth(origAuth[1])

+	authConfig, err := decodeAuth(origAuth[1])

 	if err != nil {

 		return nil, err

 	}

@@ -104,13 +104,13 @@ func LoadConfig(rootPath string) (*AuthConfig, error) {

 }

 // save the auth config

-func SaveConfig(rootPath, authStr string, email string) error {

-	confFile := path.Join(rootPath, CONFIGFILE)

-	if len(email) == 0 {

+func SaveConfig(authConfig *AuthConfig) error {

+	confFile := path.Join(authConfig.rootPath, CONFIGFILE)

+	if len(authConfig.Email) == 0 {

 		os.Remove(confFile)

 		return nil

 	}

-	lines := "auth = " + authStr + "\n" + "email = " + email + "\n"

+	lines := "auth = " + encodeAuth(authConfig) + "\n" + "email = " + authConfig.Email + "\n"

 	b := []byte(lines)

 	err := ioutil.WriteFile(confFile, b, 0600)

 	if err != nil {

@@ -120,7 +120,7 @@ func SaveConfig(rootPath, authStr string, email string) error {

 }

 // try to register/login to the registry server

-func Login(authConfig *AuthConfig) (string, error) {

+func Login(authConfig *AuthConfig, store bool) (string, error) {

 	storeConfig := false

 	client := &http.Client{}

 	reqStatusCode := 0

@@ -168,8 +168,10 @@ func Login(authConfig *AuthConfig) (string, error) {

 				status = "Login Succeeded\n"

 				storeConfig = true

 			} else if resp.StatusCode == 401 {

-				if err := SaveConfig(authConfig.rootPath, "", ""); err != nil {

-					return "", err

+				if store {

+					if err := SaveConfig(authConfig); err != nil {

+						return "", err

+					}

 				}

 				return "", fmt.Errorf("Wrong login/password, please try again")

 			} else {

@@ -182,9 +184,8 @@ func Login(authConfig *AuthConfig) (string, error) {

 	} else {

 		return "", fmt.Errorf("Unexpected status code [%d] : %s", reqStatusCode, reqBody)

 	}

-	if storeConfig {

-		authStr := EncodeAuth(authConfig)

-		if err := SaveConfig(authConfig.rootPath, authStr, authConfig.Email); err != nil {

+	if storeConfig && store {

+		if err := SaveConfig(authConfig); err != nil {

 			return "", err

 		}

 	}

@@ -61,7 +61,7 @@ func (b *buildFile) CmdFrom(name string) error {

 				remote = name

 			}

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

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

 				return err

 			}

@@ -176,16 +176,14 @@ func (b *buildFile) CmdAdd(args string) error {

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

 	cmd := b.config.Cmd

-	b.config.Cmd = []string{"/bin/sh", "-c", fmt.Sprintf("#(nop) ADD %s in %s", orig, dest)}

-	cid, err := b.run()

+

+	// Create the container and start it

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

 	if err != nil {

 		return err

 	}

+	b.tmpContainers[container.ID] = struct{}{}

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

-	if container == nil {

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

-	}

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

 		return err

 	}

@@ -220,7 +218,7 @@ func (b *buildFile) CmdAdd(args string) error {

 			return err

 		}

 	}

-	if err := b.commit(cid, cmd, fmt.Sprintf("ADD %s in %s", orig, dest)); err != nil {

+	if err := b.commit(container.ID, cmd, fmt.Sprintf("ADD %s in %s", orig, dest)); err != nil {

 		return err

 	}

 	b.config.Cmd = cmd

@@ -272,11 +270,19 @@ func (b *buildFile) commit(id string, autoCmd []string, comment string) error {

 			utils.Debugf("[BUILDER] Cache miss")

 		}

-		cid, err := b.run()

+		// Create the container and start it

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

 		if err != nil {

 			return err

 		}

-		id = cid

+		b.tmpContainers[container.ID] = struct{}{}

+

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

+			return err

+		}

+		defer container.Unmount()

+

+		id = container.ID

 	}

 	container := b.runtime.Get(id)

@@ -313,10 +319,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

@@ -284,27 +287,16 @@ func (cli *DockerCli) CmdLogin(args ...string) error {

 		return nil

 	}

-	body, _, err := cli.call("GET", "/auth", nil)

-	if err != nil {

-		return err

-	}

-

-	var out auth.AuthConfig

-	err = json.Unmarshal(body, &out)

-	if err != nil {

-		return err

-	}

-

 	var username string

 	var password string

 	var email string

-	fmt.Print("Username (", out.Username, "): ")

+	fmt.Print("Username (", cli.authConfig.Username, "): ")

 	username = readAndEchoString(os.Stdin, os.Stdout)

 	if username == "" {

-		username = out.Username

+		username = cli.authConfig.Username

 	}

-	if username != out.Username {

+	if username != cli.authConfig.Username {

 		fmt.Print("Password: ")

 		password = readString(os.Stdin, os.Stdout)

@@ -312,20 +304,21 @@ func (cli *DockerCli) CmdLogin(args ...string) error {

 			return fmt.Errorf("Error : Password Required")

 		}

-		fmt.Print("Email (", out.Email, "): ")

+		fmt.Print("Email (", cli.authConfig.Email, "): ")

 		email = readAndEchoString(os.Stdin, os.Stdout)

 		if email == "" {

-			email = out.Email

+			email = cli.authConfig.Email

 		}

 	} else {

-		email = out.Email

+		email = cli.authConfig.Email

 	}

+	term.RestoreTerminal(oldState)

-	out.Username = username

-	out.Password = password

-	out.Email = email

+	cli.authConfig.Username = username

+	cli.authConfig.Password = password

+	cli.authConfig.Email = email

-	body, _, err = cli.call("POST", "/auth", out)

+	body, _, err := cli.call("POST", "/auth", cli.authConfig)

 	if err != nil {

 		return err

 	}

@@ -333,10 +326,11 @@ func (cli *DockerCli) CmdLogin(args ...string) error {

 	var out2 APIAuth

 	err = json.Unmarshal(body, &out2)

 	if err != nil {

+		auth.LoadConfig(os.Getenv("HOME"))

 		return err

 	}

+	auth.SaveConfig(cli.authConfig)

 	if out2.Status != "" {

-		term.RestoreTerminal(oldState)

 		fmt.Print(out2.Status)

 	}

 	return nil

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

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