merge

.gitignore

@@ -0,0 +1,2 @@
+.*.swp
+a.out

README.md

@@ -1,33 +1,65 @@
-Docker: a self-sufficient runtime for linux containers
-======================================================
+Docker is a process manager with superpowers
+============================================
+
+It encapsulates heterogeneous payloads in Standard Containers, and runs them on any server with strong guarantees of isolation and repeatability.
+
+Is is a great building block for automating distributed systems: large-scale web deployments, database clusters, continuous deployment systems, private PaaS, service-oriented architectures, etc.
 
 <img src="http://bricks.argz.com/bricksfiles/lego/07000/7823/012.jpg"/>
 
-Docker is a runtime for Standard Containers. More specifically, it is a daemon which automates the creation of and deployment of linux Standard Containers (SCs) via a remote API.
+* *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.
+
+
+Notable features
+-----------------
+
+* Filesystem isolation: each process container runs in a completely separate root filesystem.
+
+* Resource isolation: system resources like cpu and memory can be allocated differently to each process container, using cgroups.
+
+* Network isolation: each process container runs in its own network namespace, with a virtual interface and IP address of its own (COMING SOON)
+
+* Copy-on-write: root filesystems are created using copy-on-write, which makes deployment extremeley fast, memory-cheap and disk-cheap.
+
+* Logging: the standard streams (stdout/stderr/stdin) of each process container is collected and logged for real-time or batch retrieval.
 
-Standard Containers are a fundamental unit of software delivery, in much the same way that shipping containers (http://bricks.argz.com/ins/7823-1/12) are a fundamental unit of physical delivery.
+* Change management: changes to a container's filesystem can be committed into a new image and re-used to create more containers. No templating or manual configuration required.
 
+* Interactive shell: docker can allocate a pseudo-tty and attach to the standard input of any container, for example to run a throaway interactive shell.
 
-1. STANDARD OPERATIONS
-----------------------
+
+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.
+
+### 1. 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.
 
 
-2. CONTENT-AGNOSTIC
-------------------
+### 2. 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 coffe 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.
 
 
-3. INFRASTRUCTURE-AGNOSTIC
---------------------------
+### 3. 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.
 
 
-4. DESIGNED FOR AUTOMATION
---------------------------
+### 4. 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.
 
@@ -36,14 +68,73 @@ Many things that once required time-consuming and error-prone human effort can n
 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.
 
 
-5. INDUSTRIAL-GRADE DELIVERY
-----------------------------
+### 5. 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.
 
 
+
+Under the hood
+--------------
+
+Under the hood, Docker is built on the following components:
+
+
+* The [cgroup](http://blog.dotcloud.com/kernel-secrets-from-the-paas-garage-part-24-c) and [namespacing](http://blog.dotcloud.com/under-the-hood-linux-kernels-on-dotcloud-part) capabilities of the Linux kernel;
+
+* [AUFS](http://aufs.sourceforge.net/aufs.html), a powerful union filesystem with copy-on-write capabilities;
+
+* The [Go](http://golang.org) programming language;
+
+* [lxc](http://lxc.sourceforge.net/), a set of convenience scripts to simplify the creation of linux containers.
+
+
+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
+
+
 Setup instructions
 ==================
 

client/client.go

@@ -0,0 +1,123 @@
+package client
+
+import (
+	"github.com/dotcloud/docker/rcli"
+	"github.com/dotcloud/docker/future"
+	"io"
+	"io/ioutil"
+	"log"
+	"os"
+	"os/exec"
+	"path"
+	"path/filepath"
+)
+
+// Run docker in "simple mode": run a single command and return.
+func SimpleMode(args []string) error {
+	var oldState *State
+	var err error
+	if IsTerminal(0) && os.Getenv("NORAW") == "" {
+		oldState, err = MakeRaw(0)
+		if err != nil {
+			return err
+		}
+		defer Restore(0, oldState)
+	}
+	// FIXME: we want to use unix sockets here, but net.UnixConn doesn't expose
+	// CloseWrite(), which we need to cleanly signal that stdin is closed without
+	// closing the connection.
+	// See http://code.google.com/p/go/issues/detail?id=3345
+	conn, err := rcli.Call("tcp", "127.0.0.1:4242", args...)
+	if err != nil {
+		return err
+	}
+	receive_stdout := future.Go(func() error {
+		_, err := io.Copy(os.Stdout, conn)
+		return err
+	})
+	send_stdin := future.Go(func() error {
+		_, err := io.Copy(conn, os.Stdin)
+		if err := conn.CloseWrite(); err != nil {
+			log.Printf("Couldn't send EOF: " + err.Error())
+		}
+		return err
+	})
+	if err := <-receive_stdout; err != nil {
+		return err
+	}
+	if oldState != nil {
+		Restore(0, oldState)
+	}
+	if !IsTerminal(0) {
+		if err := <-send_stdin; err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+// Run docker in "interactive mode": run a bash-compatible shell capable of running docker commands.
+func InteractiveMode(scripts ...string) error {
+	// Determine path of current docker binary
+	dockerPath, err := exec.LookPath(os.Args[0])
+	if err != nil {
+		return err
+	}
+	dockerPath, err = filepath.Abs(dockerPath)
+	if err != nil {
+		return err
+	}
+
+	// Create a temp directory
+	tmp, err := ioutil.TempDir("", "docker-shell")
+	if err != nil {
+		return err
+	}
+	defer os.RemoveAll(tmp)
+
+	// For each command, create an alias in temp directory
+	// FIXME: generate this list dynamically with introspection of some sort
+	// It might make sense to merge docker and dockerd to keep that introspection
+	// within a single binary.
+	for _, cmd := range []string{
+		"help",
+		"run",
+		"ps",
+		"pull",
+		"put",
+		"rm",
+		"kill",
+		"wait",
+		"stop",
+		"logs",
+		"diff",
+		"commit",
+		"attach",
+		"info",
+		"tar",
+		"web",
+		"images",
+		"docker",
+	} {
+		if err := os.Symlink(dockerPath, path.Join(tmp, cmd)); err != nil {
+			return err
+		}
+	}
+
+	// Run $SHELL with PATH set to temp directory
+	rcfile, err := ioutil.TempFile("", "docker-shell-rc")
+	if err != nil {
+		return err
+	}
+	io.WriteString(rcfile, "enable -n help\n")
+	os.Setenv("PATH", tmp)
+	os.Setenv("PS1", "\\h docker> ")
+	shell := exec.Command("/bin/bash", append([]string{"--rcfile", rcfile.Name()}, scripts...)...)
+	shell.Stdin = os.Stdin
+	shell.Stdout = os.Stdout
+	shell.Stderr = os.Stderr
+	if err := shell.Run(); err != nil {
+		return err
+	}
+	return nil
+}

client/term.go

@@ -0,0 +1,145 @@
+package client
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+type Termios struct {
+	Iflag  uintptr
+	Oflag  uintptr
+	Cflag  uintptr
+	Lflag  uintptr
+	Cc     [20]byte
+	Ispeed uintptr
+	Ospeed uintptr
+}
+
+
+const (
+	// Input flags
+	inpck  = 0x010
+	istrip = 0x020
+	icrnl  = 0x100
+	ixon   = 0x200
+
+	// Output flags
+	opost = 0x1
+
+	// Control flags
+	cs8 = 0x300
+
+	// Local flags
+	icanon = 0x100
+	iexten = 0x400
+)
+
+const (
+        HUPCL                             = 0x4000 
+        ICANON                            = 0x100 
+        ICRNL                             = 0x100 
+        IEXTEN                            = 0x400
+        BRKINT                            = 0x2 
+        CFLUSH                            = 0xf 
+        CLOCAL                            = 0x8000 
+        CREAD                             = 0x800 
+        CS5                               = 0x0 
+        CS6                               = 0x100 
+        CS7                               = 0x200 
+        CS8                               = 0x300 
+        CSIZE                             = 0x300 
+        CSTART                            = 0x11 
+        CSTATUS                           = 0x14 
+        CSTOP                             = 0x13 
+        CSTOPB                            = 0x400 
+        CSUSP                             = 0x1a 
+        IGNBRK                            = 0x1 
+        IGNCR                             = 0x80 
+        IGNPAR                            = 0x4 
+        IMAXBEL                           = 0x2000 
+        INLCR                             = 0x40 
+        INPCK                             = 0x10 
+        ISIG                              = 0x80 
+        ISTRIP                            = 0x20 
+        IUTF8                             = 0x4000 
+        IXANY                             = 0x800 
+        IXOFF                             = 0x400 
+        IXON                              = 0x200 
+        NOFLSH                            = 0x80000000 
+        OCRNL                             = 0x10 
+        OFDEL                             = 0x20000 
+        OFILL                             = 0x80 
+        ONLCR                             = 0x2 
+        ONLRET                            = 0x40 
+        ONOCR                             = 0x20 
+        ONOEOT                            = 0x8 
+        OPOST                             = 0x1 
+RENB                            = 0x1000 
+        PARMRK                            = 0x8 
+        PARODD                            = 0x2000 
+
+        TOSTOP                            = 0x400000 
+        VDISCARD                          = 0xf 
+        VDSUSP                            = 0xb 
+        VEOF                              = 0x0 
+        VEOL                              = 0x1 
+        VEOL2                             = 0x2 
+        VERASE                            = 0x3 
+        VINTR                             = 0x8 
+        VKILL                             = 0x5 
+        VLNEXT                            = 0xe 
+        VMIN                              = 0x10 
+        VQUIT                             = 0x9 
+        VREPRINT                          = 0x6 
+        VSTART                            = 0xc 
+        VSTATUS                           = 0x12 
+        VSTOP                             = 0xd 
+        VSUSP                             = 0xa 
+        VT0                               = 0x0 
+        VT1                               = 0x10000 
+        VTDLY                             = 0x10000 
+        VTIME                             = 0x11 
+	ECHO				  = 0x00000008
+
+        PENDIN                            = 0x20000000 
+)
+
+type State struct {
+       termios Termios
+}
+
+// IsTerminal returns true if the given file descriptor is a terminal.
+func IsTerminal(fd int) bool {
+        var termios Termios
+        _, _, err := syscall.Syscall6(syscall.SYS_IOCTL, uintptr(fd), uintptr(getTermios), uintptr(unsafe.Pointer(&termios)), 0, 0, 0)
+        return err == 0
+}
+
+// MakeRaw put the terminal connected to the given file descriptor into raw
+// mode and returns the previous state of the terminal so that it can be
+// restored.
+func MakeRaw(fd int) (*State, error) {
+        var oldState State
+        if _, _, err := syscall.Syscall6(syscall.SYS_IOCTL, uintptr(fd), uintptr(getTermios), uintptr(unsafe.Pointer(&oldState.termios)), 0, 0, 0); err != 0 {
+                return nil, err
+        }
+
+        newState := oldState.termios
+        newState.Iflag &^= istrip | INLCR | ICRNL | IGNCR | IXON | IXOFF
+        newState.Lflag &^= ECHO | ICANON | ISIG
+        if _, _, err := syscall.Syscall6(syscall.SYS_IOCTL, uintptr(fd), uintptr(setTermios), uintptr(unsafe.Pointer(&newState)), 0, 0, 0); err != 0 {
+                return nil, err
+        }
+
+        return &oldState, nil
+}
+
+
+// Restore restores the terminal connected to the given file descriptor to a
+// previous state.
+func Restore(fd int, state *State) error {
+        _, _, err := syscall.Syscall6(syscall.SYS_IOCTL, uintptr(fd), uintptr(setTermios), uintptr(unsafe.Pointer(&state.termios)), 0, 0, 0)
+        return err
+}
+
+

docker/termios_darwin.go → client/termios_darwin.go

@@ -1,4 +1,4 @@
-package main
+package client
 
 import "syscall"
 

docker/termios_linux.go → client/termios_linux.go

@@ -1,4 +1,4 @@
-package main
+package client
 
 import "syscall"
 

docker/docker.go

@@ -1,288 +1,30 @@
 package main
 
 import (
-	"github.com/dotcloud/docker/rcli"
-	"github.com/dotcloud/docker/future"
-	"io"
-	"io/ioutil"
+	"flag"
 	"log"
 	"os"
-	"os/exec"
-	"syscall"
-	"unsafe"
 	"path"
-	"path/filepath"
-	"flag"
-)
-
-
-type Termios struct {
-	Iflag  uintptr
-	Oflag  uintptr
-	Cflag  uintptr
-	Lflag  uintptr
-	Cc     [20]byte
-	Ispeed uintptr
-	Ospeed uintptr
-}
-
-
-const (
-	// Input flags
-	inpck  = 0x010
-	istrip = 0x020
-	icrnl  = 0x100
-	ixon   = 0x200
-
-	// Output flags
-	opost = 0x1
-
-	// Control flags
-	cs8 = 0x300
-
-	// Local flags
-	icanon = 0x100
-	iexten = 0x400
+	"github.com/dotcloud/docker/client"
 )
 
-const (
-        HUPCL                             = 0x4000 
-        ICANON                            = 0x100 
-        ICRNL                             = 0x100 
-        IEXTEN                            = 0x400
-        BRKINT                            = 0x2 
-        CFLUSH                            = 0xf 
-        CLOCAL                            = 0x8000 
-        CREAD                             = 0x800 
-        CS5                               = 0x0 
-        CS6                               = 0x100 
-        CS7                               = 0x200 
-        CS8                               = 0x300 
-        CSIZE                             = 0x300 
-        CSTART                            = 0x11 
-        CSTATUS                           = 0x14 
-        CSTOP                             = 0x13 
-        CSTOPB                            = 0x400 
-        CSUSP                             = 0x1a 
-        IGNBRK                            = 0x1 
-        IGNCR                             = 0x80 
-        IGNPAR                            = 0x4 
-        IMAXBEL                           = 0x2000 
-        INLCR                             = 0x40 
-        INPCK                             = 0x10 
-        ISIG                              = 0x80 
-        ISTRIP                            = 0x20 
-        IUTF8                             = 0x4000 
-        IXANY                             = 0x800 
-        IXOFF                             = 0x400 
-        IXON                              = 0x200 
-        NOFLSH                            = 0x80000000 
-        OCRNL                             = 0x10 
-        OFDEL                             = 0x20000 
-        OFILL                             = 0x80 
-        ONLCR                             = 0x2 
-        ONLRET                            = 0x40 
-        ONOCR                             = 0x20 
-        ONOEOT                            = 0x8 
-        OPOST                             = 0x1 
-RENB                            = 0x1000 
-        PARMRK                            = 0x8 
-        PARODD                            = 0x2000 
-
-        TOSTOP                            = 0x400000 
-        VDISCARD                          = 0xf 
-        VDSUSP                            = 0xb 
-        VEOF                              = 0x0 
-        VEOL                              = 0x1 
-        VEOL2                             = 0x2 
-        VERASE                            = 0x3 
-        VINTR                             = 0x8 
-        VKILL                             = 0x5 
-        VLNEXT                            = 0xe 
-        VMIN                              = 0x10 
-        VQUIT                             = 0x9 
-        VREPRINT                          = 0x6 
-        VSTART                            = 0xc 
-        VSTATUS                           = 0x12 
-        VSTOP                             = 0xd 
-        VSUSP                             = 0xa 
-        VT0                               = 0x0 
-        VT1                               = 0x10000 
-        VTDLY                             = 0x10000 
-        VTIME                             = 0x11 
-	ECHO				  = 0x00000008
-
-        PENDIN                            = 0x20000000 
-)
-
-type State struct {
-       termios Termios
-}
-
-// IsTerminal returns true if the given file descriptor is a terminal.
-func IsTerminal(fd int) bool {
-        var termios Termios
-        _, _, err := syscall.Syscall6(syscall.SYS_IOCTL, uintptr(fd), uintptr(getTermios), uintptr(unsafe.Pointer(&termios)), 0, 0, 0)
-        return err == 0
-}
-
-// MakeRaw put the terminal connected to the given file descriptor into raw
-// mode and returns the previous state of the terminal so that it can be
-// restored.
-func MakeRaw(fd int) (*State, error) {
-        var oldState State
-        if _, _, err := syscall.Syscall6(syscall.SYS_IOCTL, uintptr(fd), uintptr(getTermios), uintptr(unsafe.Pointer(&oldState.termios)), 0, 0, 0); err != 0 {
-                return nil, err
-        }
-
-        newState := oldState.termios
-        newState.Iflag &^= istrip | INLCR | ICRNL | IGNCR | IXON | IXOFF
-        newState.Lflag &^= ECHO | ICANON | ISIG
-        if _, _, err := syscall.Syscall6(syscall.SYS_IOCTL, uintptr(fd), uintptr(setTermios), uintptr(unsafe.Pointer(&newState)), 0, 0, 0); err != 0 {
-                return nil, err
-        }
-
-        return &oldState, nil
-}
-
-
-// Restore restores the terminal connected to the given file descriptor to a
-// previous state.
-func Restore(fd int, state *State) error {
-        _, _, err := syscall.Syscall6(syscall.SYS_IOCTL, uintptr(fd), uintptr(setTermios), uintptr(unsafe.Pointer(&state.termios)), 0, 0, 0)
-        return err
-}
-
-var oldState *State
-
-func Fatal(err error) {
-	if oldState != nil {
-		Restore(0, oldState)
-	}
-	log.Fatal(err)
-}
-
-
 func main() {
 	if cmd := path.Base(os.Args[0]); cmd == "docker" {
 		fl_shell := flag.Bool("i", false, "Interactive mode")
 		flag.Parse()
 		if *fl_shell {
-			if err := InteractiveMode(flag.Args()...); err != nil {
+			if err := client.InteractiveMode(flag.Args()...); err != nil {
 				log.Fatal(err)
 			}
 		} else {
-			SimpleMode(os.Args[1:])
+			if err := client.SimpleMode(os.Args[1:]); err != nil {
+				log.Fatal(err)
+			}
 		}
 	} else {
-		SimpleMode(append([]string{cmd}, os.Args[1:]...))
-	}
-}
-
-// Run docker in "simple mode": run a single command and return.
-func SimpleMode(args []string) {
-	var err error
-	if IsTerminal(0) && os.Getenv("NORAW") == "" {
-		oldState, err = MakeRaw(0)
-		if err != nil {
-			panic(err)
-		}
-		defer Restore(0, oldState)
-	}
-	// FIXME: we want to use unix sockets here, but net.UnixConn doesn't expose
-	// CloseWrite(), which we need to cleanly signal that stdin is closed without
-	// closing the connection.
-	// See http://code.google.com/p/go/issues/detail?id=3345
-	conn, err := rcli.Call("tcp", "127.0.0.1:4242", args...)
-	if err != nil {
-		Fatal(err)
-	}
-	receive_stdout := future.Go(func() error {
-		_, err := io.Copy(os.Stdout, conn)
-		return err
-	})
-	send_stdin := future.Go(func() error {
-		_, err := io.Copy(conn, os.Stdin)
-		if err := conn.CloseWrite(); err != nil {
-			log.Printf("Couldn't send EOF: " + err.Error())
-		}
-		return err
-	})
-	if err := <-receive_stdout; err != nil {
-		Fatal(err)
-	}
-	if oldState != nil {
-		Restore(0, oldState)
-	}
-	if !IsTerminal(0) {
-		if err := <-send_stdin; err != nil {
-			Fatal(err)
+		if err := client.SimpleMode(append([]string{cmd}, os.Args[1:]...)); err != nil {
+			log.Fatal(err)
 		}
 	}
 }
 
-// Run docker in "interactive mode": run a bash-compatible shell capable of running docker commands.
-func InteractiveMode(scripts ...string) error {
-	// Determine path of current docker binary
-	dockerPath, err := exec.LookPath(os.Args[0])
-	if err != nil {
-		return err
-	}
-	dockerPath, err = filepath.Abs(dockerPath)
-	if err != nil {
-		return err
-	}
-
-	// Create a temp directory
-	tmp, err := ioutil.TempDir("", "docker-shell")
-	if err != nil {
-		return err
-	}
-	defer os.RemoveAll(tmp)
-
-	// For each command, create an alias in temp directory
-	// FIXME: generate this list dynamically with introspection of some sort
-	// It might make sense to merge docker and dockerd to keep that introspection
-	// within a single binary.
-	for _, cmd := range []string{
-		"help",
-		"run",
-		"ps",
-		"pull",
-		"put",
-		"rm",
-		"kill",
-		"wait",
-		"stop",
-		"logs",
-		"diff",
-		"commit",
-		"attach",
-		"info",
-		"tar",
-		"web",
-		"images",
-		"docker",
-	} {
-		if err := os.Symlink(dockerPath, path.Join(tmp, cmd)); err != nil {
-			return err
-		}
-	}
-
-	// Run $SHELL with PATH set to temp directory
-	rcfile, err := ioutil.TempFile("", "docker-shell-rc")
-	if err != nil {
-		return err
-	}
-	io.WriteString(rcfile, "enable -n help\n")
-	os.Setenv("PATH", tmp)
-	os.Setenv("PS1", "\\h docker> ")
-	shell := exec.Command("/bin/bash", append([]string{"--rcfile", rcfile.Name()}, scripts...)...)
-	shell.Stdin = os.Stdin
-	shell.Stdout = os.Stdout
-	shell.Stderr = os.Stderr
-	if err := shell.Run(); err != nil {
-		return err
-	}
-	return nil
-}

filesystem.go

@@ -44,7 +44,7 @@ func (fs *Filesystem) Mount() error {
 		roBranches += fmt.Sprintf("%v=ro:", layer)
 	}
 	branches := fmt.Sprintf("br:%v:%v", rwBranch, roBranches)
-	if err := syscall.Mount("none", fs.RootFS, "aufs", 0, branches); err != nil {
+	if err := mount("none", fs.RootFS, "aufs", 0, branches); err != nil {
 		return err
 	}
 	if !fs.IsMounted() {

mount_darwin.go

@@ -0,0 +1,7 @@
+package docker
+
+import "errors"
+
+func mount(source string, target string, fstype string, flags uintptr, data string) (err error) {
+	return errors.New("mount is not implemented on darwin")
+}

mount_linux.go

@@ -0,0 +1,8 @@
+package docker
+
+import "syscall"
+
+
+func mount(source string, target string, fstype string, flags uintptr, data string) (err error) {
+	return syscall.Mount(source, target, fstype, flags, data)
+}

dockerd/dockerd.go → server/server.go

@@ -1,30 +1,38 @@
-package main
+package server
 
 import (
-	"bufio"
-	"bytes"
-	"encoding/json"
-	"errors"
-	"flag"
-	"fmt"
 	"github.com/dotcloud/docker"
-	"github.com/dotcloud/docker/future"
-	"github.com/dotcloud/docker/image"
 	"github.com/dotcloud/docker/rcli"
-	"io"
+	"github.com/dotcloud/docker/image"
+	"github.com/dotcloud/docker/future"
+	"bufio"
+	"errors"
 	"log"
-	"net/http"
-	"net/url"
-	"os"
-	"path"
+	"io"
+	"fmt"
 	"strings"
-	"sync"
 	"text/tabwriter"
+	"os"
 	"time"
+	"net/http"
+	"encoding/json"
+	"bytes"
+	"sync"
+	"net/url"
+	"path"
 )
 
 const VERSION = "0.0.1"
 
+func (srv *Server) ListenAndServe() error {
+	go rcli.ListenAndServeHTTP("127.0.0.1:8080", srv)
+	// FIXME: we want to use unix sockets here, but net.UnixConn doesn't expose
+	// CloseWrite(), which we need to cleanly signal that stdin is closed without
+	// closing the connection.
+	// See http://code.google.com/p/go/issues/detail?id=3345
+	return rcli.ListenAndServe("tcp", "127.0.0.1:4242", srv)
+}
+
 func (srv *Server) Name() string {
 	return "docker"
 }
@@ -176,6 +184,7 @@ func (srv *Server) CmdWrite(stdin io.ReadCloser, stdout io.Writer, args ...strin
 	return errors.New("No such container: " + name)
 }
 
+
 func (srv *Server) CmdLs(stdin io.ReadCloser, stdout io.Writer, args ...string) error {
 	cmd := rcli.Subcmd(stdout, "ls", "[OPTIONS] CONTAINER PATH", "List the contents of a container's directory")
 	if err := cmd.Parse(args); err != nil {
@@ -267,7 +276,7 @@ func (srv *Server) CmdRm(stdin io.ReadCloser, stdout io.Writer, args ...string)
 			return errors.New("No such container: " + name)
 		}
 		if err := srv.containers.Destroy(container); err != nil {
-			fmt.Fprintln(stdout, "Error destroying container "+name+": "+err.Error())
+			fmt.Fprintln(stdout, "Error destroying container " + name + ": " + err.Error())
 		}
 	}
 	return nil
@@ -285,7 +294,7 @@ func (srv *Server) CmdKill(stdin io.ReadCloser, stdout io.Writer, args ...string
 			return errors.New("No such container: " + name)
 		}
 		if err := container.Kill(); err != nil {
-			fmt.Fprintln(stdout, "Error killing container "+name+": "+err.Error())
+			fmt.Fprintln(stdout, "Error killing container " + name + ": " + err.Error())
 		}
 	}
 	return nil
@@ -372,7 +381,7 @@ func (srv *Server) CmdImages(stdin io.ReadCloser, stdout io.Writer, args ...stri
 		nameFilter = cmd.Arg(0)
 	}
 	w := tabwriter.NewWriter(stdout, 20, 1, 3, ' ', 0)
-	if !*quiet {
+	if (!*quiet) {
 		fmt.Fprintf(w, "NAME\tID\tCREATED\tPARENT\n")
 	}
 	for _, name := range srv.images.Names() {
@@ -389,10 +398,10 @@ func (srv *Server) CmdImages(stdin io.ReadCloser, stdout io.Writer, args ...stri
 					id += "..."
 				}
 				for idx, field := range []string{
-					/* NAME */ name,
-					/* ID */ id,
-					/* CREATED */ future.HumanDuration(time.Now().Sub(img.Created)) + " ago",
-					/* PARENT */ img.Parent,
+					/* NAME */	name,
+					/* ID */	id,
+					/* CREATED */	future.HumanDuration(time.Now().Sub(img.Created)) + " ago",
+					/* PARENT */	img.Parent,
 				} {
 					if idx == 0 {
 						w.Write([]byte(field))
@@ -406,7 +415,7 @@ func (srv *Server) CmdImages(stdin io.ReadCloser, stdout io.Writer, args ...stri
 			}
 		}
 	}
-	if !*quiet {
+	if (!*quiet) {
 		w.Flush()
 	}
 	return nil
@@ -423,7 +432,7 @@ func (srv *Server) CmdPs(stdin io.ReadCloser, stdout io.Writer, args ...string)
 		return nil
 	}
 	w := tabwriter.NewWriter(stdout, 12, 1, 3, ' ', 0)
-	if !*quiet {
+	if (!*quiet) {
 		fmt.Fprintf(w, "ID\tIMAGE\tCOMMAND\tCREATED\tSTATUS\tCOMMENT\n")
 	}
 	for _, container := range srv.containers.List() {
@@ -436,13 +445,13 @@ func (srv *Server) CmdPs(stdin io.ReadCloser, stdout io.Writer, args ...string)
 			if !*fl_full {
 				command = docker.Trunc(command, 20)
 			}
-			for idx, field := range []string{
-				/* ID */ container.Id,
-				/* IMAGE */ container.GetUserData("image"),
-				/* COMMAND */ command,
-				/* CREATED */ future.HumanDuration(time.Now().Sub(container.Created)) + " ago",
-				/* STATUS */ container.State.String(),
-				/* COMMENT */ comment,
+			for idx, field := range[]string {
+				/* ID */	container.Id,
+				/* IMAGE */	container.GetUserData("image"),
+				/* COMMAND */	command,
+				/* CREATED */	future.HumanDuration(time.Now().Sub(container.Created)) + " ago",
+				/* STATUS */	container.State.String(),
+				/* COMMENT */	comment,
 			} {
 				if idx == 0 {
 					w.Write([]byte(field))
@@ -455,7 +464,7 @@ func (srv *Server) CmdPs(stdin io.ReadCloser, stdout io.Writer, args ...string)
 			stdout.Write([]byte(container.Id + "\n"))
 		}
 	}
-	if !*quiet {
+	if (!*quiet) {
 		w.Flush()
 	}
 	return nil
@@ -474,6 +483,7 @@ func (srv *Server) CmdLayers(stdin io.ReadCloser, stdout io.Writer, args ...stri
 	return nil
 }
 
+
 func (srv *Server) CmdCp(stdin io.ReadCloser, stdout io.Writer, args ...string) error {
 	cmd := rcli.Subcmd(stdout,
 		"cp", "[OPTIONS] IMAGE NAME",
@@ -519,6 +529,7 @@ func (srv *Server) CmdCommit(stdin io.ReadCloser, stdout io.Writer, args ...stri
 	return errors.New("No such container: " + containerName)
 }
 
+
 func (srv *Server) CmdTar(stdin io.ReadCloser, stdout io.Writer, args ...string) error {
 	cmd := rcli.Subcmd(stdout,
 		"tar", "CONTAINER",
@@ -589,6 +600,7 @@ func (srv *Server) CmdReset(stdin io.ReadCloser, stdout io.Writer, args ...strin
 	return nil
 }
 
+
 func (srv *Server) CmdLogs(stdin io.ReadCloser, stdout io.Writer, args ...string) error {
 	cmd := rcli.Subcmd(stdout, "logs", "[OPTIONS] CONTAINER", "Fetch the logs of a container")
 	if err := cmd.Parse(args); err != nil {
@@ -611,10 +623,11 @@ func (srv *Server) CmdLogs(stdin io.ReadCloser, stdout io.Writer, args ...string
 	return errors.New("No such container: " + cmd.Arg(0))
 }
 
-func (srv *Server) CreateContainer(img *image.Image, user string, tty bool, openStdin bool, comment string, cmd string, args ...string) (*docker.Container, error) {
+
+func (srv *Server) CreateContainer(img *image.Image, tty bool, openStdin bool, comment string, cmd string, args ...string) (*docker.Container, error) {
 	id := future.RandomId()[:8]
 	container, err := srv.containers.Create(id, cmd, args, img.Layers,
-		&docker.Config{Hostname: id, User: user, Tty: tty, OpenStdin: openStdin})
+		&docker.Config{Hostname: id, Tty: tty, OpenStdin: openStdin})
 	if err != nil {
 		return nil, err
 	}
@@ -653,7 +666,7 @@ func (srv *Server) CmdAttach(stdin io.ReadCloser, stdout io.Writer, args ...stri
 			return err
 		}
 		wg.Add(1)
-		go func() { io.Copy(c_stdin, stdin); wg.Add(-1) }()
+		go func() { io.Copy(c_stdin, stdin); wg.Add(-1); }()
 	}
 	if *fl_o {
 		c_stdout, err := container.StdoutPipe()
@@ -661,7 +674,7 @@ func (srv *Server) CmdAttach(stdin io.ReadCloser, stdout io.Writer, args ...stri
 			return err
 		}
 		wg.Add(1)
-		go func() { io.Copy(stdout, c_stdout); wg.Add(-1) }()
+		go func() { io.Copy(stdout, c_stdout); wg.Add(-1); }()
 	}
 	if *fl_e {
 		c_stderr, err := container.StderrPipe()
@@ -669,7 +682,7 @@ func (srv *Server) CmdAttach(stdin io.ReadCloser, stdout io.Writer, args ...stri
 			return err
 		}
 		wg.Add(1)
-		go func() { io.Copy(stdout, c_stderr); wg.Add(-1) }()
+		go func() { io.Copy(stdout, c_stderr); wg.Add(-1); }()
 	}
 	wg.Wait()
 	return nil
@@ -680,13 +693,12 @@ func (srv *Server) CmdRun(stdin io.ReadCloser, stdout io.Writer, args ...string)
 	fl_attach := cmd.Bool("a", false, "Attach stdin and stdout")
 	fl_stdin := cmd.Bool("i", false, "Keep stdin open even if not attached")
 	fl_tty := cmd.Bool("t", false, "Allocate a pseudo-tty")
-	fl_user := cmd.String("u", "0", "Username or UID")
 	fl_comment := cmd.String("c", "", "Comment")
 	if err := cmd.Parse(args); err != nil {
 		return nil
 	}
 	name := cmd.Arg(0)
-	var cmdline []string
+	var cmdline[]string
 	if len(cmd.Args()) >= 2 {
 		cmdline = cmd.Args()[1:]
 	}
@@ -707,7 +719,7 @@ func (srv *Server) CmdRun(stdin io.ReadCloser, stdout io.Writer, args ...string)
 		return errors.New("No such image: " + name)
 	}
 	// Create new container
-	container, err := srv.CreateContainer(img, *fl_user, *fl_tty, *fl_stdin, *fl_comment, cmdline[0], cmdline[1:]...)
+	container, err := srv.CreateContainer(img, *fl_tty, *fl_stdin, *fl_comment, cmdline[0], cmdline[1:]...)
 	if err != nil {
 		return errors.New("Error creating container: " + err.Error())
 	}
@@ -719,7 +731,7 @@ func (srv *Server) CmdRun(stdin io.ReadCloser, stdout io.Writer, args ...string)
 		if *fl_attach {
 			future.Go(func() error {
 				log.Printf("CmdRun(): start receiving stdin\n")
-				_, err := io.Copy(cmd_stdin, stdin)
+				_, err := io.Copy(cmd_stdin, stdin);
 				log.Printf("CmdRun(): done receiving stdin\n")
 				cmd_stdin.Close()
 				return err
@@ -740,11 +752,11 @@ func (srv *Server) CmdRun(stdin io.ReadCloser, stdout io.Writer, args ...string)
 			return err
 		}
 		sending_stdout := future.Go(func() error {
-			_, err := io.Copy(stdout, cmd_stdout)
+			_, err := io.Copy(stdout, cmd_stdout);
 			return err
 		})
 		sending_stderr := future.Go(func() error {
-			_, err := io.Copy(stdout, cmd_stderr)
+			_, err := io.Copy(stdout, cmd_stderr);
 			return err
 		})
 		err_sending_stdout := <-sending_stdout
@@ -765,33 +777,8 @@ func (srv *Server) CmdRun(stdin io.ReadCloser, stdout io.Writer, args ...string)
 	return nil
 }
 
-func main() {
-	if docker.SelfPath() == "/sbin/init" {
-		// Running in init mode
-		docker.SysInit()
-		return
-	}
-	future.Seed()
-	flag.Parse()
-	d, err := New()
-	if err != nil {
-		log.Fatal(err)
-	}
-	go func() {
-		if err := rcli.ListenAndServeHTTP("127.0.0.1:8080", d); err != nil {
-			log.Fatal(err)
-		}
-	}()
-	// FIXME: we want to use unix sockets here, but net.UnixConn doesn't expose
-	// CloseWrite(), which we need to cleanly signal that stdin is closed without
-	// closing the connection.
-	// See http://code.google.com/p/go/issues/detail?id=3345
-	if err := rcli.ListenAndServe("tcp", "127.0.0.1:4242", d); err != nil {
-		log.Fatal(err)
-	}
-}
-
 func New() (*Server, error) {
+	future.Seed()
 	images, err := image.New("/var/lib/docker/images")
 	if err != nil {
 		return nil, err
@@ -801,7 +788,7 @@ func New() (*Server, error) {
 		return nil, err
 	}
 	srv := &Server{
-		images:     images,
+		images: images,
 		containers: containers,
 	}
 	return srv, nil
@@ -846,7 +833,9 @@ func (srv *Server) CmdWeb(stdin io.ReadCloser, stdout io.Writer, args ...string)
 	return nil
 }
 
+
 type Server struct {
-	containers *docker.Docker
-	images     *image.Store
+	containers	*docker.Docker
+	images		*image.Store
 }
+