@@ -17,6 +17,7 @@ Antony Messerli <amesserl@rackspace.com>

 Barry Allard <barry.allard@gmail.com>

 Brandon Liu <bdon@bdon.org>

 Brian McCallister <brianm@skife.org>

+Brian Olsen <brian@maven-group.org>

 Bruno Bigras <bigras.bruno@gmail.com>

 Caleb Spare <cespare@gmail.com>

 Calen Pennington <cale@edx.org>

@@ -34,6 +35,7 @@ Dominik Honnef <dominik@honnef.co>

 Don Spaulding <donspauldingii@gmail.com>

 Dr Nic Williams <drnicwilliams@gmail.com>

 Elias Probst <mail@eliasprobst.eu>

+Emily Rose <emily@contactvibe.com>

 Eric Hanchrow <ehanchrow@ine.com>

 Eric Myhre <hash@exultant.us>

 Erno Hopearuoho <erno.hopearuoho@gmail.com>

@@ -73,6 +75,7 @@ Louis Opter <kalessin@kalessin.fr>

 Marco Hennings <marco.hennings@freiheit.com>

 Marcus Farkas <toothlessgear@finitebox.com>

 Mark McGranaghan <mmcgrana@gmail.com>

+Martin Redmond <mrtodo@gmail.com>

 Maxim Treskin <zerthurd@gmail.com>

 meejah <meejah@meejah.ca>

 Michael Crosby <crosby.michael@gmail.com>

@@ -103,6 +106,7 @@ Solomon Hykes <solomon@dotcloud.com>

 Sridhar Ratnakumar <sridharr@activestate.com>

 Stefan Praszalowicz <stefan@greplin.com>

 Thatcher Peskens <thatcher@dotcloud.com>

+Thijs Terlouw <thijsterlouw@gmail.com>

 Thomas Bikeev <thomas.bikeev@mac.com>

 Thomas Hansen <thomas.hansen@gmail.com>

 Tianon Gravi <admwiggin@gmail.com>

@@ -27,7 +27,7 @@ run	/bin/echo -e '[default]\naccess_key=$AWS_ACCESS_KEY\nsecret_key=$AWS_SECRET_

 run	PKG=github.com/kr/pty REV=27435c699;		 git clone http://$PKG /go/src/$PKG && cd /go/src/$PKG && git checkout -f $REV

 run	PKG=github.com/gorilla/context/ REV=708054d61e5; git clone http://$PKG /go/src/$PKG && cd /go/src/$PKG && git checkout -f $REV

 run	PKG=github.com/gorilla/mux/ REV=9b36453141c;	 git clone http://$PKG /go/src/$PKG && cd /go/src/$PKG && git checkout -f $REV

-run	PKG=github.com/dotcloud/tar/ REV=d06045a6d9;	 git clone http://$PKG /go/src/$PKG && cd /go/src/$PKG && git checkout -f $REV

+run	PKG=github.com/dotcloud/tar/ REV=e5ea6bb21a3294;	 git clone http://$PKG /go/src/$PKG && cd /go/src/$PKG && git checkout -f $REV

 run	PKG=code.google.com/p/go.net/ REV=84a4013f96e0;  hg  clone http://$PKG /go/src/$PKG && cd /go/src/$PKG && hg  checkout    $REV

 # Upload docker source

 add	.       /go/src/github.com/dotcloud/docker

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

 Docker: the Linux container engine

 ==================================

-Docker is an open-source engine which automates the deployment of

-applications as highly portable, self-sufficient containers.

+Docker is an open source project to pack, ship and run any application

+as a lightweight container

 Docker containers are both *hardware-agnostic* and

 *platform-agnostic*. This means that they can run anywhere, from your

@@ -18,7 +18,7 @@ Platform-as-a-Service.  It benefits directly from the experience

 accumulated over several years of large-scale operation and support of

 hundreds of thousands of applications and databases.

-![Docker L](docs/sources/concepts/images/dockerlogo-h.png "Docker")

+![Docker L](docs/sources/static_files/dockerlogo-h.png "Docker")

 ## Better than VMs

@@ -140,125 +140,25 @@ Note that Docker doesn't care *how* dependencies are built - as long

 as they can be built by running a Unix command in a container.

-Install instructions

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

+Getting started

+===============

-Quick install on Ubuntu 12.04 and 12.10

+Docker can be installed on your local machine as well as servers - both bare metal and virtualized.

+It is available as a binary on most modern Linux systems, or as a VM on Windows, Mac and other systems.

-```bash

-curl https://get.docker.io | sudo sh -x

-```

+We also offer an interactive tutorial for quickly learning the basics of using Docker.

-Binary installs

-Docker supports the following binary installation methods.  Note that

-some methods are community contributions and not yet officially

-supported.

+For up-to-date install instructions and online tutorials, see the [Getting Started page](http://www.docker.io/gettingstarted/).

-* [Ubuntu 12.04 and 12.10 (officially supported)](http://docs.docker.io/en/latest/installation/ubuntulinux/)

-* [Arch Linux](http://docs.docker.io/en/latest/installation/archlinux/)

-* [Mac OS X (with Vagrant)](http://docs.docker.io/en/latest/installation/vagrant/)

-* [Windows (with Vagrant)](http://docs.docker.io/en/latest/installation/windows/)

-* [Amazon EC2 (with Vagrant)](http://docs.docker.io/en/latest/installation/amazon/)

 Usage examples

 ==============

-First run the ``docker`` daemon

-

-All the examples assume your machine is running the ``docker``

-daemon. To run the ``docker`` daemon in the background, simply type:

-

-```bash

-# On a production system you want this running in an init script

-sudo docker -d &

-```

-

-Now you can run ``docker`` in client mode: all commands will be

-forwarded to the ``docker`` daemon, so the client can run from any

-account.

-

-```bash

-# Now you can run docker commands from any account.

-docker help

-```

-

-

-Throwaway shell in a base Ubuntu image

-

-```bash

-docker pull ubuntu:12.10

-

-# Run an interactive shell, allocate a tty, attach stdin and stdout

-# To detach the tty without exiting the shell, use the escape sequence Ctrl-p + Ctrl-q

-docker run -i -t ubuntu:12.10 /bin/bash

-```

-

-Starting a long-running worker process

-

-```bash

-# Start a very useful long-running process

-JOB=$(docker run -d ubuntu /bin/sh -c "while true; do echo Hello world; sleep 1; done")

-

-# Collect the output of the job so far

-docker logs $JOB

-

-# Kill the job

-docker kill $JOB

-```

-

-Running an irc bouncer

-

-```bash

-BOUNCER_ID=$(docker run -d -p 6667 -u irc shykes/znc zncrun $USER $PASSWORD)

-echo "Configure your irc client to connect to port $(docker port $BOUNCER_ID 6667) of this machine"

-```

-

-Running Redis

-

-```bash

-REDIS_ID=$(docker run -d -p 6379 shykes/redis redis-server)

-echo "Configure your redis client to connect to port $(docker port $REDIS_ID 6379) of this machine"

-```

+Docker can be used to run short-lived commands, long-running daemons (app servers, databases etc.),

+interactive shell sessions, etc.

-Share your own image!

-

-```bash

-CONTAINER=$(docker run -d ubuntu:12.10 apt-get install -y curl)

-docker commit -m "Installed curl" $CONTAINER $USER/betterbase

-docker push $USER/betterbase

-```

-

-A list of publicly available images is [available

-here](https://github.com/dotcloud/docker/wiki/Public-docker-images).

-

-Expose a service on a TCP port

-

-```bash

-# Expose port 4444 of this container, and tell netcat to listen on it

-JOB=$(docker run -d -p 4444 base /bin/nc -l -p 4444)

-

-# Which public port is NATed to my container?

-PORT=$(docker port $JOB 4444)

-

-# Connect to the public port via the host's public address

-# Please note that because of how routing works connecting to localhost or 127.0.0.1 $PORT will not work.

-# Replace *eth0* according to your local interface name.

-IP=$(ip -o -4 addr list eth0 | perl -n -e 'if (m{inet\s([\d\.]+)\/\d+\s}xms) { print $1 }')

-echo hello world | nc $IP $PORT

-

-# Verify that the network connection worked

-echo "Daemon received: $(docker logs $JOB)"

-```

+You can find a [list of real-world examples](http://docs.docker.io/en/latest/examples/) in the documentation.

 Under the hood

 --------------

@@ -288,142 +188,6 @@ They are probably not perfect, please let us know if anything feels

 wrong or incomplete.

-Note

-

-We also keep the documentation in this repository. The website

-documentation is generated using Sphinx using these sources.  Please

-find it under docs/sources/ and read more about it

-https://github.com/dotcloud/docker/tree/master/docs/README.md

-

-Please feel free to fix / update the documentation and send us pull

-requests. More tutorials are also welcome.

-

-

-Setting up a dev environment

-

-Instructions that have been verified to work on Ubuntu 12.10,

-

-```bash

-sudo apt-get -y install lxc curl xz-utils golang git mercurial

-

-export GOPATH=~/go/

-export PATH=$GOPATH/bin:$PATH

-

-mkdir -p $GOPATH/src/github.com/dotcloud

-cd $GOPATH/src/github.com/dotcloud

-git clone https://github.com/dotcloud/docker.git

-cd docker

-

-go get -v github.com/dotcloud/docker/...

-go install -v github.com/dotcloud/docker/...

-```

-

-Then run the docker daemon,

-

-```bash

-sudo $GOPATH/bin/docker -d

-```

-

-Run the `go install` command (above) to recompile docker.

-

-

-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 dependencies, regardless of the underlying machine and

-the contents of the container.

-

-The spec for Standard Containers is currently a 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 how

-Standard Containers are a fundamental unit of software delivery,

-shipping containers 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

-

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

-

-

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

-

-Because they offer the same standard operations regardless of content

-and infrastructure, Standard Containers, just like their physical

-counterparts, 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.

-

-

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

-onto 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.

-

-

 ### Legal

 Transfers of Docker shall be in accordance with applicable export

@@ -12,23 +12,20 @@ Vagrant::Config.run do |config|

   # Setup virtual machine box. This VM configuration code is always executed.

   config.vm.box = BOX_NAME

   config.vm.box_url = BOX_URI

-  config.vm.forward_port 4243, 4243

-  # Provision docker and new kernel if deployment was not done

+  # Provision docker and new kernel if deployment was not done.

+  # It is assumed Vagrant can successfully launch the provider instance.

   if Dir.glob("#{File.dirname(__FILE__)}/.vagrant/machines/default/*/id").empty?

     # Add lxc-docker package

-    pkg_cmd = "wget -q -O - http://get.docker.io/gpg | apt-key add -;" \

-      "echo deb https://get.docker.io/ubuntu docker main > /etc/apt/sources.list.d/docker.list;" \

+    pkg_cmd = "wget -q -O - https://get.docker.io/gpg | apt-key add -;" \

+      "echo deb http://get.docker.io/ubuntu docker main > /etc/apt/sources.list.d/docker.list;" \

       "apt-get update -qq; apt-get install -q -y --force-yes lxc-docker; "

-    # Add X.org Ubuntu backported 3.8 kernel

-    pkg_cmd << "apt-get update -qq; apt-get install -q -y python-software-properties; " \

-      "add-apt-repository -y ppa:ubuntu-x-swat/r-lts-backport; " \

-      "apt-get update -qq; apt-get install -q -y linux-image-3.8.0-19-generic; "

-    # Add guest additions if local vbox VM

-    is_vbox = true

-    ARGV.each do |arg| is_vbox &&= !arg.downcase.start_with?("--provider") end

-    if is_vbox

-      pkg_cmd << "apt-get install -q -y linux-headers-3.8.0-19-generic dkms; " \

+    # Add Ubuntu raring backported kernel

+    pkg_cmd << "apt-get update -qq; apt-get install -q -y linux-image-generic-lts-raring; "

+    # Add guest additions if local vbox VM. As virtualbox is the default provider,

+    # it is assumed it won't be explicitly stated.

+    if ENV["VAGRANT_DEFAULT_PROVIDER"].nil? && ARGV.none? { |arg| arg.downcase.start_with?("--provider") }

+      pkg_cmd << "apt-get install -q -y linux-headers-generic-lts-raring dkms; " \

         "echo 'Downloading VBox Guest Additions...'; " \

         "wget -q http://dlc.sun.com.edgesuite.net/virtualbox/4.2.12/VBoxGuestAdditions_4.2.12.iso; "

       # Prepare the VM to add guest additions after reboot

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

 import (

 	"code.google.com/p/go.net/websocket"

+	"encoding/base64"

 	"encoding/json"

 	"fmt"

 	"github.com/dotcloud/docker/auth"

@@ -20,7 +21,7 @@ import (

 	"strings"

 )

-const APIVERSION = 1.4

+const APIVERSION = 1.5

 const DEFAULTHTTPHOST = "127.0.0.1"

 const DEFAULTHTTPPORT = 4243

 const DEFAULTUNIXSOCKET = "/var/run/docker.sock"

@@ -304,7 +305,16 @@ func getContainersJSON(srv *Server, version float64, w http.ResponseWriter, r *h

 	outs := srv.Containers(all, size, n, since, before)

-	return writeJSON(w, http.StatusOK, outs)

+	if version < 1.5 {

+		outs2 := []APIContainersOld{}

+		for _, ctnr := range outs {

+			outs2 = append(outs2, ctnr.ToLegacy())

+		}

+

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

+	} else {

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

+	}

 }

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

@@ -361,6 +371,16 @@ func postImagesCreate(srv *Server, version float64, w http.ResponseWriter, r *ht

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

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

+	authEncoded := r.Header.Get("X-Registry-Auth")

+	authConfig := &auth.AuthConfig{}

+	if authEncoded != "" {

+		authJson := base64.NewDecoder(base64.URLEncoding, strings.NewReader(authEncoded))

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

+			// for a pull it is not an error if no auth was given

+			// to increase compatibility with the existing api it is defaulting to be empty

+			authConfig = &auth.AuthConfig{}

+		}

+	}

 	if version > 1.0 {

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

 	}

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

 				metaHeaders[k] = v

 			}

 		}

-		if err := srv.ImagePull(image, tag, w, sf, &auth.AuthConfig{}, metaHeaders, version > 1.3); err != nil {

+		if err := srv.ImagePull(image, tag, w, sf, authConfig, metaHeaders, version > 1.3); err != nil {

 			if sf.Used() {

 				w.Write(sf.FormatError(err))

 				return nil

@@ -432,19 +452,32 @@ func postImagesInsert(srv *Server, version float64, w http.ResponseWriter, r *ht

 }

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

-	authConfig := &auth.AuthConfig{}

 	metaHeaders := map[string][]string{}

 	for k, v := range r.Header {

 		if strings.HasPrefix(k, "X-Meta-") {

 			metaHeaders[k] = v

 		}

 	}

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

-		return err

-	}

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

 		return err

 	}

+	authConfig := &auth.AuthConfig{}

+

+	authEncoded := r.Header.Get("X-Registry-Auth")

+	if authEncoded != "" {

+		// the new format is to handle the authConfig as a header

+		authJson := base64.NewDecoder(base64.URLEncoding, strings.NewReader(authEncoded))

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

+			// to increase compatibility to existing api it is defaulting to be empty

+			authConfig = &auth.AuthConfig{}

+		}

+	} else {

+		// the old format is supported for compatibility if there was no authConfig header

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

+			return err

+		}

+

+	}

 	if vars == nil {

 		return fmt.Errorf("Missing parameter")

@@ -772,6 +805,11 @@ func getContainersByName(srv *Server, version float64, w http.ResponseWriter, r

 		return err

 	}

+	_, err = srv.ImageInspect(name)

+	if err == nil {

+		return fmt.Errorf("Conflict between containers and images")

+	}

+

 	return writeJSON(w, http.StatusOK, container)

 }

@@ -786,22 +824,9 @@ func getImagesByName(srv *Server, version float64, w http.ResponseWriter, r *htt

 		return err

 	}

-	return writeJSON(w, http.StatusOK, image)

-}

-

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

-	apiConfig := &APIImageConfig{}

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

-		return err

-	}

-

-	image, err := srv.ImageGetCached(apiConfig.ID, apiConfig.Config)

-	if err != nil {

-		return err

-	}

-	if image == nil {

-		w.WriteHeader(http.StatusNotFound)

-		return nil

+	_, err = srv.ContainerInspect(name)

+	if err == nil {

+		return fmt.Errorf("Conflict between containers and images")

 	}

 	return writeJSON(w, http.StatusOK, &APIID{ID: image.ID})

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

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

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

 			"/images/{name:.*}/tag":         postImagesTag,

-			"/images/getCache":              postImagesGetCache,

 			"/containers/create":            postContainersCreate,

 			"/containers/{name:.*}/kill":    postContainersKill,

 			"/containers/{name:.*}/restart": postContainersRestart,

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

 package docker

+import "encoding/json"

+

 type APIHistory struct {

 	ID        string   `json:"Id"`

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

@@ -47,6 +49,30 @@ type APIContainers struct {

 	Command    string

 	Created    int64

 	Status     string

+	Ports      []APIPort

+	SizeRw     int64

+	SizeRootFs int64

+}

+

+func (self *APIContainers) ToLegacy() APIContainersOld {

+	return APIContainersOld{

+		ID: self.ID,

+		Image: self.Image,

+		Command: self.Command,

+		Created: self.Created,

+		Status: self.Status,

+		Ports: displayablePorts(self.Ports),

+		SizeRw: self.SizeRw,

+		SizeRootFs: self.SizeRootFs,

+	}

+}

+

+type APIContainersOld struct {

+	ID         string `json:"Id"`

+	Image      string

+	Command    string

+	Created    int64

+	Status     string

 	Ports      string

 	SizeRw     int64

 	SizeRootFs int64

@@ -67,7 +93,17 @@ type APIRun struct {

 }

 type APIPort struct {

-	Port string

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

+	})

 }

 type APIVersion struct {

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

 	srv := &Server{runtime: runtime}

-	initialImages, err := srv.runtime.graph.All()

+	initialImages, err := srv.runtime.graph.Map()

 	if err != nil {

 		t.Fatal(err)

 	}

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

 	srv := &Server{runtime: runtime}

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

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

 		Image: GetTestImage(runtime).ID,

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

 	})

@@ -357,10 +357,8 @@ func TestGetContainersExport(t *testing.T) {

 	srv := &Server{runtime: runtime}

-	builder := NewBuilder(runtime)

-

 	// Create a container and remove a file

-	container, err := builder.Create(

+	container, err := runtime.Create(

 		&Config{

 			Image: GetTestImage(runtime).ID,

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

@@ -409,10 +407,8 @@ func TestGetContainersChanges(t *testing.T) {

 	srv := &Server{runtime: runtime}

-	builder := NewBuilder(runtime)

-

 	// Create a container and remove a file

-	container, err := builder.Create(

+	container, err := runtime.Create(

 		&Config{

 			Image: GetTestImage(runtime).ID,

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

@@ -449,6 +445,7 @@ func TestGetContainersChanges(t *testing.T) {

 }

 func TestGetContainersTop(t *testing.T) {

+	t.Skip("Fixme. Skipping test for now. Reported error when testing using dind: 'api_test.go:527: Expected 2 processes, found 0.'")

 	runtime, err := newTestRuntime()

 	if err != nil {

 		t.Fatal(err)

@@ -457,9 +454,7 @@ func TestGetContainersTop(t *testing.T) {

 	srv := &Server{runtime: runtime}

-	builder := NewBuilder(runtime)

-

-	container, err := builder.Create(

+	container, err := runtime.Create(

 		&Config{

 			Image:     GetTestImage(runtime).ID,

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

@@ -540,10 +535,8 @@ func TestGetContainersByName(t *testing.T) {

 	srv := &Server{runtime: runtime}

-	builder := NewBuilder(runtime)

-

 	// Create a container and remove a file

-	container, err := builder.Create(

+	container, err := runtime.Create(

 		&Config{

 			Image: GetTestImage(runtime).ID,

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

@@ -573,10 +566,9 @@ func TestPostCommit(t *testing.T) {

 	srv := &Server{runtime: runtime}

-	builder := NewBuilder(runtime)

 	// Create a container and remove a file

-	container, err := builder.Create(

+	container, err := runtime.Create(

 		&Config{

 			Image: GetTestImage(runtime).ID,

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

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

 	srv := &Server{runtime: runtime}

-	container, err := NewBuilder(runtime).Create(

+	container, err := runtime.Create(

 		&Config{

 			Image:     GetTestImage(runtime).ID,

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

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

 	srv := &Server{runtime: runtime}

-	container, err := NewBuilder(runtime).Create(

+	container, err := runtime.Create(

 		&Config{

 			Image:     GetTestImage(runtime).ID,

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

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

 	srv := &Server{runtime: runtime}

-	container, err := NewBuilder(runtime).Create(

+	container, err := runtime.Create(

 		&Config{

 			Image:     GetTestImage(runtime).ID,

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

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

 	srv := &Server{runtime: runtime}

-	container, err := NewBuilder(runtime).Create(

+	container, err := runtime.Create(

 		&Config{

 			Image:     GetTestImage(runtime).ID,

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

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

 	srv := &Server{runtime: runtime}

-	container, err := NewBuilder(runtime).Create(

+	container, err := runtime.Create(

 		&Config{

 			Image:     GetTestImage(runtime).ID,

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

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

 	srv := &Server{runtime: runtime}

-	container, err := NewBuilder(runtime).Create(

+	container, err := runtime.Create(

 		&Config{

 			Image:     GetTestImage(runtime).ID,

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

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

 	srv := &Server{runtime: runtime}

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

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

 		Image: GetTestImage(runtime).ID,

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

 	})

@@ -1184,10 +1176,8 @@ func TestPostContainersCopy(t *testing.T) {

 	srv := &Server{runtime: runtime}

-	builder := NewBuilder(runtime)

-

 	// Create a container and remove a file

-	container, err := builder.Create(

+	container, err := runtime.Create(

 		&Config{

 			Image: GetTestImage(runtime).ID,

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

@@ -26,10 +26,11 @@ var (

 )

 type AuthConfig struct {

-	Username string `json:"username,omitempty"`

-	Password string `json:"password,omitempty"`

-	Auth     string `json:"auth"`

-	Email    string `json:"email"`

+	Username      string `json:"username,omitempty"`

+	Password      string `json:"password,omitempty"`

+	Auth          string `json:"auth"`

+	Email         string `json:"email"`

+	ServerAddress string `json:"serveraddress,omitempty"`

 }

 type ConfigFile struct {

@@ -96,6 +97,7 @@ func LoadConfig(rootPath string) (*ConfigFile, error) {

 		}

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

 		authConfig.Email = origEmail[1]

+		authConfig.ServerAddress = IndexServerAddress()

 		configFile.Configs[IndexServerAddress()] = authConfig

 	} else {

 		for k, authConfig := range configFile.Configs {

@@ -105,6 +107,7 @@ func LoadConfig(rootPath string) (*ConfigFile, error) {

 			}

 			authConfig.Auth = ""

 			configFile.Configs[k] = authConfig

+			authConfig.ServerAddress = k

 		}

 	}

 	return &configFile, nil

@@ -125,7 +128,7 @@ func SaveConfig(configFile *ConfigFile) error {

 		authCopy.Auth = encodeAuth(&authCopy)

 		authCopy.Username = ""

 		authCopy.Password = ""

-

+		authCopy.ServerAddress = ""

 		configs[k] = authCopy

 	}

@@ -146,14 +149,26 @@ func Login(authConfig *AuthConfig, factory *utils.HTTPRequestFactory) (string, e

 	reqStatusCode := 0

 	var status string

 	var reqBody []byte

-	jsonBody, err := json.Marshal(authConfig)

+

+	serverAddress := authConfig.ServerAddress

+	if serverAddress == "" {

+		serverAddress = IndexServerAddress()

+	}

+

+	loginAgainstOfficialIndex := serverAddress == IndexServerAddress()

+

+	// to avoid sending the server address to the server it should be removed before marshalled

+	authCopy := *authConfig

+	authCopy.ServerAddress = ""

+

+	jsonBody, err := json.Marshal(authCopy)

 	if err != nil {

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

 	}

 	// 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(serverAddress+"users/", "application/json; charset=utf-8", b)

 	if err != nil {

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

 	}

@@ -165,14 +180,23 @@ func Login(authConfig *AuthConfig, factory *utils.HTTPRequestFactory) (string, e

 	}

 	if reqStatusCode == 201 {

-		status = "Account created. Please use the confirmation link we sent" +

-			" to your e-mail to activate it."

+		if loginAgainstOfficialIndex {

+			status = "Account created. Please use the confirmation link we sent" +

+				" to your e-mail to activate it."

+		} else {

+			status = "Account created. Please see the documentation of the registry " + serverAddress + " for instructions how to activate it."

+		}

 	} else if reqStatusCode == 403 {

-		return "", fmt.Errorf("Login: Your account hasn't been activated. " +

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

+		if loginAgainstOfficialIndex {

+			return "", fmt.Errorf("Login: Your account hasn't been activated. " +

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

+		} else {

+			return "", fmt.Errorf("Login: Your account hasn't been activated. " +

+				"Please see the documentation of the registry " + serverAddress + " for instructions how to activate it.")

+		}

 	} else if reqStatusCode == 400 {

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

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

+			req, err := factory.NewRequest("GET", serverAddress+"users/", nil)

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

 			resp, err := client.Do(req)

 			if err != nil {

@@ -199,3 +223,52 @@ func Login(authConfig *AuthConfig, factory *utils.HTTPRequestFactory) (string, e

 	}

 	return status, nil

 }

+

+// this method matches a auth configuration to a server address or a url

+func (config *ConfigFile) ResolveAuthConfig(registry string) AuthConfig {

+	if registry == IndexServerAddress() || len(registry) == 0 {

+		// default to the index server

+		return config.Configs[IndexServerAddress()]

+	}

+	// if its not the index server there are three cases:

+	//

+	// 1. this is a full config url -> it should be used as is

+	// 2. it could be a full url, but with the wrong protocol

+	// 3. it can be the hostname optionally with a port

+	//

+	// as there is only one auth entry which is fully qualified we need to start

+	// parsing and matching

+

+	swapProtocoll := func(url string) string {

+		if strings.HasPrefix(url, "http:") {

+			return strings.Replace(url, "http:", "https:", 1)

+		}

+		if strings.HasPrefix(url, "https:") {

+			return strings.Replace(url, "https:", "http:", 1)

+		}

+		return url

+	}

+

+	resolveIgnoringProtocol := func(url string) AuthConfig {

+		if c, found := config.Configs[url]; found {

+			return c

+		}

+		registrySwappedProtocoll := swapProtocoll(url)