@@ -15,3 +15,4 @@ docs/_build

 docs/_static

 docs/_templates

 .gopath/

+.dotcloud

@@ -170,7 +170,7 @@ func getContainersExport(srv *Server, version float64, w http.ResponseWriter, r

 	name := vars["name"]

 	if err := srv.ContainerExport(name, w); err != nil {

-		utils.Debugf("%s", err.Error())

+		utils.Debugf("%s", err)

 		return err

 	}

 	return nil

@@ -306,7 +306,7 @@ func postCommit(srv *Server, version float64, w http.ResponseWriter, r *http.Req

 	}

 	config := &Config{}

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

-		utils.Debugf("%s", err.Error())

+		utils.Debugf("%s", err)

 	}

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

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

@@ -342,8 +342,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, &auth.AuthConfig{}); err != nil {

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

 			if sf.Used() {

 				w.Write(sf.FormatError(err))

 				return nil

@@ -426,7 +425,6 @@ func postImagesPush(srv *Server, version float64, w http.ResponseWriter, r *http

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

 		return err

 	}

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

 	if vars == nil {

 		return fmt.Errorf("Missing parameter")

@@ -436,7 +434,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, authConfig); err != nil {

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

 		if sf.Used() {

 			w.Write(sf.FormatError(err))

 			return nil

@@ -880,7 +878,7 @@ func createRouter(srv *Server, logging bool) (*mux.Router, error) {

 			localMethod := method

 			localFct := fct

 			f := func(w http.ResponseWriter, r *http.Request) {

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

+				utils.Debugf("Calling %s %s from %s", localMethod, localRoute, r.RemoteAddr)

 				if logging {

 					log.Println(r.Method, r.RequestURI)

@@ -99,7 +99,7 @@ func TestGetVersion(t *testing.T) {

 		t.Fatal(err)

 	}

 	if v.Version != VERSION {

-		t.Errorf("Excepted version %s, %s found", VERSION, v.Version)

+		t.Errorf("Expected version %s, %s found", VERSION, v.Version)

 	}

 }

@@ -129,7 +129,7 @@ func TestGetInfo(t *testing.T) {

 		t.Fatal(err)

 	}

 	if infos.Images != len(initialImages) {

-		t.Errorf("Excepted images: %d, %d found", len(initialImages), infos.Images)

+		t.Errorf("Expected images: %d, %d found", len(initialImages), infos.Images)

 	}

 }

@@ -166,7 +166,7 @@ func TestGetImagesJSON(t *testing.T) {

 	}

 	if len(images) != len(initialImages) {

-		t.Errorf("Excepted %d image, %d found", len(initialImages), len(images))

+		t.Errorf("Expected %d image, %d found", len(initialImages), len(images))

 	}

 	found := false

@@ -177,7 +177,7 @@ func TestGetImagesJSON(t *testing.T) {

 		}

 	}

 	if !found {

-		t.Errorf("Excepted image %s, %+v found", unitTestImageName, images)

+		t.Errorf("Expected image %s, %+v found", unitTestImageName, images)

 	}

 	r2 := httptest.NewRecorder()

@@ -204,7 +204,7 @@ func TestGetImagesJSON(t *testing.T) {

 	}

 	if len(images2) != len(initialImages) {

-		t.Errorf("Excepted %d image, %d found", len(initialImages), len(images2))

+		t.Errorf("Expected %d image, %d found", len(initialImages), len(images2))

 	}

 	found = false

@@ -236,7 +236,7 @@ func TestGetImagesJSON(t *testing.T) {

 	}

 	if len(images3) != 0 {

-		t.Errorf("Excepted 0 image, %d found", len(images3))

+		t.Errorf("Expected 0 image, %d found", len(images3))

 	}

 	r4 := httptest.NewRecorder()

@@ -282,7 +282,7 @@ func TestGetImagesViz(t *testing.T) {

 		t.Fatal(err)

 	}

 	if line != "digraph docker {\n" {

-		t.Errorf("Excepted digraph docker {\n, %s found", line)

+		t.Errorf("Expected digraph docker {\n, %s found", line)

 	}

 }

@@ -313,7 +313,7 @@ func TestGetImagesSearch(t *testing.T) {

 		t.Fatal(err)

 	}

 	if len(results) < 2 {

-		t.Errorf("Excepted at least 2 lines, %d found", len(results))

+		t.Errorf("Expected at least 2 lines, %d found", len(results))

 	}

 }

@@ -337,7 +337,7 @@ func TestGetImagesHistory(t *testing.T) {

 		t.Fatal(err)

 	}

 	if len(history) != 1 {

-		t.Errorf("Excepted 1 line, %d found", len(history))

+		t.Errorf("Expected 1 line, %d found", len(history))

 	}

 }

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

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

 		t.Fatal(err)

 	}

-	if img.ID != unitTestImageId {

+	if img.ID != unitTestImageID {

 		t.Errorf("Error inspecting image")

 	}

 }

@@ -396,7 +396,7 @@ func TestGetContainersJSON(t *testing.T) {

 		t.Fatal(err)

 	}

 	if len(containers) != 1 {

-		t.Fatalf("Excepted %d container, %d found", 1, len(containers))

+		t.Fatalf("Expected %d container, %d found", 1, len(containers))

 	}

 	if containers[0].ID != container.ID {

 		t.Fatalf("Container ID mismatch. Expected: %s, received: %s\n", container.ID, containers[0].ID)

@@ -1356,24 +1356,34 @@ func TestDeleteImages(t *testing.T) {

 	}

 	if len(images) != len(initialImages)+1 {

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

+		t.Errorf("Expected %d images, %d found", len(initialImages)+1, len(images))

 	}

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

+	req, err := http.NewRequest("DELETE", "/images/"+unitTestImageID, 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 {

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

+		t.Fatalf("Expected conflict error, got none")

+	}

+

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

+	if err != nil {

 		t.Fatal(err)

 	}

-	if r.Code != http.StatusOK {

+

+	r2 := httptest.NewRecorder()

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

+		t.Fatal(err)

+	}

+	if r2.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 {

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

 		t.Fatal(err)

 	}

 	if len(outs) != 1 {

@@ -1385,7 +1395,7 @@ func TestDeleteImages(t *testing.T) {

 	}

 	if len(images) != len(initialImages) {

-		t.Errorf("Excepted %d image, %d found", len(initialImages), len(images))

+		t.Errorf("Expected %d image, %d found", len(initialImages), len(images))

 	}

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

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

 	"archive/tar"

 	"bufio"

 	"bytes"

-	"errors"

 	"fmt"

 	"github.com/dotcloud/docker/utils"

 	"io"

@@ -251,7 +250,7 @@ func CmdStream(cmd *exec.Cmd) (io.Reader, error) {

 		}

 		errText := <-errChan

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

-			pipeW.CloseWithError(errors.New(err.Error() + ": " + string(errText)))

+			pipeW.CloseWithError(fmt.Errorf("%s: %s", err, errText))

 		} else {

 			pipeW.Close()

 		}

@@ -16,7 +16,7 @@ func TestCmdStreamLargeStderr(t *testing.T) {

 	cmd := exec.Command("/bin/sh", "-c", "dd if=/dev/zero bs=1k count=1000 of=/dev/stderr; echo hello")

 	out, err := CmdStream(cmd)

 	if err != nil {

-		t.Fatalf("Failed to start command: " + err.Error())

+		t.Fatalf("Failed to start command: %s", err)

 	}

 	errCh := make(chan error)

 	go func() {

@@ -26,7 +26,7 @@ func TestCmdStreamLargeStderr(t *testing.T) {

 	select {

 	case err := <-errCh:

 		if err != nil {

-			t.Fatalf("Command should not have failed (err=%s...)", err.Error()[:100])

+			t.Fatalf("Command should not have failed (err=%.100s...)", err)

 		}

 	case <-time.After(5 * time.Second):

 		t.Fatalf("Command did not complete in 5 seconds; probable deadlock")

@@ -37,12 +37,12 @@ func TestCmdStreamBad(t *testing.T) {

 	badCmd := exec.Command("/bin/sh", "-c", "echo hello; echo >&2 error couldn\\'t reverse the phase pulser; exit 1")

 	out, err := CmdStream(badCmd)

 	if err != nil {

-		t.Fatalf("Failed to start command: " + err.Error())

+		t.Fatalf("Failed to start command: %s", err)

 	}

 	if output, err := ioutil.ReadAll(out); err == nil {

 		t.Fatalf("Command should have failed")

 	} else if err.Error() != "exit status 1: error couldn't reverse the phase pulser\n" {

-		t.Fatalf("Wrong error value (%s)", err.Error())

+		t.Fatalf("Wrong error value (%s)", err)

 	} else if s := string(output); s != "hello\n" {

 		t.Fatalf("Command output should be '%s', not '%s'", "hello\\n", output)

 	}

@@ -15,8 +15,8 @@ import (

 // Where we store the config file

 const CONFIGFILE = ".dockercfg"

-// the registry server we want to login against

-const INDEXSERVER = "https://index.docker.io/v1"

+// Only used for user auth + account creation

+const INDEXSERVER = "https://index.docker.io/v1/"

 //const INDEXSERVER = "http://indexstaging-docker.dotcloud.com/"

@@ -42,7 +42,7 @@ func NewAuthConfig(username, password, email, rootPath string) *AuthConfig {

 func IndexServerAddress() string {

 	if os.Getenv("DOCKER_INDEX_URL") != "" {

-		return os.Getenv("DOCKER_INDEX_URL") + "/v1"

+		return os.Getenv("DOCKER_INDEX_URL") + "/v1/"

 	}

 	return INDEXSERVER

 }

@@ -132,7 +132,7 @@ func Login(authConfig *AuthConfig, store bool) (string, error) {

 	// using `bytes.NewReader(jsonBody)` here causes the server to respond with a 411 status.

 	b := strings.NewReader(string(jsonBody))

-	req1, err := http.Post(IndexServerAddress()+"/users/", "application/json; charset=utf-8", b)

+	req1, err := http.Post(IndexServerAddress()+"users/", "application/json; charset=utf-8", b)

 	if err != nil {

 		return "", fmt.Errorf("Server Error: %s", err)

 	}

@@ -152,7 +152,7 @@ func Login(authConfig *AuthConfig, store bool) (string, error) {

 			"Please check your e-mail for a confirmation link.")

 	} else if reqStatusCode == 400 {

 		if string(reqBody) == "\"Username or email already exists\"" {

-			req, err := http.NewRequest("GET", IndexServerAddress()+"/users/", nil)

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

 			req.SetBasicAuth(authConfig.Username, authConfig.Password)

 			resp, err := client.Do(req)

 			if err != nil {

@@ -68,6 +68,6 @@ func TestCreateAccount(t *testing.T) {

 	expectedError := "Login: Account is not Active"

 	if !strings.Contains(err.Error(), expectedError) {

-		t.Fatalf("Expected message \"%s\" but found \"%s\" instead", expectedError, err.Error())

+		t.Fatalf("Expected message \"%s\" but found \"%s\" instead", expectedError, 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), nil); err != nil {

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

 				return err

 			}

@@ -3,14 +3,13 @@ package docker

 import (

 	"fmt"

 	"io/ioutil"

-	"sync"

 	"testing"

 )

 // mkTestContext generates a build context from the contents of the provided dockerfile.

 // This context is suitable for use as an argument to BuildFile.Build()

 func mkTestContext(dockerfile string, files [][2]string, t *testing.T) Archive {

-	context, err := mkBuildContext(fmt.Sprintf(dockerfile, unitTestImageId), files)

+	context, err := mkBuildContext(fmt.Sprintf(dockerfile, unitTestImageID), files)

 	if err != nil {

 		t.Fatal(err)

 	}

@@ -27,7 +26,7 @@ type testContextTemplate struct {

 // A table of all the contexts to build and test.

 // A new docker runtime will be created and torn down for each context.

-var testContexts []testContextTemplate = []testContextTemplate{

+var testContexts = []testContextTemplate{

 	{

 		`

 from   %s

@@ -105,7 +104,6 @@ func TestBuild(t *testing.T) {

 		srv := &Server{

 			runtime:     runtime,

-			lock:        &sync.Mutex{},

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

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

 		}

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

 	"os/signal"

 	"path/filepath"

 	"reflect"

-	"regexp"

 	"strconv"

 	"strings"

 	"syscall"

@@ -721,7 +720,6 @@ func (cli *DockerCli) CmdImport(args ...string) error {

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

 	cmd := Subcmd("push", "[OPTION] NAME", "Push an image or a repository to the registry")

-	registry := cmd.String("registry", "", "Registry host to push the image to")

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

 		return nil

 	}

@@ -732,28 +730,16 @@ func (cli *DockerCli) CmdPush(args ...string) error {

 		return nil

 	}

-	if err := cli.checkIfLogged(*registry == "", "push"); err != nil {

+	if err := cli.checkIfLogged("push"); err != nil {

 		return err

 	}

-	if *registry == "" {

-		// If we're not using a custom registry, we know the restrictions

-		// applied to repository names and can warn the user in advance.

-		// Custom repositories can have different rules, and we must also

-		// allow pushing by image ID.

-		if len(strings.SplitN(name, "/", 2)) == 1 {

-			return fmt.Errorf("Impossible to push a \"root\" repository. Please rename your repository in <user>/<repo> (ex: %s/%s)", cli.authConfig.Username, name)

-		}

-

-		nameParts := strings.SplitN(name, "/", 2)

-		validNamespace := regexp.MustCompile(`^([a-z0-9_]{4,30})$`)

-		if !validNamespace.MatchString(nameParts[0]) {

-			return fmt.Errorf("Invalid namespace name (%s), only [a-z0-9_] are allowed, size between 4 and 30", nameParts[0])

-		}

-		validRepo := regexp.MustCompile(`^([a-zA-Z0-9-_.]+)$`)

-		if !validRepo.MatchString(nameParts[1]) {

-			return fmt.Errorf("Invalid repository name (%s), only [a-zA-Z0-9-_.] are allowed", nameParts[1])

-		}

+	// If we're not using a custom registry, we know the restrictions

+	// applied to repository names and can warn the user in advance.

+	// Custom repositories can have different rules, and we must also

+	// allow pushing by image ID.

+	if len(strings.SplitN(name, "/", 2)) == 1 {

+		return fmt.Errorf("Impossible to push a \"root\" repository. Please rename your repository in <user>/<repo> (ex: %s/%s)", cli.authConfig.Username, name)

 	}

 	buf, err := json.Marshal(cli.authConfig)

@@ -762,7 +748,6 @@ func (cli *DockerCli) CmdPush(args ...string) error {

 	}

 	v := url.Values{}

-	v.Set("registry", *registry)

 	if err := cli.stream("POST", "/images/"+name+"/push?"+v.Encode(), bytes.NewBuffer(buf), cli.out); err != nil {

 		return err

 	}

@@ -772,7 +757,6 @@ func (cli *DockerCli) CmdPush(args ...string) error {

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

 	cmd := Subcmd("pull", "NAME", "Pull an image or a repository from the registry")

 	tag := cmd.String("t", "", "Download tagged image in repository")

-	registry := cmd.String("registry", "", "Registry to download from. Necessary if image is pulled by ID")

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

 		return nil

 	}

@@ -792,7 +776,6 @@ func (cli *DockerCli) CmdPull(args ...string) error {

 	v := url.Values{}

 	v.Set("fromImage", remote)

 	v.Set("tag", *tag)

-	v.Set("registry", *registry)

 	if err := cli.stream("POST", "/images/create?"+v.Encode(), nil, cli.out); err != nil {

 		return err

@@ -1329,9 +1312,9 @@ func (cli *DockerCli) CmdRun(args ...string) error {

 	return nil

 }

-func (cli *DockerCli) checkIfLogged(condition bool, action string) error {

+func (cli *DockerCli) checkIfLogged(action string) error {

 	// If condition AND the login failed

-	if condition && cli.authConfig.Username == "" {

+	if cli.authConfig.Username == "" {

 		if err := cli.CmdLogin(""); err != nil {

 			return err

 		}

@@ -1565,7 +1548,7 @@ func Subcmd(name, signature, description string) *flag.FlagSet {

 func NewDockerCli(in io.ReadCloser, out, err io.Writer, proto, addr string) *DockerCli {

 	var (

-		isTerminal bool = false

+		isTerminal = false

 		terminalFd uintptr

 	)

@@ -142,7 +142,7 @@ func TestRunHostname(t *testing.T) {

 	c := make(chan struct{})

 	go func() {

 		defer close(c)

-		if err := cli.CmdRun("-h", "foobar", unitTestImageId, "hostname"); err != nil {

+		if err := cli.CmdRun("-h", "foobar", unitTestImageID, "hostname"); err != nil {

 			t.Fatal(err)

 		}

 	}()

@@ -335,7 +335,7 @@ func TestRunAttachStdin(t *testing.T) {

 	ch := make(chan struct{})

 	go func() {

 		defer close(ch)

-		cli.CmdRun("-i", "-a", "stdin", unitTestImageId, "sh", "-c", "echo hello && cat")

+		cli.CmdRun("-i", "-a", "stdin", unitTestImageID, "sh", "-c", "echo hello && cat")

 	}()

 	// Send input to the command, close stdin

@@ -486,8 +486,8 @@ func (container *Container) Attach(stdin io.ReadCloser, stdinCloser io.Closer, s

 }

 func (container *Container) Start(hostConfig *HostConfig) error {

-	container.State.lock()

-	defer container.State.unlock()

+	container.State.Lock()

+	defer container.State.Unlock()

 	if len(hostConfig.Binds) == 0 {

 		hostConfig, _ = container.ReadHostConfig()

 	}

@@ -517,7 +517,7 @@ func (container *Container) Start(hostConfig *HostConfig) error {

 	// Create the requested bind mounts

 	binds := make(map[string]BindMap)

 	// Define illegal container destinations

-	illegal_dsts := []string{"/", "."}

+	illegalDsts := []string{"/", "."}

 	for _, bind := range hostConfig.Binds {

 		// FIXME: factorize bind parsing in parseBind

@@ -536,7 +536,7 @@ func (container *Container) Start(hostConfig *HostConfig) error {

 		}

 		// Bail if trying to mount to an illegal destination

-		for _, illegal := range illegal_dsts {

+		for _, illegal := range illegalDsts {

 			if dst == illegal {

 				return fmt.Errorf("Illegal bind destination: %s", dst)

 			}

@@ -845,8 +845,8 @@ func (container *Container) kill() error {

 }

 func (container *Container) Kill() error {

-	container.State.lock()

-	defer container.State.unlock()

+	container.State.Lock()

+	defer container.State.Unlock()

 	if !container.State.Running {

 		return nil

 	}

@@ -854,8 +854,8 @@ func (container *Container) Kill() error {

 }

 func (container *Container) Stop(seconds int) error {

-	container.State.lock()

-	defer container.State.unlock()

+	container.State.Lock()

+	defer container.State.Unlock()

 	if !container.State.Running {

 		return nil

 	}

@@ -37,7 +37,7 @@ func main() {

 	flag.Var(&flHosts, "H", "tcp://host:port to bind/connect to or unix://path/to/socket to use")

 	flag.Parse()

 	if len(flHosts) > 1 {

-		flHosts = flHosts[1:len(flHosts)] //trick to display a nice defaul value in the usage

+		flHosts = flHosts[1:] //trick to display a nice defaul value in the usage

 	}

 	for i, flHost := range flHosts {

 		flHosts[i] = utils.ParseHost(docker.DEFAULTHTTPHOST, docker.DEFAULTHTTPPORT, flHost)

new file mode 100644

Binary files /dev/null and b/docs/sources/concepts/images/dockerlogo-h.png differ

new file mode 100644

Binary files /dev/null and b/docs/sources/concepts/images/dockerlogo-v.png differ

@@ -1,10 +1,10 @@

-:title: Concepts

-:description: -- todo: change me

+:title: Overview

+:description: Docker documentation summary

 :keywords: concepts, documentation, docker, containers

-Concepts

+Overview

 ========

 Contents:

@@ -13,4 +13,4 @@ Contents:

    :maxdepth: 1

    ../index

-

+   manifesto

new file mode 100644

@@ -0,0 +1,190 @@

+:title: Manifesto

+:description: An overview of Docker and standard containers

+:keywords: containers, lxc, concepts, explanation

+

+.. _dockermanifesto:

+

+*(This was our original Welcome page, but it is a bit forward-looking

+for docs, and maybe not enough vision for a true manifesto. We'll

+reveal more vision in the future to make it more Manifesto-y.)*

+

+Docker Manifesto

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

+

+Docker complements LXC with a high-level API which operates at the

+process level. It runs unix processes with strong guarantees of

+isolation and repeatability across servers.

+

+Docker is a great building block for automating distributed systems:

+large-scale web deployments, database clusters, continuous deployment

+systems, private PaaS, service-oriented architectures, etc.

+

+- **Heterogeneous payloads** Any combination of binaries, libraries,

+  configuration files, scripts, virtualenvs, jars, gems, tarballs, you

+  name it. No more juggling between domain-specific tools. Docker can

+  deploy and run them all.

+- **Any server** Docker can run on any x64 machine with a modern linux

+  kernel - whether it's a laptop, a bare metal server or a VM. This

+  makes it perfect for multi-cloud deployments.

+- **Isolation** docker isolates processes from each other and from the

+  underlying host, using lightweight containers.

+- **Repeatability** Because containers are isolated in their own

+  filesystem, they behave the same regardless of where, when, and

+  alongside what they run.

+

+.. image:: images/lego_docker.jpg

+   :target: http://bricks.argz.com/ins/7823-1/12

+

+What is a Standard Container?

+.............................

+

+Docker defines a unit of software delivery called a Standard

+Container. The goal of a Standard Container is to encapsulate a

+software component and all its dependencies in a format that is

+self-describing and portable, so that any compliant runtime can run it

+without extra dependency, regardless of the underlying machine and the

+contents of the container.

+

+The spec for Standard Containers is currently work in progress, but it

+is very straightforward. It mostly defines 1) an image format, 2) a

+set of standard operations, and 3) an execution environment.

+

+A great analogy for this is the shipping container. Just like Standard

+Containers are a fundamental unit of software delivery, shipping

+containers are a fundamental unit of physical delivery.

+

+Standard operations

+~~~~~~~~~~~~~~~~~~~

+

+Just like shipping containers, Standard Containers define a set of

+STANDARD OPERATIONS. Shipping containers can be lifted, stacked,

+locked, loaded, unloaded and labelled. Similarly, standard containers

+can be started, stopped, copied, snapshotted, downloaded, uploaded and

+tagged.

+

+

+Content-agnostic

+~~~~~~~~~~~~~~~~~~~

+

+Just like shipping containers, Standard Containers are

+CONTENT-AGNOSTIC: all standard operations have the same effect

+regardless of the contents. A shipping container will be stacked in

+exactly the same way whether it contains Vietnamese powder coffee or

+spare Maserati parts. Similarly, Standard Containers are started or

+uploaded in the same way whether they contain a postgres database, a

+php application with its dependencies and application server, or Java

+build artifacts.

+

+Infrastructure-agnostic

+~~~~~~~~~~~~~~~~~~~~~~~~~~

+

+Both types of containers are INFRASTRUCTURE-AGNOSTIC: they can be

+transported to thousands of facilities around the world, and

+manipulated by a wide variety of equipment. A shipping container can

+be packed in a factory in Ukraine, transported by truck to the nearest

+routing center, stacked onto a train, loaded into a German boat by an

+Australian-built crane, stored in a warehouse at a US facility,

+etc. Similarly, a standard container can be bundled on my laptop,

+uploaded to S3, downloaded, run and snapshotted by a build server at

+Equinix in Virginia, uploaded to 10 staging servers in a home-made

+Openstack cluster, then sent to 30 production instances across 3 EC2

+regions.

+

+

+Designed for automation

+~~~~~~~~~~~~~~~~~~~~~~~

+

+Because they offer the same standard operations regardless of content

+and infrastructure, Standard Containers, just like their physical

+counterpart, are extremely well-suited for automation. In fact, you

+could say automation is their secret weapon.

+

+Many things that once required time-consuming and error-prone human

+effort can now be programmed. Before shipping containers, a bag of

+powder coffee was hauled, dragged, dropped, rolled and stacked by 10

+different people in 10 different locations by the time it reached its

+destination. 1 out of 50 disappeared. 1 out of 20 was damaged. The

+process was slow, inefficient and cost a fortune - and was entirely

+different depending on the facility and the type of goods.

+

+Similarly, before Standard Containers, by the time a software

+component ran in production, it had been individually built,

+configured, bundled, documented, patched, vendored, templated, tweaked

+and instrumented by 10 different people on 10 different

+computers. Builds failed, libraries conflicted, mirrors crashed,

+post-it notes were lost, logs were misplaced, cluster updates were

+half-broken. The process was slow, inefficient and cost a fortune -

+and was entirely different depending on the language and

+infrastructure provider.

+

+Industrial-grade delivery

+~~~~~~~~~~~~~~~~~~~~~~~~~

+

+There are 17 million shipping containers in existence, packed with

+every physical good imaginable. Every single one of them can be loaded

+on the same boats, by the same cranes, in the same facilities, and

+sent anywhere in the World with incredible efficiency. It is

+embarrassing to think that a 30 ton shipment of coffee can safely

+travel half-way across the World in *less time* than it takes a

+software team to deliver its code from one datacenter to another

+sitting 10 miles away.

+

+With Standard Containers we can put an end to that embarrassment, by

+making INDUSTRIAL-GRADE DELIVERY of software a reality.

+

+Standard Container Specification

+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

+

+(TODO)

+

+Image format

+~~~~~~~~~~~~

+

+Standard operations

+~~~~~~~~~~~~~~~~~~~

+

+-  Copy

+-  Run

+-  Stop

+-  Wait

+-  Commit

+-  Attach standard streams

+-  List filesystem changes

+-  ...

+

+Execution environment

+~~~~~~~~~~~~~~~~~~~~~

+

+Root filesystem

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

+

+Environment variables

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

+

+Process arguments

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

+

+Networking

+^^^^^^^^^^

+

+Process namespacing

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

+

+Resource limits

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

+

+Process monitoring

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

+

+Logging

+^^^^^^^

+

+Signals

+^^^^^^^

+

+Pseudo-terminal allocation

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

+

+Security

+^^^^^^^^

+

@@ -1,127 +1,38 @@

-:title: Introduction

-:description: An introduction to docker and standard containers?

+:title: Welcome to the Docker Documentation

+:description: An overview of the Docker Documentation

 :keywords: containers, lxc, concepts, explanation

 .. _introduction:

-Introduction

-============

+Welcome

+=======

-Docker -- The Linux container runtime

+.. image:: concepts/images/dockerlogo-h.png

-Docker complements LXC with a high-level API which operates at the process level. It runs unix processes with strong guarantees of isolation and repeatability across servers.

+``docker``, the Linux Container Runtime, runs Unix processes with

+strong guarantees of isolation across servers. Your software runs

+repeatably everywhere because its :ref:`container_def` includes any

+dependencies.

-Docker is a great building block for automating distributed systems: large-scale web deployments, database clusters, continuous deployment systems, private PaaS, service-oriented architectures, etc.

+``docker`` runs three ways:

+* as a daemon to manage LXC containers on your :ref:`Linux host

+  <kernel>` (``sudo docker -d``)

+* as a :ref:`CLI <cli>` which talks to the daemon's `REST API

+  <api/docker_remote_api>`_ (``docker run ...``)

+* as a client of :ref:`Repositories <working_with_the_repository>`

+  that let you share what you've built (``docker pull, docker

+  commit``).

-- **Heterogeneous payloads** Any combination of binaries, libraries, configuration files, scripts, virtualenvs, jars, gems, tarballs, you name it. No more juggling between domain-specific tools. Docker can deploy and run them all.

-- **Any server** Docker can run on any x64 machine with a modern linux kernel - whether it's a laptop, a bare metal server or a VM. This makes it perfect for multi-cloud deployments.

-- **Isolation** docker isolates processes from each other and from the underlying host, using lightweight containers.

-- **Repeatability** Because containers are isolated in their own filesystem, they behave the same regardless of where, when, and alongside what they run.

+Each use of ``docker`` is documented here. The features of Docker are

+currently in active development, so this documention will change

+frequently.

-.. image:: concepts/images/lego_docker.jpg

-

-

-What is a Standard Container?

-

-Docker defines a unit of software delivery called a Standard Container. The goal of a Standard Container is to encapsulate a software component and all its dependencies in

-a format that is self-describing and portable, so that any compliant runtime can run it without extra dependency, regardless of the underlying machine and the contents of the container.

-

-The spec for Standard Containers is currently work in progress, but it is very straightforward. It mostly defines 1) an image format, 2) a set of standard operations, and 3) an execution environment.

-

-A great analogy for this is the shipping container. Just like Standard Containers are a fundamental unit of software delivery, shipping containers (http://bricks.argz.com/ins/7823-1/12) are a fundamental unit of physical delivery.

-

-Standard operations

-~~~~~~~~~~~~~~~~~~~

-

-Just like shipping containers, Standard Containers define a set of STANDARD OPERATIONS. Shipping containers can be lifted, stacked, locked, loaded, unloaded and labelled. Similarly, standard containers can be started, stopped, copied, snapshotted, downloaded, uploaded and tagged.

-

-

-Content-agnostic

-~~~~~~~~~~~~~~~~~~~

-

-Just like shipping containers, Standard Containers are CONTENT-AGNOSTIC: all standard operations have the same effect regardless of the contents. A shipping container will be stacked in exactly the same way whether it contains Vietnamese powder coffee or spare Maserati parts. Similarly, Standard Containers are started or uploaded in the same way whether they contain a postgres database, a php application with its dependencies and application server, or Java build artifacts.

-

-

-Infrastructure-agnostic

-~~~~~~~~~~~~~~~~~~~~~~~~~~

-

-Both types of containers are INFRASTRUCTURE-AGNOSTIC: they can be transported to thousands of facilities around the world, and manipulated by a wide variety of equipment. A shipping container can be packed in a factory in Ukraine, transported by truck to the nearest routing center, stacked onto a train, loaded into a German boat by an Australian-built crane, stored in a warehouse at a US facility, etc. Similarly, a standard container can be bundled on my laptop, uploaded to S3, downloaded, run and snapshotted by a build server at Equinix in Virginia, uploaded to 10 staging servers in a home-made Openstack cluster, then sent to 30 production instances across 3 EC2 regions.

-

-

-Designed for automation

-~~~~~~~~~~~~~~~~~~~~~~~~~~

-

-Because they offer the same standard operations regardless of content and infrastructure, Standard Containers, just like their physical counterpart, are extremely well-suited for automation. In fact, you could say automation is their secret weapon.

-

-Many things that once required time-consuming and error-prone human effort can now be programmed. Before shipping containers, a bag of powder coffee was hauled, dragged, dropped, rolled and stacked by 10 different people in 10 different locations by the time it reached its destination. 1 out of 50 disappeared. 1 out of 20 was damaged. The process was slow, inefficient and cost a fortune - and was entirely different depending on the facility and the type of goods.

-

-Similarly, before Standard Containers, by the time a software component ran in production, it had been individually built, configured, bundled, documented, patched, vendored, templated, tweaked and instrumented by 10 different people on 10 different computers. Builds failed, libraries conflicted, mirrors crashed, post-it notes were lost, logs were misplaced, cluster updates were half-broken. The process was slow, inefficient and cost a fortune - and was entirely different depending on the language and infrastructure provider.

-

-

-Industrial-grade delivery

-~~~~~~~~~~~~~~~~~~~~~~~~~~

-

-There are 17 million shipping containers in existence, packed with every physical good imaginable. Every single one of them can be loaded on the same boats, by the same cranes, in the same facilities, and sent anywhere in the World with incredible efficiency. It is embarrassing to think that a 30 ton shipment of coffee can safely travel half-way across the World in *less time* than it takes a software team to deliver its code from one datacenter to another sitting 10 miles away.

-

-With Standard Containers we can put an end to that embarrassment, by making INDUSTRIAL-GRADE DELIVERY of software a reality.

-

-

-Standard Container Specification

-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

-

-(TODO)

-

-Image format

-~~~~~~~~~~~~

-

-Standard operations

-~~~~~~~~~~~~~~~~~~~

-

--  Copy

--  Run

--  Stop

--  Wait

--  Commit

--  Attach standard streams

--  List filesystem changes

--  ...

-

-Execution environment

-~~~~~~~~~~~~~~~~~~~~~

-

-Root filesystem

-^^^^^^^^^^^^^^^

-

-Environment variables

-^^^^^^^^^^^^^^^^^^^^^

-

-Process arguments

-^^^^^^^^^^^^^^^^^

-