@@ -18,3 +18,4 @@ bundles/

 .hg/

 .git/

 vendor/pkg/

+pyenv

@@ -94,6 +94,7 @@ Jonathan Rudenberg <jonathan@titanous.com>

 Joost Cassee <joost@cassee.net>

 Jordan Arentsen <blissdev@gmail.com>

 Joseph Anthony Pasquale Holsten <joseph@josephholsten.com>

+Josh Poimboeuf <jpoimboe@redhat.com>

 Julien Barbier <write0@gmail.com>

 Jérôme Petazzoni <jerome.petazzoni@dotcloud.com>

 Karan Lyons <karan@karanlyons.com>

@@ -165,6 +166,7 @@ Sridatta Thatipamala <sthatipamala@gmail.com>

 Sridhar Ratnakumar <sridharr@activestate.com>

 Steeve Morin <steeve.morin@gmail.com>

 Stefan Praszalowicz <stefan@greplin.com>

+Sven Dowideit <SvenDowideit@home.org.au>

 Thatcher Peskens <thatcher@dotcloud.com>

 Thermionix <bond711@gmail.com>

 Thijs Terlouw <thijsterlouw@gmail.com>

@@ -17,7 +17,6 @@

 + Prevent DNS server conflicts in CreateBridgeIface

 + Validate bind mounts on the server side

 + Use parent image config in docker build

-* Fix regression in /etc/hosts

 #### Client

@@ -1,11 +1,14 @@

 # Contributing to Docker

-Want to hack on Docker? Awesome! Here are instructions to get you started. They are probably not perfect, please let us know if anything feels

-wrong or incomplete.

+Want to hack on Docker? Awesome! Here are instructions to get you

+started. They are probably not perfect, please let us know if anything

+feels wrong or incomplete.

 ## Build Environment

-For instructions on setting up your development environment, please see our dedicated [dev environment setup docs](http://docs.docker.io/en/latest/contributing/devenvironment/).

+For instructions on setting up your development environment, please

+see our dedicated [dev environment setup

+docs](http://docs.docker.io/en/latest/contributing/devenvironment/).

 ## Contribution guidelines

@@ -36,7 +36,7 @@ run	apt-get install -y -q mercurial

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

 # Install Go

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

+run	curl -s https://go.googlecode.com/files/go1.2rc4.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

@@ -8,35 +8,12 @@ by Keith Rarick, licensed under the MIT License.

 The following is courtesy of our legal counsel:

-Transfers of Docker shall be in accordance with applicable export

-controls of any country and all other applicable legal requirements.

-Docker shall not be distributed or downloaded to or in Cuba, Iran,

-North Korea, Sudan or Syria and shall not be distributed or downloaded

-to any person on the Denied Persons List administered by the U.S.

-Department of Commerce.

-What does that mean? 

-Here is a further explanation from our legal counsel:

+Use and transfer of Docker may be subject to certain restrictions by the

+United States and other governments.  

+It is your responsibility to ensure that your use and/or transfer does not

+violate applicable laws. 

-Like all software products that utilize cryptography, the export and

-use of Docker is subject to the U.S. Commerce Department's Export

-Administration Regulations (EAR) because it uses or contains

-cryptography (see

-http://www.bis.doc.gov/index.php/policy-guidance/encryption).  Certain

-free and open source software projects have a lightweight set of

-requirements, which can generally be met by providing email notice to

-the appropriate U.S. government agencies that their source code is

-available on a publicly available repository and making the

-appropriate statements in the README.

+For more information, please see http://www.bis.doc.gov

-The restrictions of the EAR apply to certain denied locations

-(currently Iran, Sudan, Syria, North Korea, or Cuba) and those

-individuals on the Denied Persons List, which is available here:

-http://www.bis.doc.gov/index.php/policy-guidance/lists-of-parties-of-concern/denied-persons-list.

-If you are incorporating Docker into a new open source project, the

-EAR restrictions apply to your incorporation of Docker into your

-project in the same manner as other cryptography-enabled projects,

-such as OpenSSL, almost all Linux distributions, etc.

-

-For more information, see http://www.apache.org/dev/crypto.html and/or

-seek legal counsel.

+See also http://www.apache.org/dev/crypto.html and/or seek legal counsel.

@@ -193,10 +193,9 @@ wrong or incomplete.

 *Brought to you courtesy of our legal counsel. For more context,

 please see the Notice document.*

-Transfers of Docker shall be in accordance with applicable export controls 

-of any country and all other applicable legal requirements. Without limiting the 

-foregoing, Docker shall not be distributed or downloaded to any individual or 

-location if such distribution or download would violate the applicable US 

-government export regulations. 

+Use and transfer of Docker may be subject to certain restrictions by the

+United States and other governments.  

+It is your responsibility to ensure that your use and/or transfer does not

+violate applicable laws. 

 For more information, please see http://www.bis.doc.gov

@@ -4,65 +4,135 @@

 BOX_NAME = ENV['BOX_NAME'] || "ubuntu"

 BOX_URI = ENV['BOX_URI'] || "http://files.vagrantup.com/precise64.box"

 VF_BOX_URI = ENV['BOX_URI'] || "http://files.vagrantup.com/precise64_vmware_fusion.box"

+AWS_BOX_URI = ENV['BOX_URI'] || "https://github.com/mitchellh/vagrant-aws/raw/master/dummy.box"

 AWS_REGION = ENV['AWS_REGION'] || "us-east-1"

-AWS_AMI    = ENV['AWS_AMI']    || "ami-d0f89fb9"

+AWS_AMI = ENV['AWS_AMI'] || "ami-69f5a900"

+AWS_INSTANCE_TYPE = ENV['AWS_INSTANCE_TYPE'] || 't1.micro'

+

 FORWARD_DOCKER_PORTS = ENV['FORWARD_DOCKER_PORTS']

+SSH_PRIVKEY_PATH = ENV["SSH_PRIVKEY_PATH"]

+

+# A script to upgrade from the 12.04 kernel to the raring backport kernel (3.8)

+# and install docker.

+$script = <<SCRIPT

+# The username to add to the docker group will be passed as the first argument

+# to the script.  If nothing is passed, default to "vagrant".

+user="$1"

+if [ -z "$user" ]; then

+    user=vagrant

+fi

+

+# Adding an apt gpg key is idempotent.

+wget -q -O - https://get.docker.io/gpg | apt-key add -

+

+# Creating the docker.list file is idempotent, but it may overrite desired

+# settings if it already exists.  This could be solved with md5sum but it

+# doesn't seem worth it.

+echo 'deb http://get.docker.io/ubuntu docker main' > \

+    /etc/apt/sources.list.d/docker.list

+

+# Update remote package metadata.  'apt-get update' is idempotent.

+apt-get update -q

+

+# Install docker.  'apt-get install' is idempotent.

+apt-get install -q -y lxc-docker

+

+usermod -a -G docker "$user"

+

+tmp=`mktemp -q` && {

+    # Only install the backport kernel, don't bother upgrade if the backport is

+    # already installed.  We want parse the output of apt so we need to save it

+    # with 'tee'.  NOTE: The installation of the kernel will trigger dkms to

+    # install vboxguest if needed.

+    apt-get install -q -y --no-upgrade linux-image-generic-lts-raring | \

+        tee "$tmp"

+

+    # Parse the number of installed packages from the output

+    NUM_INST=`awk '$2 == "upgraded," && $4 == "newly" { print $3 }' "$tmp"`

+    rm "$tmp"

+}

+

+# If the number of installed packages is greater than 0, we want to reboot (the

+# backport kernel was installed but is not running).

+if [ "$NUM_INST" -gt 0 ];

+then

+    echo "Rebooting down to activate new kernel."

+    echo "/vagrant will not be mounted.  Use 'vagrant halt' followed by"

+    echo "'vagrant up' to ensure /vagrant is mounted."

+    shutdown -r now

+fi

+SCRIPT

+

+# We need to install the virtualbox guest additions *before* we do the normal

+# docker installation.  As such this script is prepended to the common docker

+# install script above.  This allows the install of the backport kernel to

+# trigger dkms to build the virtualbox guest module install.

+$vbox_script = <<VBOX_SCRIPT + $script

+# Install the VirtualBox guest additions if they aren't already installed.

+if [ ! -d /opt/VBoxGuestAdditions-4.2.12/ ]; then

+    # Update remote package metadata.  'apt-get update' is idempotent.

+    apt-get update -q

+

+    # Kernel Headers and dkms are required to build the vbox guest kernel

+    # modules.

+    apt-get install -q -y linux-headers-generic-lts-raring dkms

+

+    echo 'Downloading VBox Guest Additions...'

+    wget -cq http://dlc.sun.com.edgesuite.net/virtualbox/4.2.12/VBoxGuestAdditions_4.2.12.iso

+

+    mount -o loop,ro /home/vagrant/VBoxGuestAdditions_4.2.12.iso /mnt

+    /mnt/VBoxLinuxAdditions.run --nox11

+    umount /mnt

+fi

+VBOX_SCRIPT

+

 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.ssh.forward_agent = true

-

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

-      pkg_cmd << "echo -e 'mount -o loop,ro /home/vagrant/VBoxGuestAdditions_4.2.12.iso /mnt\n" \

-        "echo yes | /mnt/VBoxLinuxAdditions.run\numount /mnt\n" \

-          "rm /root/guest_additions.sh; ' > /root/guest_additions.sh; " \

-        "chmod 700 /root/guest_additions.sh; " \

-        "sed -i -E 's#^exit 0#[ -x /root/guest_additions.sh ] \\&\\& /root/guest_additions.sh#' /etc/rc.local; " \

-        "echo 'Installation of VBox Guest Additions is proceeding in the background.'; " \

-        "echo '\"vagrant reload\" can be used in about 2 minutes to activate the new guest additions.'; "

-    end

-    # Add vagrant user to the docker group

-    pkg_cmd << "usermod -a -G docker vagrant; "

-    # Activate new kernel

-    pkg_cmd << "shutdown -r +1; "

-    config.vm.provision :shell, :inline => pkg_cmd

+  # Use the specified private key path if it is specified and not empty.

+  if SSH_PRIVKEY_PATH

+      config.ssh.private_key_path = SSH_PRIVKEY_PATH

   end

-end

+  config.ssh.forward_agent = true

+end

 # Providers were added on Vagrant >= 1.1.0

+#

+# NOTE: The vagrant "vm.provision" appends its arguments to a list and executes

+# them in order.  If you invoke "vm.provision :shell, :inline => $script"

+# twice then vagrant will run the script two times.  Unfortunately when you use

+# providers and the override argument to set up provisioners (like the vbox

+# guest extensions) they 1) don't replace the other provisioners (they append

+# to the end of the list) and 2) you can't control the order the provisioners

+# are executed (you can only append to the list).  If you want the virtualbox

+# only script to run before the other script, you have to jump through a lot of

+# hoops.

+#

+# Here is my only repeatable solution: make one script that is common ($script)

+# and another script that is the virtual box guest *prepended* to the common

+# script.  Only ever use "vm.provision" *one time* per provider.  That means

+# every single provider has an override, and every single one configures

+# "vm.provision".  Much saddness, but such is life.

 Vagrant::VERSION >= "1.1.0" and Vagrant.configure("2") do |config|

   config.vm.provider :aws do |aws, override|

-    aws.access_key_id = ENV["AWS_ACCESS_KEY_ID"]

-    aws.secret_access_key = ENV["AWS_SECRET_ACCESS_KEY"]

+    username = "ubuntu"

+    override.vm.box_url = AWS_BOX_URI

+    override.vm.provision :shell, :inline => $script, :args => username

+    aws.access_key_id = ENV["AWS_ACCESS_KEY"]

+    aws.secret_access_key = ENV["AWS_SECRET_KEY"]

     aws.keypair_name = ENV["AWS_KEYPAIR_NAME"]

-    override.ssh.private_key_path = ENV["AWS_SSH_PRIVKEY"]

-    override.ssh.username = "ubuntu"

+    override.ssh.username = username

     aws.region = AWS_REGION

     aws.ami    = AWS_AMI

-    aws.instance_type = "t1.micro"

+    aws.instance_type = AWS_INSTANCE_TYPE

   end

-  config.vm.provider :rackspace do |rs|

-    config.ssh.private_key_path = ENV["RS_PRIVATE_KEY"]

+  config.vm.provider :rackspace do |rs, override|

+    override.vm.provision :shell, :inline => $script

     rs.username = ENV["RS_USERNAME"]

     rs.api_key  = ENV["RS_API_KEY"]

     rs.public_key_path = ENV["RS_PUBLIC_KEY"]

@@ -71,20 +141,25 @@ Vagrant::VERSION >= "1.1.0" and Vagrant.configure("2") do |config|

   end

   config.vm.provider :vmware_fusion do |f, override|

-    override.vm.box = BOX_NAME

     override.vm.box_url = VF_BOX_URI

     override.vm.synced_folder ".", "/vagrant", disabled: true

+    override.vm.provision :shell, :inline => $script

     f.vmx["displayName"] = "docker"

   end

-  config.vm.provider :virtualbox do |vb|

-    config.vm.box = BOX_NAME

-    config.vm.box_url = BOX_URI

+  config.vm.provider :virtualbox do |vb, override|

+    override.vm.provision :shell, :inline => $vbox_script

     vb.customize ["modifyvm", :id, "--natdnshostresolver1", "on"]

     vb.customize ["modifyvm", :id, "--natdnsproxy1", "on"]

   end

 end

+# If this is a version 1 config, virtualbox is the only option.  A version 2

+# config would have already been set in the above provider section.

+Vagrant::VERSION < "1.1.0" and Vagrant::Config.run do |config|

+  config.vm.provision :shell, :inline => $vbox_script

+end

+

 if !FORWARD_DOCKER_PORTS.nil?

   Vagrant::VERSION < "1.1.0" and Vagrant::Config.run do |config|

     (49000..49900).each do |port|

@@ -479,15 +479,16 @@ func postImagesInsert(srv *Server, version float64, w http.ResponseWriter, r *ht

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

 	}

 	sf := utils.NewStreamFormatter(version > 1.0)

-	imgID, err := srv.ImageInsert(name, url, path, w, sf)

+	err := srv.ImageInsert(name, url, path, w, sf)

 	if err != nil {

 		if sf.Used() {

 			w.Write(sf.FormatError(err))

 			return nil

 		}

+		return err

 	}

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

+	return nil

 }

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

@@ -540,43 +541,36 @@ func postContainersCreate(srv *Server, version float64, w http.ResponseWriter, r

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

 		return nil

 	}

-	config := &Config{}

 	out := &APIRun{}

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

-

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

+	job := srv.Eng.Job("create", r.Form.Get("name"))

+	if err := job.DecodeEnv(r.Body); err != nil {

 		return err

 	}

-

 	resolvConf, err := utils.GetResolvConf()

 	if err != nil {

 		return err

 	}

-

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

+	if !job.GetenvBool("NetworkDisabled") && len(job.Getenv("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

+		job.SetenvList("Dns", defaultDns)

 	}

-

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

-	if err != nil {

+	// Read container ID from the first line of stdout

+	job.StdoutParseString(&out.ID)

+	// Read warnings from stderr

+	job.StderrParseLines(&out.Warnings, 0)

+	if err := job.Run(); 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 {

+	if job.GetenvInt("Memory") > 0 && !srv.runtime.capabilities.MemoryLimit {

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

 		out.Warnings = append(out.Warnings, "Your kernel does not support memory limit capabilities. Limitation discarded.")

 	}

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

+	if job.GetenvInt("Memory") > 0 && !srv.runtime.capabilities.SwapLimit {

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

 		out.Warnings = append(out.Warnings, "Your kernel does not support memory swap capabilities. Limitation discarded.")

 	}

-	if !config.NetworkDisabled && srv.runtime.capabilities.IPv4ForwardingDisabled {

+	if !job.GetenvBool("NetworkDisabled") && srv.runtime.capabilities.IPv4ForwardingDisabled {

 		log.Println("Warning: IPv4 forwarding is disabled.")

 		out.Warnings = append(out.Warnings, "IPv4 forwarding is disabled.")

 	}

@@ -653,26 +647,23 @@ func deleteImages(srv *Server, version float64, w http.ResponseWriter, r *http.R

 }

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

-	var hostConfig *HostConfig

+	if vars == nil {

+		return fmt.Errorf("Missing parameter")

+	}

+	name := vars["name"]

+	job := srv.Eng.Job("start", name)

+	if err := job.ImportEnv(HostConfig{}); err != nil {

+		return fmt.Errorf("Couldn't initialize host configuration")

+	}

 	// allow a nil body for backwards compatibility

 	if r.Body != nil {

 		if matchesContentType(r.Header.Get("Content-Type"), "application/json") {

-			hostConfig = &HostConfig{}

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

+			if err := job.DecodeEnv(r.Body); err != nil {

 				return err

 			}

 		}

 	}

-

-	if vars == nil {

-		return fmt.Errorf("Missing parameter")

-	}

-	name := vars["name"]

-	// Register any links from the host config before starting the container

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

-		return err

-	}

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

+	if err := job.Run(); err != nil {

 		return err

 	}

 	w.WriteHeader(http.StatusNoContent)

@@ -609,11 +609,11 @@ func TestPostCommit(t *testing.T) {

 }

 func TestPostContainersCreate(t *testing.T) {

-	runtime := mkRuntime(t)

+	eng := NewTestEngine(t)

+	srv := mkServerFromEngine(eng, t)

+	runtime := srv.runtime

 	defer nuke(runtime)

-	srv := &Server{runtime: runtime}

-

 	configJSON, err := json.Marshal(&Config{

 		Image:  GetTestImage(runtime).ID,

 		Memory: 33554432,

@@ -756,27 +756,23 @@ func TestPostContainersRestart(t *testing.T) {

 }

 func TestPostContainersStart(t *testing.T) {

-	runtime := mkRuntime(t)

+	eng := NewTestEngine(t)

+	srv := mkServerFromEngine(eng, t)

+	runtime := srv.runtime

 	defer nuke(runtime)

-	srv := &Server{runtime: runtime}

-

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

+	id := createTestContainer(

+		eng,

 		&Config{

 			Image:     GetTestImage(runtime).ID,

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

 			OpenStdin: true,

 		},

-		"",

-	)

-	if err != nil {

-		t.Fatal(err)

-	}

-	defer runtime.Destroy(container)

+		t)

 	hostConfigJSON, err := json.Marshal(&HostConfig{})

-	req, err := http.NewRequest("POST", "/containers/"+container.ID+"/start", bytes.NewReader(hostConfigJSON))

+	req, err := http.NewRequest("POST", "/containers/"+id+"/start", bytes.NewReader(hostConfigJSON))

 	if err != nil {

 		t.Fatal(err)

 	}

@@ -784,22 +780,26 @@ func TestPostContainersStart(t *testing.T) {

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

 	r := httptest.NewRecorder()

-	if err := postContainersStart(srv, APIVERSION, r, req, map[string]string{"name": container.ID}); err != nil {

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

 		t.Fatal(err)

 	}

 	if r.Code != http.StatusNoContent {

 		t.Fatalf("%d NO CONTENT expected, received %d\n", http.StatusNoContent, r.Code)

 	}

+	container := runtime.Get(id)

+	if container == nil {

+		t.Fatalf("Container %s was not created", id)

+	}

 	// Give some time to the process to start

+	// FIXME: use Wait once it's available as a job

 	container.WaitTimeout(500 * time.Millisecond)

-

 	if !container.State.Running {

 		t.Errorf("Container should be running")

 	}

 	r = httptest.NewRecorder()

-	if err = postContainersStart(srv, APIVERSION, r, req, map[string]string{"name": container.ID}); err == nil {

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

 		t.Fatalf("A running container should be able to be started")

 	}

@@ -544,10 +544,7 @@ func TestBuildADDFileNotFound(t *testing.T) {

 }

 func TestBuildInheritance(t *testing.T) {

-	runtime, err := newTestRuntime("")

-	if err != nil {

-		t.Fatal(err)

-	}

+	runtime := mkRuntime(t)

 	defer nuke(runtime)

 	srv := &Server{

@@ -130,10 +130,7 @@ func (cli *DockerCli) CmdInsert(args ...string) error {

 	v.Set("url", cmd.Arg(1))

 	v.Set("path", cmd.Arg(2))

-	if err := cli.stream("POST", "/images/"+cmd.Arg(0)+"/insert?"+v.Encode(), nil, cli.out, nil); err != nil {

-		return err

-	}

-	return nil

+	return cli.stream("POST", "/images/"+cmd.Arg(0)+"/insert?"+v.Encode(), nil, cli.out, nil)

 }

 // mkBuildContext returns an archive of an empty context with the contents

@@ -376,15 +373,17 @@ func (cli *DockerCli) CmdWait(args ...string) error {

 		cmd.Usage()

 		return nil

 	}

+	var encounteredError error

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

 		status, err := waitForExit(cli, name)

 		if err != nil {

-			fmt.Fprintf(cli.err, "%s", err)

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

+			encounteredError = fmt.Errorf("Error: failed to wait one or more containers")

 		} else {

 			fmt.Fprintf(cli.out, "%d\n", status)

 		}

 	}

-	return nil

+	return encounteredError

 }

 // 'docker version': show version information

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

 	v := url.Values{}

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

+	var encounteredError error

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

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

 		if err != nil {

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

+			encounteredError = fmt.Errorf("Error: failed to stop one or more containers")

 		} else {

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

 		}

 	}

-	return nil

+	return encounteredError

 }

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

@@ -530,15 +531,17 @@ func (cli *DockerCli) CmdRestart(args ...string) error {

 	v := url.Values{}

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

+	var encounteredError error

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

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

 		if err != nil {

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

+			encounteredError = fmt.Errorf("Error: failed to  restart one or more containers")

 		} else {

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

 		}

 	}

-	return nil

+	return encounteredError

 }

 func (cli *DockerCli) forwardAllSignals(cid string) chan os.Signal {

@@ -772,15 +775,19 @@ func (cli *DockerCli) CmdRmi(args ...string) error {

 		return nil

 	}

+	var encounteredError error

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

 		body, _, err := cli.call("DELETE", "/images/"+name, nil)

 		if err != nil {

-			fmt.Fprintf(cli.err, "%s", err)

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

+			encounteredError = fmt.Errorf("Error: failed to remove one or more images")

 		} else {

 			var outs []APIRmi

 			err = json.Unmarshal(body, &outs)

 			if err != nil {

-				return err

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

+				encounteredError = fmt.Errorf("Error: failed to remove one or more images")

+				continue

 			}

 			for _, out := range outs {

 				if out.Deleted != "" {

@@ -791,7 +798,7 @@ func (cli *DockerCli) CmdRmi(args ...string) error {

 			}

 		}

 	}

-	return nil

+	return encounteredError

 }

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

@@ -870,15 +877,18 @@ func (cli *DockerCli) CmdRm(args ...string) error {

 	if *link {

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

 	}

+

+	var encounteredError error

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

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

 		if err != nil {

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

+			encounteredError = fmt.Errorf("Error: failed to remove one or more containers")

 		} else {

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

 		}

 	}

-	return nil

+	return encounteredError

 }

 // 'docker kill NAME' kills a running container

@@ -892,15 +902,16 @@ func (cli *DockerCli) CmdKill(args ...string) error {

 		return nil

 	}

+	var encounteredError error

 	for _, name := range args {

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

-		if err != nil {

+		if _, _, err := cli.call("POST", "/containers/"+name+"/kill", nil); err != nil {

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

+			encounteredError = fmt.Errorf("Error: failed to kill one or more containers")

 		} else {

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

 		}

 	}

-	return nil

+	return encounteredError

 }

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

@@ -913,8 +924,16 @@ func (cli *DockerCli) CmdImport(args ...string) error {

 		cmd.Usage()

 		return nil

 	}

-	src := cmd.Arg(0)

-	repository, tag := utils.ParseRepositoryTag(cmd.Arg(1))

+

+	var src, repository, tag string

+

+	if cmd.NArg() == 3 {

+		fmt.Fprintf(cli.err, "[DEPRECATED] The format 'URL|- [REPOSITORY [TAG]]' as been deprecated. Please use URL|- [REPOSITORY[:TAG]]\n")

+		src, repository, tag = cmd.Arg(0), cmd.Arg(1), cmd.Arg(2)

+	} else {

+		src = cmd.Arg(0)

+		repository, tag = utils.ParseRepositoryTag(cmd.Arg(1))

+	}

 	v := url.Values{}

 	v.Set("repo", repository)

 	v.Set("tag", tag)

@@ -1166,14 +1185,10 @@ func (cli *DockerCli) CmdImages(args ...string) error {

 			fmt.Fprintln(w, "REPOSITORY\tTAG\tIMAGE ID\tCREATED\tSIZE")

 		}

-		var repo string

-		var tag string

 		for _, out := range outs {

 			for _, repotag := range out.RepoTags {

-				components := strings.SplitN(repotag, ":", 2)

-				repo = components[0]

-				tag = components[1]

+				repo, tag := utils.ParseRepositoryTag(repotag)

 				if !*noTrunc {

 					out.ID = utils.TruncateID(out.ID)

@@ -1235,7 +1250,7 @@ func PrintTreeNode(cli *DockerCli, noTrunc *bool, image APIImages, prefix string

 	fmt.Fprintf(cli.out, "%s%s Size: %s (virtual %s)", prefix, imageID, utils.HumanSize(image.Size), utils.HumanSize(image.VirtualSize))

 	if image.RepoTags[0] != "<none>:<none>" {

-		fmt.Fprintf(cli.out, " Tags: %s\n", strings.Join(image.RepoTags, ","))

+		fmt.Fprintf(cli.out, " Tags: %s\n", strings.Join(image.RepoTags, ", "))

 	} else {

 		fmt.Fprint(cli.out, "\n")

 	}

@@ -1351,8 +1366,16 @@ func (cli *DockerCli) CmdCommit(args ...string) error {

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

 		return nil

 	}

-	name := cmd.Arg(0)

-	repository, tag := utils.ParseRepositoryTag(cmd.Arg(1))

+

+	var name, repository, tag string

+

+	if cmd.NArg() == 3 {

+		fmt.Fprintf(cli.err, "[DEPRECATED] The format 'CONTAINER [REPOSITORY [TAG]]' as been deprecated. Please use CONTAINER [REPOSITORY[:TAG]]\n")

+		name, repository, tag = cmd.Arg(0), cmd.Arg(1), cmd.Arg(2)

+	} else {

+		name = cmd.Arg(0)

+		repository, tag = utils.ParseRepositoryTag(cmd.Arg(1))

+	}

 	if name == "" {

 		cmd.Usage()

@@ -1389,7 +1412,7 @@ func (cli *DockerCli) CmdCommit(args ...string) error {

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

 	cmd := Subcmd("events", "[OPTIONS]", "Get real time events from the server")

-	since := cmd.String("since", "", "Show events previously created (used for polling).")

+	since := cmd.String("since", "", "Show previously created events and then stream.")

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

 		return nil

 	}

@@ -1401,7 +1424,17 @@ func (cli *DockerCli) CmdEvents(args ...string) error {

 	v := url.Values{}

 	if *since != "" {

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

+		loc := time.FixedZone(time.Now().Zone())

+		format := "2006-01-02 15:04:05 -0700 MST"

+		if len(*since) < len(format) {

+			format = format[:len(*since)]

+		}

+

+		if t, err := time.ParseInLocation(format, *since, loc); err == nil {

+			v.Set("since", strconv.FormatInt(t.Unix(), 10))

+		} else {

+			v.Set("since", *since)

+		}

 	}

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

@@ -1658,9 +1691,16 @@ func (cli *DockerCli) CmdTag(args ...string) error {

 		return nil

 	}

-	v := url.Values{}

-	repository, tag := utils.ParseRepositoryTag(cmd.Arg(1))

+	var repository, tag string

+	if cmd.NArg() == 3 {

+		fmt.Fprintf(cli.err, "[DEPRECATED] The format 'IMAGE [REPOSITORY [TAG]]' as been deprecated. Please use IMAGE [REPOSITORY[:TAG]]\n")

+		repository, tag = cmd.Arg(1), cmd.Arg(2)

+	} else {

+		repository, tag = utils.ParseRepositoryTag(cmd.Arg(1))

+	}

+

+	v := url.Values{}

 	v.Set("repo", repository)

 	v.Set("tag", tag)

@@ -1971,7 +2011,7 @@ func (cli *DockerCli) call(method, path string, data interface{}) ([]byte, int,

 		if len(body) == 0 {

 			return nil, resp.StatusCode, fmt.Errorf("Error: %s", http.StatusText(resp.StatusCode))

 		}

-		return nil, resp.StatusCode, fmt.Errorf("Error: %s", body)

+		return nil, resp.StatusCode, fmt.Errorf("Error: %s", bytes.TrimSpace(body))

 	}

 	return body, resp.StatusCode, nil

 }

@@ -2027,7 +2067,7 @@ func (cli *DockerCli) stream(method, path string, in io.Reader, out io.Writer, h

 		if len(body) == 0 {

 			return fmt.Errorf("Error :%s", http.StatusText(resp.StatusCode))

 		}

-		return fmt.Errorf("Error: %s", body)

+		return fmt.Errorf("Error: %s", bytes.TrimSpace(body))

 	}

 	if matchesContentType(resp.Header.Get("Content-Type"), "application/json") {

@@ -6,6 +6,8 @@ import (

 	"github.com/dotcloud/docker/utils"

 	"io"

 	"io/ioutil"

+	"os"

+	"path"

 	"regexp"

 	"strings"

 	"testing"

@@ -381,8 +383,8 @@ func TestRunAttachStdin(t *testing.T) {

 		if err != nil {

 			t.Fatal(err)

 		}

-		if cmdOutput != container.ShortID()+"\n" {

-			t.Fatalf("Wrong output: should be '%s', not '%s'\n", container.ShortID()+"\n", cmdOutput)

+		if cmdOutput != container.ID+"\n" {

+			t.Fatalf("Wrong output: should be '%s', not '%s'\n", container.ID+"\n", cmdOutput)

 		}

 	})

@@ -459,7 +461,7 @@ func TestRunDetach(t *testing.T) {

 	})

 }

-// TestAttachDetach checks that attach in tty mode can be detached

+// TestAttachDetach checks that attach in tty mode can be detached using the long container ID

 func TestAttachDetach(t *testing.T) {

 	stdin, stdinPipe := io.Pipe()

 	stdout, stdoutPipe := io.Pipe()

@@ -486,8 +488,8 @@ func TestAttachDetach(t *testing.T) {

 		container = globalRuntime.List()[0]

-		if strings.Trim(string(buf[:n]), " \r\n") != container.ShortID() {

-			t.Fatalf("Wrong ID received. Expect %s, received %s", container.ShortID(), buf[:n])

+		if strings.Trim(string(buf[:n]), " \r\n") != container.ID {

+			t.Fatalf("Wrong ID received. Expect %s, received %s", container.ID, buf[:n])

 		}

 	})

 	setTimeout(t, "Starting container timed out", 10*time.Second, func() {

@@ -501,7 +503,69 @@ func TestAttachDetach(t *testing.T) {

 	ch = make(chan struct{})

 	go func() {

 		defer close(ch)

-		if err := cli.CmdAttach(container.ShortID()); err != nil {

+		if err := cli.CmdAttach(container.ID); err != nil {

+			if err != io.ErrClosedPipe {

+				t.Fatal(err)

+			}

+		}

+	}()

+

+	setTimeout(t, "First read/write assertion timed out", 2*time.Second, func() {

+		if err := assertPipe("hello\n", "hello", stdout, stdinPipe, 15); err != nil {

+			if err != io.ErrClosedPipe {

+				t.Fatal(err)

+			}

+		}