@@ -33,15 +33,13 @@ run	apt-get update

 run	apt-get install -y -q curl

 run	apt-get install -y -q git

 run	apt-get install -y -q mercurial

-run	apt-get install -y -q build-essential

+run apt-get install -y -q build-essential libsqlite3-dev

-# Install Go from source (for eventual cross-compiling)

-env	CGO_ENABLED 0

-run	curl -s https://go.googlecode.com/files/go1.1.2.src.tar.gz | tar -v -C / -xz && mv /go /goroot

-run	cd /goroot/src && ./make.bash

-env GOROOT	/goroot

-env	PATH	$PATH:/goroot/bin

+# Install Go

+run	curl -s https://go.googlecode.com/files/go1.2rc1.src.tar.gz | tar -v -C /usr/local -xz

+env	PATH	/usr/local/go/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin

 env	GOPATH	/go:/go/src/github.com/dotcloud/docker/vendor

+run cd /usr/local/go/src && ./make.bash && go install -ldflags '-w -linkmode external -extldflags "-static -Wl,--unresolved-symbols=ignore-in-shared-libs"' -tags netgo -a std

 # Ubuntu stuff

 run	apt-get install -y -q ruby1.9.3 rubygems libffi-dev

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

 	"encoding/json"

 	"fmt"

 	"github.com/dotcloud/docker/auth"

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

 	"github.com/dotcloud/docker/utils"

 	"github.com/gorilla/mux"

 	"io"

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

 	"mime"

 	"net"

 	"net/http"

+	"net/url"

 	"os"

 	"os/exec"

 	"regexp"

@@ -154,7 +156,7 @@ func postContainersKill(srv *Server, version float64, w http.ResponseWriter, r *

 			}

 		}

 	}

-

+	name = decodeName(name)

 	if err := srv.ContainerKill(name, signal); err != nil {

 		return err

 	}

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

 		return fmt.Errorf("Missing parameter")

 	}

 	name := vars["name"]

+	name = decodeName(name)

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

 		utils.Errorf("%s", err)

@@ -534,16 +537,19 @@ func postContainersCreate(srv *Server, version float64, w http.ResponseWriter, r

 		return err

 	}

-	if !config.NetworkDisabled && len(config.Dns) == 0 && len(srv.runtime.Dns) == 0 && utils.CheckLocalDns(resolvConf) {

+	if !config.NetworkDisabled && len(config.Dns) == 0 && len(srv.runtime.config.Dns) == 0 && utils.CheckLocalDns(resolvConf) {

 		out.Warnings = append(out.Warnings, fmt.Sprintf("Docker detected local DNS server on resolv.conf. Using default external servers: %v", defaultDns))

 		config.Dns = defaultDns

 	}

-	id, err := srv.ContainerCreate(config)

+	id, warnings, err := srv.ContainerCreate(config)

 	if err != nil {

 		return err

 	}

 	out.ID = id

+	for _, warning := range warnings {

+		out.Warnings = append(out.Warnings, warning)

+	}

 	if config.Memory > 0 && !srv.runtime.capabilities.MemoryLimit {

 		log.Println("WARNING: Your kernel does not support memory limit capabilities. Limitation discarded.")

@@ -574,6 +580,7 @@ func postContainersRestart(srv *Server, version float64, w http.ResponseWriter,

 		return fmt.Errorf("Missing parameter")

 	}

 	name := vars["name"]

+	name = decodeName(name)

 	if err := srv.ContainerRestart(name, t); err != nil {

 		return err

 	}

@@ -589,12 +596,18 @@ func deleteContainers(srv *Server, version float64, w http.ResponseWriter, r *ht

 		return fmt.Errorf("Missing parameter")

 	}

 	name := vars["name"]

+	name = decodeName(name)

+

 	removeVolume, err := getBoolParam(r.Form.Get("v"))

 	if err != nil {

 		return err

 	}

+	removeLink, err := getBoolParam(r.Form.Get("link"))

+	if err != nil {

+		return err

+	}

-	if err := srv.ContainerDestroy(name, removeVolume); err != nil {

+	if err := srv.ContainerDestroy(name, removeVolume, removeLink); err != nil {

 		return err

 	}

 	w.WriteHeader(http.StatusNoContent)

@@ -640,7 +653,12 @@ func postContainersStart(srv *Server, version float64, w http.ResponseWriter, r

 	if vars == nil {

 		return fmt.Errorf("Missing parameter")

 	}

+	var err error

 	name := vars["name"]

+	name = decodeName(name)

+	if err != nil {

+		return err

+	}

 	if err := srv.ContainerStart(name, hostConfig); err != nil {

 		return err

 	}

@@ -661,6 +679,7 @@ func postContainersStop(srv *Server, version float64, w http.ResponseWriter, r *

 		return fmt.Errorf("Missing parameter")

 	}

 	name := vars["name"]

+	name = decodeName(name)

 	if err := srv.ContainerStop(name, t); err != nil {

 		return err

@@ -674,6 +693,8 @@ func postContainersWait(srv *Server, version float64, w http.ResponseWriter, r *

 		return fmt.Errorf("Missing parameter")

 	}

 	name := vars["name"]

+	name = decodeName(name)

+

 	status, err := srv.ContainerWait(name)

 	if err != nil {

 		return err

@@ -733,6 +754,7 @@ func postContainersAttach(srv *Server, version float64, w http.ResponseWriter, r

 		return fmt.Errorf("Missing parameter")

 	}

 	name := vars["name"]

+	name = decodeName(name)

 	c, err := srv.ContainerInspect(name)

 	if err != nil {

@@ -805,6 +827,7 @@ func wsContainersAttach(srv *Server, version float64, w http.ResponseWriter, r *

 		return fmt.Errorf("Missing parameter")

 	}

 	name := vars["name"]

+	name = decodeName(name)

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

 		return err

@@ -827,6 +850,7 @@ func getContainersByName(srv *Server, version float64, w http.ResponseWriter, r

 		return fmt.Errorf("Missing parameter")

 	}

 	name := vars["name"]

+	name = decodeName(name)

 	container, err := srv.ContainerInspect(name)

 	if err != nil {

@@ -994,7 +1018,7 @@ func makeHttpHandler(srv *Server, logging bool, localMethod string, localRoute s

 		if err != nil {

 			version = APIVERSION

 		}

-		if srv.enableCors {

+		if srv.runtime.config.EnableCors {

 			writeCorsHeaders(w, r)

 		}

@@ -1010,6 +1034,75 @@ func makeHttpHandler(srv *Server, logging bool, localMethod string, localRoute s

 	}

 }

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

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

+		return err

+	}

+

+	runtime := srv.runtime

+	all, err := getBoolParam(r.Form.Get("all"))

+	if err != nil {

+		return err

+	}

+

+	out := []APILink{}

+	err = runtime.containerGraph.Walk("/", func(p string, e *gograph.Entity) error {

+		if container := runtime.Get(e.ID()); container != nil {

+			if !all && strings.Contains(p, container.ID) {

+				return nil

+			}

+			out = append(out, APILink{

+				Path:        p,

+				ContainerID: container.ID,

+				Image:       runtime.repositories.ImageName(container.Image),

+			})

+		}

+		return nil

+	}, -1)

+

+	if err != nil {

+		return err

+	}

+	return writeJSON(w, http.StatusOK, out)

+}

+

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

+	if vars == nil {

+		return fmt.Errorf("Missing parameter")

+	}

+	values := make(map[string]string)

+	if matchesContentType(r.Header.Get("Content-Type"), "application/json") && r.Body != nil {

+		defer r.Body.Close()

+

+		dec := json.NewDecoder(r.Body)

+		if err := dec.Decode(&values); err != nil {

+			return err

+		}

+	} else {

+		return fmt.Errorf("Invalid json body")

+	}

+	currentName := values["currentName"]

+	newName := values["newName"]

+

+	if currentName == "" {

+		return fmt.Errorf("currentName cannot be empty")

+	}

+	if newName == "" {

+		return fmt.Errorf("newName cannot be empty")

+	}

+

+	if err := srv.runtime.RenameLink(currentName, newName); err != nil {

+		return err

+	}

+

+	return nil

+}

+

+func decodeName(name string) string {

+	s, _ := url.QueryUnescape(name)

+	return s

+}

+

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

 	r := mux.NewRouter()

@@ -1030,6 +1123,7 @@ func createRouter(srv *Server, logging bool) (*mux.Router, error) {

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

 			"/containers/{name:.*}/top":       getContainersTop,

 			"/containers/{name:.*}/attach/ws": wsContainersAttach,

+			"/containers/links":               getContainersLinks,

 		},

 		"POST": {

 			"/auth":                         postAuth,

@@ -1048,6 +1142,7 @@ func createRouter(srv *Server, logging bool) (*mux.Router, error) {

 			"/containers/{name:.*}/resize":  postContainersResize,

 			"/containers/{name:.*}/attach":  postContainersAttach,

 			"/containers/{name:.*}/copy":    postContainersCopy,

+			"/containers/link":              postContainerLink,

 		},

 		"DELETE": {

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

@@ -1,7 +1,5 @@

 package docker

-import "encoding/json"

-

 type APIHistory struct {

 	ID        string   `json:"Id"`

 	Tags      []string `json:",omitempty"`

@@ -52,6 +50,7 @@ type APIContainers struct {

 	Ports      []APIPort

 	SizeRw     int64

 	SizeRootFs int64

+	Names      []string

 }

 func (self *APIContainers) ToLegacy() APIContainersOld {

@@ -96,14 +95,7 @@ type APIPort struct {

 	PrivatePort int64

 	PublicPort  int64

 	Type        string

-}

-

-func (port *APIPort) MarshalJSON() ([]byte, error) {

-	return json.Marshal(map[string]interface{}{

-		"PrivatePort": port.PrivatePort,

-		"PublicPort":  port.PublicPort,

-		"Type":        port.Type,

-	})

+	IP          string

 }

 type APIVersion struct {

@@ -129,3 +121,9 @@ type APICopy struct {

 	Resource string

 	HostPath string

 }

+

+type APILink struct {

+	Path        string

+	ContainerID string

+	Image       string

+}

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

 	beginLen := runtime.containers.Len()

-	container, err := runtime.Create(&Config{

+	container, _, err := runtime.Create(&Config{

 		Image: GetTestImage(runtime).ID,

 		Cmd:   []string{"echo", "test"},

 	})

@@ -386,7 +386,7 @@ func TestGetContainersExport(t *testing.T) {

 	srv := &Server{runtime: runtime}

 	// Create a container and remove a file

-	container, err := runtime.Create(

+	container, _, err := runtime.Create(

 		&Config{

 			Image: GetTestImage(runtime).ID,

 			Cmd:   []string{"touch", "/test"},

@@ -436,7 +436,7 @@ func TestGetContainersChanges(t *testing.T) {

 	srv := &Server{runtime: runtime}

 	// Create a container and remove a file

-	container, err := runtime.Create(

+	container, _, err := runtime.Create(

 		&Config{

 			Image: GetTestImage(runtime).ID,

 			Cmd:   []string{"/bin/rm", "/etc/passwd"},

@@ -479,7 +479,7 @@ func TestGetContainersTop(t *testing.T) {

 	srv := &Server{runtime: runtime}

-	container, err := runtime.Create(

+	container, _, err := runtime.Create(

 		&Config{

 			Image:     GetTestImage(runtime).ID,

 			Cmd:       []string{"/bin/sh", "-c", "cat"},

@@ -561,7 +561,7 @@ func TestGetContainersByName(t *testing.T) {

 	srv := &Server{runtime: runtime}

 	// Create a container and remove a file

-	container, err := runtime.Create(

+	container, _, err := runtime.Create(

 		&Config{

 			Image: GetTestImage(runtime).ID,

 			Cmd:   []string{"echo", "test"},

@@ -592,7 +592,7 @@ func TestPostCommit(t *testing.T) {

 	srv := &Server{runtime: runtime}

 	// Create a container and remove a file

-	container, err := runtime.Create(

+	container, _, err := runtime.Create(

 		&Config{

 			Image: GetTestImage(runtime).ID,

 			Cmd:   []string{"touch", "/test"},

@@ -686,7 +686,7 @@ func TestPostContainersKill(t *testing.T) {

 	srv := &Server{runtime: runtime}

-	container, err := runtime.Create(

+	container, _, err := runtime.Create(

 		&Config{

 			Image:     GetTestImage(runtime).ID,

 			Cmd:       []string{"/bin/cat"},

@@ -728,7 +728,7 @@ func TestPostContainersRestart(t *testing.T) {

 	srv := &Server{runtime: runtime}

-	container, err := runtime.Create(

+	container, _, err := runtime.Create(

 		&Config{

 			Image:     GetTestImage(runtime).ID,

 			Cmd:       []string{"/bin/top"},

@@ -782,7 +782,7 @@ func TestPostContainersStart(t *testing.T) {

 	srv := &Server{runtime: runtime}

-	container, err := runtime.Create(

+	container, _, err := runtime.Create(

 		&Config{

 			Image:     GetTestImage(runtime).ID,

 			Cmd:       []string{"/bin/cat"},

@@ -834,7 +834,7 @@ func TestPostContainersStop(t *testing.T) {

 	srv := &Server{runtime: runtime}

-	container, err := runtime.Create(

+	container, _, err := runtime.Create(

 		&Config{

 			Image:     GetTestImage(runtime).ID,

 			Cmd:       []string{"/bin/top"},

@@ -881,7 +881,7 @@ func TestPostContainersWait(t *testing.T) {

 	srv := &Server{runtime: runtime}

-	container, err := runtime.Create(

+	container, _, err := runtime.Create(

 		&Config{

 			Image:     GetTestImage(runtime).ID,

 			Cmd:       []string{"/bin/sleep", "1"},

@@ -923,7 +923,7 @@ func TestPostContainersAttach(t *testing.T) {

 	srv := &Server{runtime: runtime}

-	container, err := runtime.Create(

+	container, _, err := runtime.Create(

 		&Config{

 			Image:     GetTestImage(runtime).ID,

 			Cmd:       []string{"/bin/cat"},

@@ -1012,7 +1012,7 @@ func TestPostContainersAttachStderr(t *testing.T) {

 	srv := &Server{runtime: runtime}

-	container, err := runtime.Create(

+	container, _, err := runtime.Create(

 		&Config{

 			Image:     GetTestImage(runtime).ID,

 			Cmd:       []string{"/bin/sh", "-c", "/bin/cat >&2"},

@@ -1104,7 +1104,7 @@ func TestDeleteContainers(t *testing.T) {

 	srv := &Server{runtime: runtime}

-	container, err := runtime.Create(&Config{

+	container, _, err := runtime.Create(&Config{

 		Image: GetTestImage(runtime).ID,

 		Cmd:   []string{"touch", "/test"},

 	})

@@ -1142,7 +1142,8 @@ func TestOptionsRoute(t *testing.T) {

 	runtime := mkRuntime(t)

 	defer nuke(runtime)

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

+	runtime.config.EnableCors = true

+	srv := &Server{runtime: runtime}

 	r := httptest.NewRecorder()

 	router, err := createRouter(srv, false)

@@ -1165,7 +1166,8 @@ func TestGetEnabledCors(t *testing.T) {

 	runtime := mkRuntime(t)

 	defer nuke(runtime)

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

+	runtime.config.EnableCors = true

+	srv := &Server{runtime: runtime}

 	r := httptest.NewRecorder()

@@ -1292,7 +1294,7 @@ func TestPostContainersCopy(t *testing.T) {

 	srv := &Server{runtime: runtime}

 	// Create a container and remove a file

-	container, err := runtime.Create(

+	container, _, err := runtime.Create(

 		&Config{

 			Image: GetTestImage(runtime).ID,

 			Cmd:   []string{"touch", "/test.txt"},

@@ -187,6 +187,9 @@ func (b *buildFile) CmdCmd(args string) error {

 }

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

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

+		return fmt.Errorf("EXPOSE cannot be used to bind to a host ip or port")

+	}

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

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

 	return b.commit("", b.config.Cmd, fmt.Sprintf("EXPOSE %v", ports))

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

 	b.config.Image = b.image

 	// Create the container and start it

-	container, err := b.runtime.Create(b.config)

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

 	if err != nil {

 		return err

 	}

@@ -367,7 +370,7 @@ func (b *buildFile) run() (string, error) {

 	b.config.Image = b.image

 	// Create the container and start it

-	c, err := b.runtime.Create(b.config)

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

 	if err != nil {

 		return "", err

 	}

@@ -430,7 +433,7 @@ func (b *buildFile) commit(id string, autoCmd []string, comment string) error {

 			}

 		}

-		container, err := b.runtime.Create(b.config)

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

 		if err != nil {

 			return err

 		}

@@ -92,6 +92,7 @@ func (cli *DockerCli) CmdHelp(args ...string) error {

 		{"kill", "Kill a running container"},

 		{"login", "Register or Login to the docker registry server"},

 		{"logs", "Fetch the logs of a container"},

+		{"ls", "List links for containers"},

 		{"port", "Lookup the public-facing port which is NAT-ed to PRIVATE_PORT"},

 		{"ps", "List containers"},

 		{"pull", "Pull an image or a repository from the docker registry server"},

@@ -504,7 +505,8 @@ func (cli *DockerCli) CmdStop(args ...string) error {

 	v.Set("t", strconv.Itoa(*nSeconds))

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

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

+		encName := cleanName(name)

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

 		if err != nil {

 			fmt.Fprintf(cli.err, "%s\n", err)

 		} else {

@@ -529,7 +531,8 @@ func (cli *DockerCli) CmdRestart(args ...string) error {

 	v.Set("t", strconv.Itoa(*nSeconds))

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

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

+		encName := cleanName(name)

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

 		if err != nil {

 			fmt.Fprintf(cli.err, "%s\n", err)

 		} else {

@@ -605,7 +608,8 @@ func (cli *DockerCli) CmdStart(args ...string) error {

 	var encounteredError error

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

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

+		encName := cleanName(name)

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

 		if err != nil {

 			if !*attach || !*openStdin {

 				fmt.Fprintf(cli.err, "%s\n", err)

@@ -811,6 +815,8 @@ func (cli *DockerCli) CmdHistory(args ...string) error {

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

 	cmd := Subcmd("rm", "[OPTIONS] CONTAINER [CONTAINER...]", "Remove one or more containers")

 	v := cmd.Bool("v", false, "Remove the volumes associated to the container")

+	link := cmd.Bool("link", false, "Remove the specified link and not the underlying container")

+

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

 		return nil

 	}

@@ -822,8 +828,12 @@ func (cli *DockerCli) CmdRm(args ...string) error {

 	if *v {

 		val.Set("v", "1")

 	}

+	if *link {

+		val.Set("link", "1")

+	}

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

-		_, _, err := cli.call("DELETE", "/containers/"+name+"?"+val.Encode(), nil)

+		encName := cleanName(name)

+		_, _, err := cli.call("DELETE", "/containers/"+encName+"?"+val.Encode(), nil)

 		if err != nil {

 			fmt.Fprintf(cli.err, "%s\n", err)

 		} else {

@@ -845,7 +855,8 @@ func (cli *DockerCli) CmdKill(args ...string) error {

 	}

 	for _, name := range args {

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

+		encName := cleanName(name)

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

 		if err != nil {

 			fmt.Fprintf(cli.err, "%s\n", err)

 		} else {

@@ -1088,10 +1099,10 @@ func (cli *DockerCli) CmdImages(args ...string) error {

 func displayablePorts(ports []APIPort) string {

 	result := []string{}

 	for _, port := range ports {

-		if port.Type == "tcp" {

-			result = append(result, fmt.Sprintf("%d->%d", port.PublicPort, port.PrivatePort))

+		if port.IP == "" {

+			result = append(result, fmt.Sprintf("%d/%s", port.PublicPort, port.Type))

 		} else {

-			result = append(result, fmt.Sprintf("%d->%d/%s", port.PublicPort, port.PrivatePort, port.Type))

+			result = append(result, fmt.Sprintf("%s:%d->%d/%s", port.IP, port.PublicPort, port.PrivatePort, port.Type))

 		}

 	}

 	sort.Strings(result)

@@ -1144,7 +1155,7 @@ func (cli *DockerCli) CmdPs(args ...string) error {

 	}

 	w := tabwriter.NewWriter(cli.out, 20, 1, 3, ' ', 0)

 	if !*quiet {

-		fmt.Fprint(w, "ID\tIMAGE\tCOMMAND\tCREATED\tSTATUS\tPORTS")

+		fmt.Fprint(w, "ID\tIMAGE\tCOMMAND\tCREATED\tSTATUS\tPORTS\tNAMES")

 		if *size {

 			fmt.Fprintln(w, "\tSIZE")

 		} else {

@@ -1153,11 +1164,16 @@ func (cli *DockerCli) CmdPs(args ...string) error {

 	}

 	for _, out := range outs {

+		for i := 0; i < len(out.Names); i++ {

+			out.Names[i] = utils.Trunc(out.Names[i], 10)

+		}

+

+		names := strings.Join(out.Names, ",")

 		if !*quiet {

 			if *noTrunc {

-				fmt.Fprintf(w, "%s\t%s\t%s\t%s ago\t%s\t%s\t", out.ID, out.Image, out.Command, utils.HumanDuration(time.Now().Sub(time.Unix(out.Created, 0))), out.Status, displayablePorts(out.Ports))

+				fmt.Fprintf(w, "%s\t%s\t%s\t%s\t%s ago\t%s\t%s\t", out.ID, out.Image, out.Command, utils.HumanDuration(time.Now().Sub(time.Unix(out.Created, 0))), out.Status, displayablePorts(out.Ports), names)

 			} else {

-				fmt.Fprintf(w, "%s\t%s\t%s\t%s ago\t%s\t%s\t", utils.TruncateID(out.ID), out.Image, utils.Trunc(out.Command, 20), utils.HumanDuration(time.Now().Sub(time.Unix(out.Created, 0))), out.Status, displayablePorts(out.Ports))

+				fmt.Fprintf(w, "%s\t%s\t%s\t%s\t%s ago\t%s\t%s\t", utils.TruncateID(out.ID), out.Image, utils.Trunc(out.Command, 20), utils.HumanDuration(time.Now().Sub(time.Unix(out.Created, 0))), out.Status, displayablePorts(out.Ports), names)

 			}

 			if *size {

 				if out.SizeRootFs > 0 {

@@ -1183,6 +1199,64 @@ func (cli *DockerCli) CmdPs(args ...string) error {

 	return nil

 }

+func (cli *DockerCli) CmdLs(args ...string) error {

+	cmd := Subcmd("ls", "", "List links for containers")

+	flAll := cmd.Bool("a", false, "Show all links")

+

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

+		return nil

+	}

+	v := url.Values{}

+	if *flAll {

+		v.Set("all", "1")

+	}

+

+	body, _, err := cli.call("GET", "/containers/links?"+v.Encode(), nil)

+	if err != nil {

+		return err

+	}

+	var links []APILink

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

+		return err

+	}

+

+	w := tabwriter.NewWriter(cli.out, 20, 1, 3, ' ', 0)

+	fmt.Fprintf(w, "NAME\tID\tIMAGE")

+	fmt.Fprintf(w, "\n")

+

+	sortLinks(links, func(i, j APILink) bool {

+		return len(i.Path) < len(j.Path)

+	})

+	for _, link := range links {

+		fmt.Fprintf(w, "%s\t%s\t%s", link.Path, utils.TruncateID(link.ContainerID), link.Image)

+		fmt.Fprintf(w, "\n")

+	}

+	w.Flush()

+

+	return nil

+}

+

+func (cli *DockerCli) CmdLink(args ...string) error {

+	cmd := Subcmd("link", "CURRENT_NAME NEW_NAME", "Link the container with a new name")

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

+		return nil

+	}

+	if cmd.NArg() != 2 {

+		cmd.Usage()

+		return nil

+	}

+	body := map[string]string{

+		"currentName": cmd.Arg(0),

+		"newName":     cmd.Arg(1),

+	}

+

+	_, _, err := cli.call("POST", "/containers/link", body)

+	if err != nil {

+		return err

+	}

+	return nil

+}

+

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

 	cmd := Subcmd("commit", "[OPTIONS] CONTAINER [REPOSITORY [TAG]]", "Create a new image from a container's changes")

 	flComment := cmd.String("m", "", "Commit message")

@@ -1300,8 +1374,9 @@ func (cli *DockerCli) CmdLogs(args ...string) error {

 		cmd.Usage()

 		return nil

 	}

+	name := cleanName(cmd.Arg(0))

-	if err := cli.hijack("POST", "/containers/"+cmd.Arg(0)+"/attach?logs=1&stdout=1&stderr=1", false, nil, cli.out, cli.err, nil); err != nil {

+	if err := cli.hijack("POST", "/containers/"+name+"/attach?logs=1&stdout=1&stderr=1", false, nil, cli.out, cli.err, nil); err != nil {

 		return err

 	}

 	return nil

@@ -1318,8 +1393,9 @@ func (cli *DockerCli) CmdAttach(args ...string) error {

 		cmd.Usage()

 		return nil

 	}

-

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

+	name := cmd.Arg(0)

+	name = cleanName(name)

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

 	if err != nil {

 		return err

 	}

@@ -2028,6 +2104,10 @@ func getExitCode(cli *DockerCli, containerId string) (bool, int, error) {

 	return c.State.Running, c.State.ExitCode, nil

 }

+func cleanName(name string) string {

+	return strings.Replace(name, "/", "%252F", -1)

+}

+

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

 	var (

 		isTerminal = false

new file mode 100644

@@ -0,0 +1,17 @@

+package docker

+

+import (

+	"net"

+)

+

+type DaemonConfig struct {

+	Pidfile        string

+	GraphPath      string

+	ProtoAddresses []string

+	AutoRestart    bool

+	EnableCors     bool

+	Dns            []string

+	EnableIptables bool

+	BridgeIface    string

+	DefaultIp      net.IP

+}

@@ -59,6 +59,8 @@ type Container struct {

 	// Store rw/ro in a separate structure to preserve reverse-compatibility on-disk.

 	// Easier than migrating older container configs :)

 	VolumesRW map[string]bool

+

+	activeLinks map[string]*Link

 }

 type Config struct {

@@ -71,7 +73,8 @@ type Config struct {

 	AttachStdin     bool

 	AttachStdout    bool

 	AttachStderr    bool

-	PortSpecs       []string

+	PortSpecs       []string // Deprecated - Can be in the format of 8080/tcp

+	ExposedPorts    map[Port]struct{}

 	Tty             bool // Attach standard streams to a tty, including stdin if it is not closed.

 	OpenStdin       bool // Open stdin

 	StdinOnce       bool // If true, close stdin after the 1 attached client disconnects.

@@ -91,6 +94,8 @@ type HostConfig struct {

 	Binds           []string

 	ContainerIDFile string

 	LxcConf         []KeyValuePair

+	PortBindings    map[Port][]PortBinding

+	Links           []string

 }

 type BindMap struct {

@@ -113,6 +118,34 @@ type KeyValuePair struct {

 	Value string

 }

+type PortBinding struct {

+	HostIp   string

+	HostPort string

+}

+

+// 80/tcp

+type Port string

+

+func (p Port) Proto() string {

+	return strings.Split(string(p), "/")[1]

+}

+

+func (p Port) Port() string {

+	return strings.Split(string(p), "/")[0]

+}

+

+func (p Port) Int() int {

+	i, err := parsePort(p.Port())

+	if err != nil {

+		panic(err)

+	}

+	return i

+}

+

+func NewPort(proto, port string) Port {

+	return Port(fmt.Sprintf("%s/%s", port, proto))

+}

+

 func ParseRun(args []string, capabilities *Capabilities) (*Config, *HostConfig, *flag.FlagSet, error) {

 	cmd := Subcmd("run", "[OPTIONS] IMAGE [COMMAND] [ARG...]", "Run a command in a new container")

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

@@ -142,8 +175,11 @@ func ParseRun(args []string, capabilities *Capabilities) (*Config, *HostConfig,

 	flCpuShares := cmd.Int64("c", 0, "CPU shares (relative weight)")

-	var flPorts ListOpts

-	cmd.Var(&flPorts, "p", "Expose a container's port to the host (use 'docker port' to see the actual mapping)")

+	var flPublish ListOpts

+	cmd.Var(&flPublish, "p", "Publish a container's port to the host (use 'docker port' to see the actual mapping)")

+

+	var flExpose ListOpts

+	cmd.Var(&flExpose, "expose", "Expose a port from the container without publishing it to your host")

 	var flEnv ListOpts

 	cmd.Var(&flEnv, "e", "Set environment variables")

@@ -162,6 +198,9 @@ func ParseRun(args []string, capabilities *Capabilities) (*Config, *HostConfig,

 	var flLxcOpts ListOpts

 	cmd.Var(&flLxcOpts, "lxc-conf", "Add custom lxc options -lxc-conf=\"lxc.cgroup.cpuset.cpus = 0,1\"")

+	var flLinks ListOpts

+	cmd.Var(&flLinks, "link", "Add link to another container (containerid:alias)")

+

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

 		return nil, nil, cmd, err

 	}

@@ -230,10 +269,28 @@ func ParseRun(args []string, capabilities *Capabilities) (*Config, *HostConfig,

 		hostname = parts[0]

 		domainname = parts[1]

 	}

+

+	ports, portBindings, err := parsePortSpecs(flPublish)

+	if err != nil {

+		return nil, nil, cmd, err

+	}

+

+	// Merge in exposed ports to the map of published ports

+	for _, e := range flExpose {

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

+			return nil, nil, cmd, fmt.Errorf("Invalid port format for -expose: %s", e)

+		}

+		p := NewPort(splitProtoPort(e))

+		if _, exists := ports[p]; !exists {

+			ports[p] = struct{}{}

+		}

+	}

+

 	config := &Config{

-		Hostname:        hostname,

+		Hostname:        *flHostname,

 		Domainname:      domainname,

-		PortSpecs:       flPorts,

+		PortSpecs:       nil, // Deprecated

+		ExposedPorts:    ports,

 		User:            *flUser,

 		Tty:             *flTty,

 		NetworkDisabled: !*flNetwork,

@@ -253,10 +310,13 @@ func ParseRun(args []string, capabilities *Capabilities) (*Config, *HostConfig,

 		Privileged:      *flPrivileged,

 		WorkingDir:      *flWorkingDir,

 	}

+

 	hostConfig := &HostConfig{

 		Binds:           binds,

 		ContainerIDFile: *flContainerIDFile,

 		LxcConf:         lxcConf,

+		PortBindings:    portBindings,

+		Links:           flLinks,

 	}

 	if capabilities != nil && *flMemory > 0 && !capabilities.SwapLimit {

@@ -271,36 +331,38 @@ func ParseRun(args []string, capabilities *Capabilities) (*Config, *HostConfig,

 	return config, hostConfig, cmd, nil

 }

-type PortMapping map[string]string

+type PortMapping map[string]string // Deprecated

 type NetworkSettings struct {

 	IPAddress   string

 	IPPrefixLen int

 	Gateway     string

 	Bridge      string

-	PortMapping map[string]PortMapping

+	PortMapping map[string]PortMapping // Deprecated

+	Ports       map[Port][]PortBinding

 }

-// returns a more easy to process description of the port mapping defined in the settings

 func (settings *NetworkSettings) PortMappingAPI() []APIPort {

 	var mapping []APIPort

-	for private, public := range settings.PortMapping["Tcp"] {

-		pubint, _ := strconv.ParseInt(public, 0, 0)

-		privint, _ := strconv.ParseInt(private, 0, 0)

-		mapping = append(mapping, APIPort{

-			PrivatePort: privint,