Fix rebase conflicts from master

Add docs and maintainers file for new sub pkgs
Remove network connection when link is removed
2026-08-20 12:45:50 +00:00 · 2013-10-02 13:58:43 -07:00 · 2013-10-02 12:48:27 -07:00 · 2013-10-02 12:44:41 -07:00 · 2013-10-02 12:44:41 -07:00 · 2013-10-02 12:43:09 -07:00
191 changed files with 4608 additions and 7587 deletions
@@ -26,15 +26,3 @@ Roberto Hashioka <roberto_hashioka@hotmail.com>
 Konstantin Pelykh <kpelykh@zettaset.com>
 David Sissitka <me@dsissitka.com>
 Nolan Darilek <nolan@thewordnerd.info>
-<mastahyeti@gmail.com> <mastahyeti@users.noreply.github.com>
-Benoit Chesneau <bchesneau@gmail.com>
-Jordan Arentsen <blissdev@gmail.com>
-Daniel Garcia <daniel@danielgarcia.info>
-Miguel Angel Fernández <elmendalerenda@gmail.com>
-Bhiraj Butala <abhiraj.butala@gmail.com>
-Faiz Khan <faizkhan00@gmail.com>
-Victor Lyuboslavsky <victor@victoreda.com>
-Jean-Baptiste Barth <jeanbaptiste.barth@gmail.com>
-Matthew Mueller <mattmuelle@gmail.com>
-<mosoni@ebay.com> <mohitsoni1989@gmail.com>
-Shih-Yuan Lee <fourdollars@gmail.com>
@@ -5,98 +5,64 @@
 #
 Al Tobey <al@ooyala.com>
 Alex Gaynor <alex.gaynor@gmail.com>
-Alexander Larsson <alexl@redhat.com>
 Alexey Shamrin <shamrin@gmail.com>
 Andrea Luzzardi <aluzzardi@gmail.com>
-Andreas Savvides <andreas@editd.com>
 Andreas Tiefenthaler <at@an-ti.eu>
-Andrew Macgregor <andrew.macgregor@agworld.com.au>
 Andrew Munsell <andrew@wizardapps.net>
 Andrews Medina <andrewsmedina@gmail.com>
 Andy Rothfusz <github@metaliveblog.com>
 Andy Smith <github@anarkystic.com>
 Anthony Bishopric <git@anthonybishopric.com>
 Antony Messerli <amesserl@rackspace.com>
-Asbjørn Enge <asbjorn@hanafjedle.net>
 Barry Allard <barry.allard@gmail.com>
-Ben Toews <mastahyeti@gmail.com>
-Benoit Chesneau <bchesneau@gmail.com>
-Bhiraj Butala <abhiraj.butala@gmail.com>
-Bouke Haarsma <bouke@webatoom.nl>
 Brandon Liu <bdon@bdon.org>
-Brandon Philips <brandon@ifup.co>
 Brian McCallister <brianm@skife.org>
 Brian Olsen <brian@maven-group.org>
-Brian Shumate <brian@couchbase.com>
-Briehan Lombaard <briehan.lombaard@gmail.com>
 Bruno Bigras <bigras.bruno@gmail.com>
 Caleb Spare <cespare@gmail.com>
 Calen Pennington <cale@edx.org>
 Charles Hooper <charles.hooper@dotcloud.com>
 Christopher Currie <codemonkey+github@gmail.com>
-Colin Dunklau <colin.dunklau@gmail.com>
 Colin Rice <colin@daedrum.net>
-Dan Buch <d.buch@modcloth.com>
-Daniel Garcia <daniel@danielgarcia.info>
 Daniel Gasienica <daniel@gasienica.ch>
 Daniel Mizyrycki <daniel.mizyrycki@dotcloud.com>
-Daniel Nordberg <dnordberg@gmail.com>
 Daniel Robinson <gottagetmac@gmail.com>
 Daniel Von Fange <daniel@leancoder.com>
 Daniel YC Lin <dlin.tw@gmail.com>
 David Calavera <david.calavera@gmail.com>
 David Sissitka <me@dsissitka.com>
-Deni Bertovic <deni@kset.org>
 Dominik Honnef <dominik@honnef.co>
 Don Spaulding <donspauldingii@gmail.com>
 Dr Nic Williams <drnicwilliams@gmail.com>
-Dražen Lučanin <kermit666@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>
-Evan Phoenix <evan@fallingsnow.net>
 Evan Wies <evan@neomantra.net>
 ezbercih <cem.ezberci@gmail.com>
 Fabrizio Regini <freegenie@gmail.com>
-Faiz Khan <faizkhan00@gmail.com>
 Fareed Dudhia <fareeddudhia@googlemail.com>
 Flavio Castelli <fcastelli@suse.com>
 Francisco Souza <f@souza.cc>
 Frederick F. Kautz IV <fkautz@alumni.cmu.edu>
 Gabriel Monroy <gabriel@opdemand.com>
 Gareth Rushgrove <gareth@morethanseven.net>
-Greg Thornton <xdissent@me.com>
 Guillaume J. Charmes <guillaume.charmes@dotcloud.com>
-Guruprasad <lgp171188@gmail.com>
 Harley Laue <losinggeneration@gmail.com>
-Hector Castro <hectcastro@gmail.com>
 Hunter Blanks <hunter@twilio.com>
-Isao Jonas <isao.jonas@gmail.com>
-James Carr <james.r.carr@gmail.com>
-Jason McVetta <jason.mcvetta@gmail.com>
-Jean-Baptiste Barth <jeanbaptiste.barth@gmail.com>
 Jeff Lindsay <progrium@gmail.com>
 Jeremy Grosser <jeremy@synack.me>
-Jim Alateras <jima@comware.com.au>
-Jimmy Cuadra <jimmy@jimmycuadra.com>
-Joe Van Dyk <joe@tanga.com>
 Joffrey F <joffrey@dotcloud.com>
 Johan Euphrosine <proppy@google.com>
 John Costa <john.costa@gmail.com>
 Jon Wedaman <jweede@gmail.com>
 Jonas Pfenniger <jonas@pfenniger.name>
-Jonathan Mueller <j.mueller@apoveda.ch>
 Jonathan Rudenberg <jonathan@titanous.com>
-Joost Cassee <joost@cassee.net>
-Jordan Arentsen <blissdev@gmail.com>
 Joseph Anthony Pasquale Holsten <joseph@josephholsten.com>
 Julien Barbier <write0@gmail.com>
 Jérôme Petazzoni <jerome.petazzoni@dotcloud.com>
 Karan Lyons <karan@karanlyons.com>
-Karl Grzeszczak <karl@karlgrz.com>
-Kawsar Saiyeed <kawsar.saiyeed@projiris.com>
 Keli Hu <dev@keli.hu>
 Ken Cochrane <kencochrane@gmail.com>
 Kevin Clark <kevin.clark@gmail.com>
@@ -105,45 +71,28 @@ kim0 <email.ahmedkamal@googlemail.com>
 Kimbro Staken <kstaken@kstaken.com>
 Kiran Gangadharan <kiran.daredevil@gmail.com>
 Konstantin Pelykh <kpelykh@zettaset.com>
-Kyle Conroy <kyle.j.conroy@gmail.com>
-Laurie Voss <github@seldo.com>
 Louis Opter <kalessin@kalessin.fr>
-Manuel Meurer <manuel@krautcomputing.com>
 Marco Hennings <marco.hennings@freiheit.com>
 Marcus Farkas <toothlessgear@finitebox.com>
-Marcus Ramberg <marcus@nordaaker.com>
 Mark McGranaghan <mmcgrana@gmail.com>
-Marko Mikulicic <mmikulicic@gmail.com>
-Markus Fix <lispmeister@gmail.com>
-Martin Redmond <martin@tinychat.com>
-Matt Apperson <me@mattapperson.com>
-Matt Bachmann <bachmann.matt@gmail.com>
-Matthew Mueller <mattmuelle@gmail.com>
+Martin Redmond <mrtodo@gmail.com>
 Maxim Treskin <zerthurd@gmail.com>
 meejah <meejah@meejah.ca>
 Michael Crosby <crosby.michael@gmail.com>
-Michael Gorsuch <gorsuch@github.com>
-Miguel Angel Fernández <elmendalerenda@gmail.com>
 Mike Gaffney <mike@uberu.com>
 Mikhail Sobolev <mss@mawhrin.net>
-Mohit Soni <mosoni@ebay.com>
-Morten Siebuhr <sbhr@sbhr.dk>
 Nan Monnand Deng <monnand@gmail.com>
 Nate Jones <nate@endot.org>
 Nelson Chen <crazysim@gmail.com>
 Niall O'Higgins <niallo@unworkable.org>
-Nick Payne <nick@kurai.co.uk>
 Nick Stenning <nick.stenning@digital.cabinet-office.gov.uk>
 Nick Stinemates <nick@stinemates.org>
 Nolan Darilek <nolan@thewordnerd.info>
 odk- <github@odkurzacz.org>
-Pascal Borreli <pascal@borreli.com>
 Paul Bowsher <pbowsher@globalpersonals.co.uk>
 Paul Hammond <paul@paulhammond.org>
 Phil Spitler <pspitler@gmail.com>
 Piotr Bogdan <ppbogdan@gmail.com>
-pysqz <randomq@126.com>
-Ramon van Alteren <ramon@vanalteren.nl>
 Renato Riccieri Santos Zannon <renato.riccieri@gmail.com>
 Rhys Hiltner <rhys@twitch.tv>
 Robert Obryk <robryk@gmail.com>
@@ -151,21 +100,14 @@ Roberto Hashioka <roberto_hashioka@hotmail.com>
 Ryan Fowler <rwfowler@gmail.com>
 Sam Alba <sam.alba@gmail.com>
 Sam J Sharpe <sam.sharpe@digital.cabinet-office.gov.uk>
-Sean P. Kane <skane@newrelic.com>
 Shawn Siefkas <shawn.siefkas@meredith.com>
-Shih-Yuan Lee <fourdollars@gmail.com>
 Silas Sewell <silas@sewell.org>
 Solomon Hykes <solomon@dotcloud.com>
-Song Gao <song@gao.io>
-Sridatta Thatipamala <sthatipamala@gmail.com>
 Sridhar Ratnakumar <sridharr@activestate.com>
-Steeve Morin <steeve.morin@gmail.com>
 Stefan Praszalowicz <stefan@greplin.com>
 Thatcher Peskens <thatcher@dotcloud.com>
-Thermionix <bond711@gmail.com>
 Thijs Terlouw <thijsterlouw@gmail.com>
 Thomas Bikeev <thomas.bikeev@mac.com>
-Thomas Frössman <thomasf@jossystem.se>
 Thomas Hansen <thomas.hansen@gmail.com>
 Tianon Gravi <admwiggin@gmail.com>
 Tim Terhorst <mynamewastaken+git@gmail.com>
@@ -173,16 +115,8 @@ Tobias Bieniek <Tobias.Bieniek@gmx.de>
 Tobias Schmidt <ts@soundcloud.com>
 Tobias Schwab <tobias.schwab@dynport.de>
 Tom Hulihan <hulihan.tom159@gmail.com>
-Tommaso Visconti <tommaso.visconti@gmail.com>
-Tyler Brock <tyler.brock@gmail.com>
 unclejack <unclejacksons@gmail.com>
-Victor Coisne <victor.coisne@dotcloud.com>
-Victor Lyuboslavsky <victor@victoreda.com>
 Victor Vieux <victor.vieux@dotcloud.com>
-Vincent Bernat <bernat@luffy.cx>
 Vivek Agarwal <me@vivek.im>
-Vladimir Kirillov <proger@wilab.org.ua>
 Walter Stanish <walter@pratyeka.org>
-Wes Morgan <cap10morgan@gmail.com>
 Will Dietz <w@wdtz.org>
-Zaiste! <oh@zaiste.net>
@@ -1,83 +1,5 @@
 # Changelog

-## 0.6.4 (2013-10-16)
- Runtime: Add cleanup of container when Start() fails
- Testing: Catch errClosing error when TCP and UDP proxies are terminated
- Testing: Add aggregated docker-ci email report
- Testing: Remove a few errors in tests
-* Contrib: Reorganize contributed completion scripts to add zsh completion
-* Contrib: Add vim syntax highlighting for Dockerfiles from @honza
-* Runtime: Add better comments to utils/stdcopy.go
- Testing: add cleanup to remove leftover containers
-* Documentation: Document how to edit and release docs
-* Documentation: Add initial draft of the Docker infrastructure doc
-* Contrib: Add mkimage-arch.sh
- Builder: Abort build if mergeConfig returns an error and fix duplicate error message
- Runtime: Remove error messages which are not actually errors
-* Testing: Only run certain tests with TESTFLAGS='-run TestName' make.sh
-* Testing: Prevent docker-ci to test closing PRs
- Documentation: Minor updates to postgresql_service.rst
-* Testing: Add nightly release to docker-ci
-* Hack: Improve network performance for VirtualBox
-* Hack: Add vagrant user to the docker group
-* Runtime: Add utils.Errorf for error logging
- Packaging: Remove deprecated packaging directory
-* Hack: Revamp install.sh to be usable by more people, and to use official install methods whenever possible (apt repo, portage tree, etc.)
- Hack: Fix contrib/mkimage-debian.sh apt caching prevention
-* Documentation: Clarify LGTM process to contributors
- Documentation: Small fixes to parameter names in docs for ADD command
-* Runtime: Record termination time in state.
- Registry: Use correct auth config when logging in.
- Documentation: Corrected error in the package name
-* Documentation: Document what `vagrant up` is actually doing
- Runtime: Fix `docker rm` with volumes
- Runtime: Use empty string so TempDir uses the OS's temp dir automatically
- Runtime: Make sure to close the network allocators
-* Testing: Replace panic by log.Fatal in tests
-+ Documentation: improve doc search results
- Runtime: Fix some error cases where a HTTP body might not be closed
-* Hack: Add proper bash completion for "docker push"
-* Documentation: Add devenvironment link to CONTRIBUTING.md
-* Documentation: Cleanup whitespace in API 1.5 docs
-* Documentation: use angle brackets in MAINTAINER example email
- Testing: Increase TestRunDetach timeout
-* Documentation: Fix help text for -v option
-+ Hack: Added Dockerfile.tmLanguage to contrib
-+ Runtime: Autorestart containers by default
-* Testing: Adding more tests around auth.ResolveAuthConfig
-* Hack: Configured FPM to make /etc/init/docker.conf a config file
-* Hack: Add xz utils as a runtime dep
-* Documentation: Add `apt-get install curl` to Ubuntu docs
-* Documentation: Remove Gentoo install notes about #1422 workaround
-* Documentation: Fix Ping endpoint documentation
-* Runtime: Bump vendor kr/pty to commit 3b1f6487b (syscall.O_NOCTTY)
-* Runtime: lxc: Allow set_file_cap capability in container
-* Documentation: Update archlinux.rst
- Documentation: Fix ironic typo in changelog
-* Documentation: Add explanation for export restrictions
-* Hack: Add cleanup/refactor portion of #2010 for hack and Dockerfile updates
-+ Documentation: Changes to a new style for the docs. Includes version switcher.
-* Documentation: Formatting, add information about multiline json
-+ Hack: Add contrib/mkimage-centos.sh back (from #1621), and associated documentation link
- Runtime: Fix panic with wrong dockercfg file
- Runtime: Fix the attach behavior with -i
-* Documentation: Add .dockercfg doc
- Runtime: Move run -rm to the cli only
-* Hack: Enable SSH Agent forwarding in Vagrant VM
-+ Runtime: Add -rm to docker run for removing a container on exit
-* Documentation: Improve registry and index REST API documentation
-* Runtime: Split stdout stderr
- Documentation: Replace deprecated upgrading reference to docker-latest.tgz, which hasn't been updated since 0.5.3
-* Documentation: Update Gentoo installation documentation now that we're in the portage tree proper
- Registry: Fix the error message so it is the same as the regex
-* Runtime: Always create a new session for the container
-* Hack: Add several of the small make.sh fixes from #1920, and make the output more consistent and contributor-friendly
-* Documentation: Various command fixes in postgres example
-* Documentation: Cleanup and reorganize docs and tooling for contributors and maintainers
- Documentation: Minor spelling correction of protocoll -> protocol
-* Hack: Several small tweaks/fixes for contrib/mkimage-debian.sh
-+ Hack: Add @tianon to hack/MAINTAINERS
-
 ## 0.6.3 (2013-09-23)
 * Packaging: Update tar vendor dependency
 - Client: Fix detach issue
@@ -3,10 +3,6 @@
 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/).
-
 ## Contribution guidelines

 ### Pull requests are always welcome
@@ -59,10 +55,8 @@ Submit unit tests for your changes.  Go has a great test framework built in; use
 it! Take a look at existing tests for inspiration. Run the full test suite on
 your branch before submitting a pull request.

-Update the documentation when creating or modifying features. Test
-your documentation changes for clarity, concision, and correctness, as
-well as a clean docmuent build. See ``docs/README.md`` for more
-information on building the docs and how docs get released.
+Make sure you include relevant updates or additions to documentation when
+creating or modifying features.

 Write clean code. Universally formatted code promotes ease of writing, reading,
 and maintenance. Always run `go fmt` before committing your changes. Most
@@ -95,17 +89,6 @@ name and email address match your git configuration. The AUTHORS file is
 regenerated occasionally from the git commit history, so a mismatch may result
 in your changes being overwritten.

-### Approval
-
-Docker maintainers use LGTM (looks good to me) in comments on the code review
-to indicate acceptance.
-
-A change requires LGTMs from an absolute majority of the maintainers of each
-component affected. For example, if a change affects docs/ and registry/, it
-needs an absolute majority from the maintainers of docs/ AND, separately, an
-absolute majority of the maintainers of registry
-
-For more details see [MAINTAINERS.md](hack/MAINTAINERS.md)

 ### How can I become a maintainer?

@@ -12,7 +12,7 @@
 #
 #
 # # Run the test suite:
-# docker run -privileged -lxc-conf=lxc.aa_profile=unconfined docker hack/make.sh test
+# docker run -privileged -lxc-conf=lxc.aa_profile=unconfined docker go test -v
 #
 # # Publish a release:
 # docker run -privileged -lxc-conf=lxc.aa_profile=unconfined \
@@ -24,58 +24,43 @@
 #

 docker-version 0.6.1
-from    ubuntu:12.10
-maintainer      Solomon Hykes <solomon@dotcloud.com>
+from	ubuntu:12.04
+maintainer	Solomon Hykes <solomon@dotcloud.com>

 # Build dependencies
-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 libsqlite3-dev
-
-# Install Go from source (for eventual cross-compiling)
-run     curl -s https://go.googlecode.com/files/go1.2rc1.src.tar.gz | tar -v -C / -xz && mv /go /goroot
-run     cd /goroot/src && ./make.bash
-env     GOROOT  /goroot
-env     PATH    $PATH:/goroot/bin
-env     GOPATH  /go:/go/src/github.com/dotcloud/docker/vendor
-
-# Create Go cache with tag netgo (for static compilation of Go while preserving CGO support)
-run     go install -ldflags '-w -linkmode external -extldflags "-static -Wl,--unresolved-symbols=ignore-in-shared-libs"' -tags netgo -a std
-
-# Get lvm2 source for compiling statically
-run     git clone git://git.fedorahosted.org/git/lvm2.git /lvm2
-run     cd /lvm2 && git checkout v2_02_102
-
-# can't use git clone -b because it's not supported by git versions before 1.7.10
-run	cd /lvm2 && ./configure --enable-static_link && make && make install_device-mapper
-# see https://git.fedorahosted.org/cgit/lvm2.git/refs/tags for release tags
+run	echo 'deb http://archive.ubuntu.com/ubuntu precise main universe' > /etc/apt/sources.list
+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 libsqlite3-dev

+# Install Go
+run	curl -s https://go.googlecode.com/files/go1.2rc1.src.tar.gz | tar -v -C /usr/local -xz
+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
+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 /tmp && echo 'package main' > t.go && go test -a -i -v
 # Ubuntu stuff
-run     apt-get install -y -q ruby1.9.3 rubygems libffi-dev
-run     gem install --no-rdoc --no-ri fpm
-run     apt-get install -y -q reprepro dpkg-sig
+run	apt-get install -y -q ruby1.9.3 rubygems libffi-dev
+run	gem install --no-rdoc --no-ri fpm
+run	apt-get install -y -q reprepro dpkg-sig

 # Install s3cmd 1.0.1 (earlier versions don't support env variables in the config)
-run     apt-get install -y -q python-pip
-run     pip install s3cmd
-run     pip install python-magic
-run     /bin/echo -e '[default]\naccess_key=$AWS_ACCESS_KEY\nsecret_key=$AWS_SECRET_KEY\n' > /.s3cfg
+run	apt-get install -y -q python-pip
+run	pip install s3cmd
+run	pip install python-magic
+run	/bin/echo -e '[default]\naccess_key=$AWS_ACCESS_KEY\nsecret_key=$AWS_SECRET_KEY\n' > /.s3cfg

 # Runtime dependencies
-run     apt-get install -y -q iptables
-run     dpkg-divert --local --rename --add /sbin/initctl && \
-        ln -s /bin/true /sbin/initctl && \
-        apt-get install -y -q lxc
+run	apt-get install -y -q iptables
+run	apt-get install -y -q lxc

-volume  /var/lib/docker
-workdir /go/src/github.com/dotcloud/docker
+volume	/var/lib/docker
+workdir	/go/src/github.com/dotcloud/docker

 # Wrap all commands in the "docker-in-docker" script to allow nested containers
 entrypoint ["hack/dind"]

 # Upload docker source
-add     .		/go/src/github.com/dotcloud/docker
-
+add	.       /go/src/github.com/dotcloud/docker
@@ -15,16 +15,23 @@ to put them - so we put them here :)
 * Run linter on codebase
 * Unify build commands and regular commands
 * Move source code into src/ subdir for clarity
+* Clean up the Makefile, it's a mess
 * docker build: on non-existent local path for ADD, don't show full absolute path on the host
+* mount into /dockerinit rather than /sbin/init
 * docker tag foo REPO:TAG
 * use size header for progress bar in pull
 * Clean up context upload in build!!!
 * Parallel pull
+* Ensure /proc/sys/net/ipv4/ip_forward is 1
+* Force DNS to public!
 * Always generate a resolv.conf per container, to avoid changing resolv.conf under thne container's feet
-* Save metadata with import/export (#1974)
+* Save metadata with import/export
 * Upgrade dockerd without stopping containers
-* Simple command to remove all untagged images (`docker rmi $(docker images | awk '/^<none>/ { print $3 }')`)
+* bring back git revision info, looks like it was lost
+* Simple command to remove all untagged images
 * Simple command to clean up containers for disk space
-* Caching after an ADD (#880)
+* Caching after an ADD
+* entry point config
+* bring back git revision info, looks like it was lost
 * Clean up the ProgressReader api, it's a PITA to use
 * Use netlink instead of iproute2/iptables (#925)
@@ -1 +1 @@
-0.6.4-dev
+0.6.3-dev
@@ -39,8 +39,6 @@ Vagrant::Config.run do |config|
        "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
@@ -80,8 +78,6 @@ Vagrant::VERSION >= "1.1.0" and Vagrant.configure("2") do |config|
  config.vm.provider :virtualbox do |vb|
    config.vm.box = BOX_NAME
    config.vm.box_url = BOX_URI
-    vb.customize ["modifyvm", :id, "--natdnshostresolver1", "on"]
-    vb.customize ["modifyvm", :id, "--natdnsproxy1", "on"]
  end
 end

@@ -15,6 +15,7 @@ import (
 	"mime"
 	"net"
 	"net/http"
+	"net/url"
 	"os"
 	"os/exec"
 	"regexp"
@@ -71,11 +72,8 @@ func httpError(w http.ResponseWriter, err error) {
 	} else if strings.Contains(err.Error(), "hasn't been activated") {
 		statusCode = http.StatusForbidden
 	}
-
-	if err != nil {
-		utils.Errorf("HTTP Error: statusCode=%d %s", statusCode, err.Error())
-		http.Error(w, err.Error(), statusCode)
-	}
+	utils.Debugf("[error %d] %s", statusCode, err)
+	http.Error(w, err.Error(), statusCode)
 }

 func writeJSON(w http.ResponseWriter, code int, v interface{}) error {
@@ -106,7 +104,7 @@ func getBoolParam(value string) (bool, error) {
 func matchesContentType(contentType, expectedType string) bool {
 	mimetype, _, err := mime.ParseMediaType(contentType)
 	if err != nil {
-		utils.Errorf("Error parsing media type: %s error: %s", contentType, err.Error())
+		utils.Debugf("Error parsing media type: %s error: %s", contentType, err.Error())
 	}
 	return err == nil && mimetype == expectedType
 }
@@ -137,6 +135,7 @@ func postContainersKill(srv *Server, version float64, w http.ResponseWriter, r *
 		return fmt.Errorf("Missing parameter")
 	}
 	name := vars["name"]
+	name = decodeName(name)
 	if err := srv.ContainerKill(name); err != nil {
 		return err
 	}
@@ -149,9 +148,10 @@ 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)
+		utils.Debugf("%s", err)
 		return err
 	}
 	return nil
@@ -196,7 +196,7 @@ func getEvents(srv *Server, version float64, w http.ResponseWriter, r *http.Requ
 		_, err = wf.Write(b)
 		if err != nil {
 			// On error, evict the listener
-			utils.Errorf("%s", err)
+			utils.Debugf("%s", err)
 			srv.Lock()
 			delete(srv.listeners, r.RemoteAddr)
 			srv.Unlock()
@@ -350,8 +350,8 @@ func postCommit(srv *Server, version float64, w http.ResponseWriter, r *http.Req
 		return err
 	}
 	config := &Config{}
-	if err := json.NewDecoder(r.Body).Decode(config); err != nil && err != io.EOF {
-		utils.Errorf("%s", err)
+	if err := json.NewDecoder(r.Body).Decode(config); err != nil {
+		utils.Debugf("%s", err)
 	}
 	repo := r.Form.Get("repo")
 	tag := r.Form.Get("tag")
@@ -559,6 +559,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
 	}
@@ -574,6 +575,7 @@ 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 {
@@ -630,9 +632,13 @@ 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 {
-		utils.Debugf("error ContainerStart: %s", err)
 		return err
 	}
 	w.WriteHeader(http.StatusNoContent)
@@ -652,6 +658,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
@@ -665,6 +672,7 @@ 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 {
@@ -725,6 +733,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 {
@@ -806,7 +815,7 @@ func wsContainersAttach(srv *Server, version float64, w http.ResponseWriter, r *
 		defer ws.Close()

 		if err := srv.ContainerAttach(name, logs, stream, stdin, stdout, stderr, ws, ws, ws); err != nil {
-			utils.Errorf("Error: %s", err)
+			utils.Debugf("Error: %s", err)
 		}
 	})
 	h.ServeHTTP(w, r)
@@ -919,7 +928,8 @@ func postBuild(srv *Server, version float64, w http.ResponseWriter, r *http.Requ
 	b := NewBuildFile(srv, utils.NewWriteFlusher(w), !suppressOutput, !noCache, rm)
 	id, err := b.Build(context)
 	if err != nil {
-		return fmt.Errorf("Error build: %s", err)
+		fmt.Fprintf(w, "Error build: %s\n", err)
+		return err
 	}
 	if repoName != "" {
 		srv.runtime.repositories.Set(repoName, tag, id, false)
@@ -951,7 +961,7 @@ func postContainersCopy(srv *Server, version float64, w http.ResponseWriter, r *
 	}

 	if err := srv.ContainerCopy(name, copyData.Resource, w); err != nil {
-		utils.Errorf("%s", err.Error())
+		utils.Debugf("%s", err.Error())
 		return err
 	}
 	return nil
@@ -996,29 +1006,18 @@ func makeHttpHandler(srv *Server, logging bool, localMethod string, localRoute s
 		}

 		if err := handlerFunc(srv, version, w, r, mux.Vars(r)); err != nil {
-			utils.Errorf("Error: %s", err)
+			utils.Debugf("Error: %s", err)
 			httpError(w, err)
 		}
 	}
 }

 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 {
+	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,
@@ -1027,7 +1026,6 @@ func getContainersLinks(srv *Server, version float64, w http.ResponseWriter, r *
 		}
 		return nil
 	}, -1)
-
 	if err != nil {
 		return err
 	}
@@ -1060,15 +1058,17 @@ func postContainerLink(srv *Server, version float64, w http.ResponseWriter, r *h
 	}

 	if err := srv.runtime.RenameLink(currentName, newName); err != nil {
-		if strings.HasSuffix(err.Error(), "name are not unique") {
-			return fmt.Errorf("Conflict, %s already exists", newName)
-		}
 		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()

@@ -17,23 +17,18 @@ type APIImages struct {
 }

 type APIInfo struct {
-	Debug                  bool
-	Containers             int
-	Images                 int
-	NFd                    int    `json:",omitempty"`
-	NGoroutines            int    `json:",omitempty"`
-	MemoryLimit            bool   `json:",omitempty"`
-	SwapLimit              bool   `json:",omitempty"`
-	IPv4Forwarding         bool   `json:",omitempty"`
-	LXCVersion             string `json:",omitempty"`
-	NEventsListener        int    `json:",omitempty"`
-	KernelVersion          string `json:",omitempty"`
-	IndexServerAddress     string `json:",omitempty"`
-	DevmapperPool          string `json:",omitempty"`
-	DevmapperDataUsed      uint64 `json:",omitempty"`
-	DevmapperDataTotal     uint64 `json:",omitempty"`
-	DevmapperMetadataUsed  uint64 `json:",omitempty"`
-	DevmapperMetadataTotal uint64 `json:",omitempty"`
+	Debug              bool
+	Containers         int
+	Images             int
+	NFd                int    `json:",omitempty"`
+	NGoroutines        int    `json:",omitempty"`
+	MemoryLimit        bool   `json:",omitempty"`
+	SwapLimit          bool   `json:",omitempty"`
+	IPv4Forwarding     bool   `json:",omitempty"`
+	LXCVersion         string `json:",omitempty"`
+	NEventsListener    int    `json:",omitempty"`
+	KernelVersion      string `json:",omitempty"`
+	IndexServerAddress string `json:",omitempty"`
 }

 type APITop struct {
@@ -5,7 +5,6 @@ import (
 	"bufio"
 	"bytes"
 	"encoding/json"
-	"fmt"
 	"github.com/dotcloud/docker/utils"
 	"io"
 	"net"
@@ -13,7 +12,6 @@ import (
 	"net/http/httptest"
 	"os"
 	"path"
-	"strings"
 	"testing"
 	"time"
 )
@@ -42,25 +40,6 @@ func TestGetBoolParam(t *testing.T) {
 	}
 }

-func TesthttpError(t *testing.T) {
-	r := httptest.NewRecorder()
-
-	httpError(r, fmt.Errorf("No such method"))
-	if r.Code != http.StatusNotFound {
-		t.Fatalf("Expected %d, got %d", http.StatusNotFound, r.Code)
-	}
-
-	httpError(r, fmt.Errorf("This accound hasn't been activated"))
-	if r.Code != http.StatusForbidden {
-		t.Fatalf("Expected %d, got %d", http.StatusForbidden, r.Code)
-	}
-
-	httpError(r, fmt.Errorf("Some error"))
-	if r.Code != http.StatusInternalServerError {
-		t.Fatalf("Expected %d, got %d", http.StatusInternalServerError, r.Code)
-	}
-}
-
 func TestGetVersion(t *testing.T) {
 	var err error
 	runtime := mkRuntime(t)
@@ -112,7 +91,6 @@ func TestGetInfo(t *testing.T) {

 func TestGetEvents(t *testing.T) {
 	runtime := mkRuntime(t)
-	defer nuke(runtime)
 	srv := &Server{
 		runtime:   runtime,
 		events:    make([]utils.JSONMessage, 0, 64),
@@ -265,11 +243,7 @@ func TestGetImagesJSON(t *testing.T) {
 		t.Fatalf("Error expected, received none")
 	}

-	if !strings.HasPrefix(err.Error(), "Bad parameter") {
-		t.Fatalf("Error should starts with \"Bad parameter\"")
-	}
-	http.Error(r4, err.Error(), http.StatusBadRequest)
-
+	httpError(r4, err)
 	if r4.Code != http.StatusBadRequest {
 		t.Fatalf("%d Bad Request expected, received %d\n", http.StatusBadRequest, r4.Code)
 	}
@@ -362,11 +336,9 @@ func TestGetContainersJSON(t *testing.T) {
 	}

 	r := httptest.NewRecorder()
-	setTimeout(t, "getContainerJSON timed out", 5*time.Second, func() {
-		if err := getContainersJSON(srv, APIVERSION, r, req, nil); err != nil {
-			t.Fatal(err)
-		}
-	})
+	if err := getContainersJSON(srv, APIVERSION, r, req, nil); err != nil {
+		t.Fatal(err)
+	}
 	containers := []APIContainers{}
 	if err := json.Unmarshal(r.Body.Bytes(), &containers); err != nil {
 		t.Fatal(err)
@@ -402,7 +374,7 @@ func TestGetContainersExport(t *testing.T) {
 	}

 	r := httptest.NewRecorder()
-	if err := getContainersExport(srv, APIVERSION, r, nil, map[string]string{"name": container.ID}); err != nil {
+	if err = getContainersExport(srv, APIVERSION, r, nil, map[string]string{"name": container.ID}); err != nil {
 		t.Fatal(err)
 	}

@@ -474,7 +446,10 @@ 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 := mkRuntime(t)
+	runtime, err := newTestRuntime()
+	if err != nil {
+		t.Fatal(err)
+	}
 	defer nuke(runtime)

 	srv := &Server{runtime: runtime}
@@ -671,21 +646,13 @@ func TestPostContainersCreate(t *testing.T) {
 		t.Fatal(err)
 	}

-	if err := container.EnsureMounted(); err != nil {
-		t.Fatalf("Unable to mount container: %s", err)
-	}
-
-	if _, err := os.Stat(path.Join(container.RootfsPath(), "test")); err != nil {
+	if _, err := os.Stat(path.Join(container.rwPath(), "test")); err != nil {
 		if os.IsNotExist(err) {
 			utils.Debugf("Err: %s", err)
 			t.Fatalf("The test file has not been created")
 		}
 		t.Fatal(err)
 	}
-
-	if err := container.Unmount(); err != nil {
-		t.Fatalf("Unable to unmount container: %s", err)
-	}
 }

 func TestPostContainersKill(t *testing.T) {
@@ -809,8 +776,6 @@ func TestPostContainersStart(t *testing.T) {
 		t.Fatal(err)
 	}

-	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 {
 		t.Fatal(err)
@@ -80,74 +80,20 @@ func (compression *Compression) Extension() string {
 // Tar creates an archive from the directory at `path`, and returns it as a
 // stream of bytes.
 func Tar(path string, compression Compression) (io.Reader, error) {
-	return TarFilter(path, compression, nil, true, nil)
-}
-
-func escapeName(name string) string {
-	escaped := make([]byte, 0)
-	for i, c := range []byte(name) {
-		if i == 0 && c == '/' {
-			continue
-		}
-		// all printable chars except "-" which is 0x2d
-		if (0x20 <= c && c <= 0x7E) && c != 0x2d {
-			escaped = append(escaped, c)
-		} else {
-			escaped = append(escaped, fmt.Sprintf("\\%03o", c)...)
-		}
-	}
-	return string(escaped)
+	return TarFilter(path, compression, nil)
 }

 // Tar creates an archive from the directory at `path`, only including files whose relative
 // paths are included in `filter`. If `filter` is nil, then all files are included.
-func TarFilter(path string, compression Compression, filter []string, recursive bool, createFiles []string) (io.Reader, error) {
-	args := []string{"tar", "--numeric-owner", "-f", "-", "-C", path, "-T", "-"}
+func TarFilter(path string, compression Compression, filter []string) (io.Reader, error) {
+	args := []string{"tar", "--numeric-owner", "-f", "-", "-C", path}
 	if filter == nil {
 		filter = []string{"."}
 	}
-	args = append(args, "-c"+compression.Flag())
-
-	if !recursive {
-		args = append(args, "--no-recursion")
-	}
-
-	files := ""
 	for _, f := range filter {
-		files = files + escapeName(f) + "\n"
+		args = append(args, "-c"+compression.Flag(), f)
 	}
-
-	tmpDir := ""
-
-	if createFiles != nil {
-		var err error // Can't use := here or we override the outer tmpDir
-		tmpDir, err = ioutil.TempDir("", "docker-tar")
-		if err != nil {
-			return nil, err
-		}
-
-		files = files + "-C" + tmpDir + "\n"
-		for _, f := range createFiles {
-			path := filepath.Join(tmpDir, f)
-			err := os.MkdirAll(filepath.Dir(path), 0600)
-			if err != nil {
-				return nil, err
-			}
-
-			if file, err := os.OpenFile(path, os.O_CREATE, 0600); err != nil {
-				return nil, err
-			} else {
-				file.Close()
-			}
-			files = files + escapeName(f) + "\n"
-		}
-	}
-
-	return CmdStream(exec.Command(args[0], args[1:]...), &files, func() {
-		if tmpDir != "" {
-			_ = os.RemoveAll(tmpDir)
-		}
-	})
+	return CmdStream(exec.Command(args[0], args[1:]...))
 }

 // Untar reads a stream of bytes from `archive`, parses it as a tar archive,
@@ -194,7 +140,7 @@ func Untar(archive io.Reader, path string) error {
 // TarUntar aborts and returns the error.
 func TarUntar(src string, filter []string, dst string) error {
 	utils.Debugf("TarUntar(%s %s %s)", src, filter, dst)
-	archive, err := TarFilter(src, Uncompressed, filter, true, nil)
+	archive, err := TarFilter(src, Uncompressed, filter)
 	if err != nil {
 		return err
 	}
@@ -281,33 +227,13 @@ func CopyFileWithTar(src, dst string) error {
 // CmdStream executes a command, and returns its stdout as a stream.
 // If the command fails to run or doesn't complete successfully, an error
 // will be returned, including anything written on stderr.
-func CmdStream(cmd *exec.Cmd, input *string, atEnd func()) (io.Reader, error) {
-	if input != nil {
-		stdin, err := cmd.StdinPipe()
-		if err != nil {
-			if atEnd != nil {
-				atEnd()
-			}
-			return nil, err
-		}
-		// Write stdin if any
-		go func() {
-			_, _ = stdin.Write([]byte(*input))
-			stdin.Close()
-		}()
-	}
+func CmdStream(cmd *exec.Cmd) (io.Reader, error) {
 	stdout, err := cmd.StdoutPipe()
 	if err != nil {
-		if atEnd != nil {
-			atEnd()
-		}
 		return nil, err
 	}
 	stderr, err := cmd.StderrPipe()
 	if err != nil {
-		if atEnd != nil {
-			atEnd()
-		}
 		return nil, err
 	}
 	pipeR, pipeW := io.Pipe()
@@ -332,9 +258,6 @@ func CmdStream(cmd *exec.Cmd, input *string, atEnd func()) (io.Reader, error) {
 		} else {
 			pipeW.Close()
 		}
-		if atEnd != nil {
-			atEnd()
-		}
 	}()
 	// Run the command and return the pipe
 	if err := cmd.Start(); err != nil {
@@ -14,7 +14,7 @@ import (

 func TestCmdStreamLargeStderr(t *testing.T) {
 	cmd := exec.Command("/bin/sh", "-c", "dd if=/dev/zero bs=1k count=1000 of=/dev/stderr; echo hello")
-	out, err := CmdStream(cmd, nil, nil)
+	out, err := CmdStream(cmd)
 	if err != nil {
 		t.Fatalf("Failed to start command: %s", err)
 	}
@@ -35,7 +35,7 @@ func TestCmdStreamLargeStderr(t *testing.T) {

 func TestCmdStreamBad(t *testing.T) {
 	badCmd := exec.Command("/bin/sh", "-c", "echo hello; echo >&2 error couldn\\'t reverse the phase pulser; exit 1")
-	out, err := CmdStream(badCmd, nil, nil)
+	out, err := CmdStream(badCmd)
 	if err != nil {
 		t.Fatalf("Failed to start command: %s", err)
 	}
@@ -50,7 +50,7 @@ func TestCmdStreamBad(t *testing.T) {

 func TestCmdStreamGood(t *testing.T) {
 	cmd := exec.Command("/bin/sh", "-c", "echo hello; exit 0")
-	out, err := CmdStream(cmd, nil, nil)
+	out, err := CmdStream(cmd)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -75,33 +75,21 @@ func TestCreateAccount(t *testing.T) {
 	}
 }

-func setupTempConfigFile() (*ConfigFile, error) {
-	root, err := ioutil.TempDir("", "docker-test-auth")
-	if err != nil {
-		return nil, err
-	}
-	configFile := &ConfigFile{
-		rootPath: root,
-		Configs:  make(map[string]AuthConfig),
-	}
-
-	for _, registry := range []string{"testIndex", IndexServerAddress()} {
-		configFile.Configs[registry] = AuthConfig{
-			Username: "docker-user",
-			Password: "docker-pass",
-			Email:    "docker@docker.io",
-		}
-	}
-
-	return configFile, nil
-}
-
 func TestSameAuthDataPostSave(t *testing.T) {
-	configFile, err := setupTempConfigFile()
+	root, err := ioutil.TempDir("", "docker-test")
 	if err != nil {
 		t.Fatal(err)
 	}
-	defer os.RemoveAll(configFile.rootPath)
+	configFile := &ConfigFile{
+		rootPath: root,
+		Configs:  make(map[string]AuthConfig, 1),
+	}
+
+	configFile.Configs["testIndex"] = AuthConfig{
+		Username: "docker-user",
+		Password: "docker-pass",
+		Email:    "docker@docker.io",
+	}

 	err = SaveConfig(configFile)
 	if err != nil {
@@ -122,70 +110,3 @@ func TestSameAuthDataPostSave(t *testing.T) {
 		t.Fail()
 	}
 }
-
-func TestResolveAuthConfigIndexServer(t *testing.T) {
-	configFile, err := setupTempConfigFile()
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(configFile.rootPath)
-
-	for _, registry := range []string{"", IndexServerAddress()} {
-		resolved := configFile.ResolveAuthConfig(registry)
-		if resolved != configFile.Configs[IndexServerAddress()] {
-			t.Fail()
-		}
-	}
-}
-
-func TestResolveAuthConfigFullURL(t *testing.T) {
-	configFile, err := setupTempConfigFile()
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(configFile.rootPath)
-
-	registryAuth := AuthConfig{
-		Username: "foo-user",
-		Password: "foo-pass",
-		Email:    "foo@example.com",
-	}
-	localAuth := AuthConfig{
-		Username: "bar-user",
-		Password: "bar-pass",
-		Email:    "bar@example.com",
-	}
-	configFile.Configs["https://registry.example.com/v1/"] = registryAuth
-	configFile.Configs["http://localhost:8000/v1/"] = localAuth
-
-	validRegistries := map[string][]string{
-		"https://registry.example.com/v1/": {
-			"https://registry.example.com/v1/",
-			"http://registry.example.com/v1/",
-			"registry.example.com",
-			"registry.example.com/v1/",
-		},
-		"http://localhost:8000/v1/": {
-			"https://localhost:8000/v1/",
-			"http://localhost:8000/v1/",
-			"localhost:8000",
-			"localhost:8000/v1/",
-		},
-	}
-
-	for configKey, registries := range validRegistries {
-		for _, registry := range registries {
-			var (
-				configured AuthConfig
-				ok         bool
-			)
-			resolved := configFile.ResolveAuthConfig(registry)
-			if configured, ok = configFile.Configs[configKey]; !ok {
-				t.Fail()
-			}
-			if resolved.Email != configured.Email {
-				t.Errorf("%s -> %q != %q\n", registry, resolved.Email, configured.Email)
-			}
-		}
-	}
-}
@@ -176,8 +176,6 @@ func (b *buildFile) CmdEnv(args string) error {
 func (b *buildFile) CmdCmd(args string) error {
 	var cmd []string
 	if err := json.Unmarshal([]byte(args), &cmd); err != nil {
-		// If the unmarshal fails, it is not an error, we just use the
-		// args as a string.
 		utils.Debugf("Error unmarshalling: %s, setting cmd to /bin/sh -c", err)
 		cmd = []string{"/bin/sh", "-c", args}
 	}
@@ -301,7 +299,7 @@ func (b *buildFile) addContext(container *Container, orig, dest string) error {
 		}
 		// First try to unpack the source as an archive
 	} else if err := UntarPath(origPath, destPath); err != nil {
-		utils.Debugf("[tar] Not a directory nor a tar archive. Copying as a file. Untar error from %s to %s: %s", origPath, destPath, err)
+		utils.Debugf("Couldn't untar %s to %s: %s", origPath, destPath, err)
 		// If that fails, just copy it as a regular file
 		if err := os.MkdirAll(path.Dir(destPath), 0755); err != nil {
 			return err
@@ -463,8 +461,9 @@ func (b *buildFile) commit(id string, autoCmd []string, comment string) error {
 var lineContinuation = regexp.MustCompile(`\s*\\\s*\n`)

 func (b *buildFile) Build(context io.Reader) (string, error) {
+	// FIXME: @creack any reason for using /tmp instead of ""?
 	// FIXME: @creack "name" is a terrible variable name
-	name, err := ioutil.TempDir("", "docker-build")
+	name, err := ioutil.TempDir("/tmp", "docker-build")
 	if err != nil {
 		return "", err
 	}
@@ -229,7 +229,10 @@ func TestBuild(t *testing.T) {

 func buildImage(context testContextTemplate, t *testing.T, srv *Server, useCache bool) *Image {
 	if srv == nil {
-		runtime := mkRuntime(t)
+		runtime, err := newTestRuntime()
+		if err != nil {
+			t.Fatal(err)
+		}
 		defer nuke(runtime)

 		srv = &Server{
@@ -367,7 +370,10 @@ func TestBuildEntrypoint(t *testing.T) {
 // testing #1405 - config.Cmd does not get cleaned up if
 // utilizing cache
 func TestBuildEntrypointRunCleanup(t *testing.T) {
-	runtime := mkRuntime(t)
+	runtime, err := newTestRuntime()
+	if err != nil {
+		t.Fatal(err)
+	}
 	defer nuke(runtime)

 	srv := &Server{
@@ -396,7 +402,10 @@ func TestBuildEntrypointRunCleanup(t *testing.T) {
 }

 func TestBuildImageWithCache(t *testing.T) {
-	runtime := mkRuntime(t)
+	runtime, err := newTestRuntime()
+	if err != nil {
+		t.Fatal(err)
+	}
 	defer nuke(runtime)

 	srv := &Server{
@@ -424,7 +433,10 @@ func TestBuildImageWithCache(t *testing.T) {
 }

 func TestBuildImageWithoutCache(t *testing.T) {
-	runtime := mkRuntime(t)
+	runtime, err := newTestRuntime()
+	if err != nil {
+		t.Fatal(err)
+	}
 	defer nuke(runtime)

 	srv := &Server{
@@ -452,7 +464,10 @@ func TestBuildImageWithoutCache(t *testing.T) {
 }

 func TestForbiddenContextPath(t *testing.T) {
-	runtime := mkRuntime(t)
+	runtime, err := newTestRuntime()
+	if err != nil {
+		t.Fatal(err)
+	}
 	defer nuke(runtime)

 	srv := &Server{
@@ -498,7 +513,10 @@ func TestForbiddenContextPath(t *testing.T) {
 }

 func TestBuildADDFileNotFound(t *testing.T) {
-	runtime := mkRuntime(t)
+	runtime, err := newTestRuntime()
+	if err != nil {
+		t.Fatal(err)
+	}
 	defer nuke(runtime)

 	srv := &Server{
@@ -5,7 +5,6 @@ import (
 	"os"
 	"path/filepath"
 	"strings"
-	"syscall"
 )

 type ChangeType int
@@ -34,283 +33,74 @@ func (change *Change) String() string {
 	return fmt.Sprintf("%s %s", kind, change.Path)
 }

-type FileInfo struct {
-	parent   *FileInfo
-	name     string
-	stat     syscall.Stat_t
-	children map[string]*FileInfo
-}
-
-func (root *FileInfo) LookUp(path string) *FileInfo {
-	parent := root
-	if path == "/" {
-		return root
-	}
-
-	pathElements := strings.Split(path, "/")
-	for _, elem := range pathElements {
-		if elem != "" {
-			child := parent.children[elem]
-			if child == nil {
-				return nil
-			}
-			parent = child
-		}
-	}
-	return parent
-}
-
-func (info *FileInfo) path() string {
-	if info.parent == nil {
-		return "/"
-	}
-	return filepath.Join(info.parent.path(), info.name)
-}
-
-func (info *FileInfo) unlink() {
-	if info.parent != nil {
-		delete(info.parent.children, info.name)
-	}
-}
-
-func (info *FileInfo) Remove(path string) bool {
-	child := info.LookUp(path)
-	if child != nil {
-		child.unlink()
-		return true
-	}
-	return false
-}
-
-func (info *FileInfo) isDir() bool {
-	return info.parent == nil || info.stat.Mode&syscall.S_IFDIR == syscall.S_IFDIR
-}
-
-func (info *FileInfo) addChanges(oldInfo *FileInfo, changes *[]Change) {
-	if oldInfo == nil {
-		// add
-		change := Change{
-			Path: info.path(),
-			Kind: ChangeAdd,
-		}
-		*changes = append(*changes, change)
-	}
-
-	// We make a copy so we can modify it to detect additions
-	// also, we only recurse on the old dir if the new info is a directory
-	// otherwise any previous delete/change is considered recursive
-	oldChildren := make(map[string]*FileInfo)
-	if oldInfo != nil && info.isDir() {
-		for k, v := range oldInfo.children {
-			oldChildren[k] = v
-		}
-	}
-
-	for name, newChild := range info.children {
-		oldChild, _ := oldChildren[name]
-		if oldChild != nil {
-			// change?
-			oldStat := &oldChild.stat
-			newStat := &newChild.stat
-			// Note: We can't compare inode or ctime or blocksize here, because these change
-			// when copying a file into a container. However, that is not generally a problem
-			// because any content change will change mtime, and any status change should
-			// be visible when actually comparing the stat fields. The only time this
-			// breaks down is if some code intentionally hides a change by setting
-			// back mtime
-			oldMtime := syscall.NsecToTimeval(oldStat.Mtim.Nano())
-			newMtime := syscall.NsecToTimeval(oldStat.Mtim.Nano())
-			if oldStat.Mode != newStat.Mode ||
-				oldStat.Uid != newStat.Uid ||
-				oldStat.Gid != newStat.Gid ||
-				oldStat.Rdev != newStat.Rdev ||
-				// Don't look at size for dirs, its not a good measure of change
-				(oldStat.Size != newStat.Size && oldStat.Mode&syscall.S_IFDIR != syscall.S_IFDIR) ||
-				oldMtime.Sec != newMtime.Sec ||
-				oldMtime.Usec != newMtime.Usec {
-				change := Change{
-					Path: newChild.path(),
-					Kind: ChangeModify,
-				}
-				*changes = append(*changes, change)
-			}
-
-			// Remove from copy so we can detect deletions
-			delete(oldChildren, name)
-		}
-
-		newChild.addChanges(oldChild, changes)
-	}
-	for _, oldChild := range oldChildren {
-		// delete
-		change := Change{
-			Path: oldChild.path(),
-			Kind: ChangeDelete,
-		}
-		*changes = append(*changes, change)
-	}
-
-}
-
-func (info *FileInfo) Changes(oldInfo *FileInfo) []Change {
+func Changes(layers []string, rw string) ([]Change, error) {
 	var changes []Change
-
-	info.addChanges(oldInfo, &changes)
-
-	return changes
-}
-
-func newRootFileInfo() *FileInfo {
-	root := &FileInfo{
-		name:     "/",
-		children: make(map[string]*FileInfo),
-	}
-	return root
-}
-
-func applyLayer(root *FileInfo, layer string) error {
-	err := filepath.Walk(layer, func(layerPath string, f os.FileInfo, err error) error {
-		if err != nil {
-			return err
-		}
-
-		// Skip root
-		if layerPath == layer {
-			return nil
-		}
-
-		// rebase path
-		relPath, err := filepath.Rel(layer, layerPath)
-		if err != nil {
-			return err
-		}
-		relPath = filepath.Join("/", relPath)
-
-		// Skip AUFS metadata
-		if matched, err := filepath.Match("/.wh..wh.*", relPath); err != nil || matched {
-			if err != nil || !f.IsDir() {
-				return err
-			}
-			return filepath.SkipDir
-		}
-
-		var layerStat syscall.Stat_t
-		err = syscall.Lstat(layerPath, &layerStat)
-		if err != nil {
-			return err
-		}
-
-		file := filepath.Base(relPath)
-		// If there is a whiteout, then the file was removed
-		if strings.HasPrefix(file, ".wh.") {
-			originalFile := file[len(".wh."):]
-			deletePath := filepath.Join(filepath.Dir(relPath), originalFile)
-
-			root.Remove(deletePath)
-		} else {
-			// Added or changed file
-			existing := root.LookUp(relPath)
-			if existing != nil {
-				// Changed file
-				existing.stat = layerStat
-				if !existing.isDir() {
-					// Changed from dir to non-dir, delete all previous files
-					existing.children = make(map[string]*FileInfo)
-				}
-			} else {
-				// Added file
-				parent := root.LookUp(filepath.Dir(relPath))
-				if parent == nil {
-					return fmt.Errorf("collectFileInfo: Unexpectedly no parent for %s", relPath)
-				}
-
-				info := &FileInfo{
-					name:     filepath.Base(relPath),
-					children: make(map[string]*FileInfo),
-					parent:   parent,
-					stat:     layerStat,
-				}
-
-				parent.children[info.name] = info
-			}
-		}
-		return nil
-	})
-	return err
-}
-
-func collectFileInfo(sourceDir string) (*FileInfo, error) {
-	root := newRootFileInfo()
-
-	err := filepath.Walk(sourceDir, func(path string, f os.FileInfo, err error) error {
+	err := filepath.Walk(rw, func(path string, f os.FileInfo, err error) error {
 		if err != nil {
 			return err
 		}

 		// Rebase path
-		relPath, err := filepath.Rel(sourceDir, path)
+		path, err = filepath.Rel(rw, path)
 		if err != nil {
 			return err
 		}
-		relPath = filepath.Join("/", relPath)
+		path = filepath.Join("/", path)

-		if relPath == "/" {
+		// Skip root
+		if path == "/" {
 			return nil
 		}

-		parent := root.LookUp(filepath.Dir(relPath))
-		if parent == nil {
-			return fmt.Errorf("collectFileInfo: Unexpectedly no parent for %s", relPath)
-		}
-
-		info := &FileInfo{
-			name:     filepath.Base(relPath),
-			children: make(map[string]*FileInfo),
-			parent:   parent,
-		}
-
-		if err := syscall.Lstat(path, &info.stat); err != nil {
+		// Skip AUFS metadata
+		if matched, err := filepath.Match("/.wh..wh.*", path); err != nil || matched {
 			return err
 		}

-		parent.children[info.name] = info
+		change := Change{
+			Path: path,
+		}

+		// Find out what kind of modification happened
+		file := filepath.Base(path)
+		// If there is a whiteout, then the file was removed
+		if strings.HasPrefix(file, ".wh.") {
+			originalFile := file[len(".wh."):]
+			change.Path = filepath.Join(filepath.Dir(path), originalFile)
+			change.Kind = ChangeDelete
+		} else {
+			// Otherwise, the file was added
+			change.Kind = ChangeAdd
+
+			// ...Unless it already existed in a top layer, in which case, it's a modification
+			for _, layer := range layers {
+				stat, err := os.Stat(filepath.Join(layer, path))
+				if err != nil && !os.IsNotExist(err) {
+					return err
+				}
+				if err == nil {
+					// The file existed in the top layer, so that's a modification
+
+					// However, if it's a directory, maybe it wasn't actually modified.
+					// If you modify /foo/bar/baz, then /foo will be part of the changed files only because it's the parent of bar
+					if stat.IsDir() && f.IsDir() {
+						if f.Size() == stat.Size() && f.Mode() == stat.Mode() && f.ModTime() == stat.ModTime() {
+							// Both directories are the same, don't record the change
+							return nil
+						}
+					}
+					change.Kind = ChangeModify
+					break
+				}
+			}
+		}
+
+		// Record change
+		changes = append(changes, change)
 		return nil
 	})
-	if err != nil {
+	if err != nil && !os.IsNotExist(err) {
 		return nil, err
 	}
-	return root, nil
-}
-
-// Compare a directory with an array of layer directories it was based on and
-// generate an array of Change objects describing the changes
-func ChangesLayers(newDir string, layers []string) ([]Change, error) {
-	newRoot, err := collectFileInfo(newDir)
-	if err != nil {
-		return nil, err
-	}
-	oldRoot := newRootFileInfo()
-	for i := len(layers) - 1; i >= 0; i-- {
-		layer := layers[i]
-		if err = applyLayer(oldRoot, layer); err != nil {
-			return nil, err
-		}
-	}
-
-	return newRoot.Changes(oldRoot), nil
-}
-
-// Compare two directories and generate an array of Change objects describing the changes
-func ChangesDirs(newDir, oldDir string) ([]Change, error) {
-	oldRoot, err := collectFileInfo(oldDir)
-	if err != nil {
-		return nil, err
-	}
-	newRoot, err := collectFileInfo(newDir)
-	if err != nil {
-		return nil, err
-	}
-
-	return newRoot.Changes(oldRoot), nil
+	return changes, nil
 }
@@ -23,7 +23,6 @@ import (
 	"os/signal"
 	"path/filepath"
 	"reflect"
-	"regexp"
 	"runtime"
 	"sort"
 	"strconv"
@@ -99,6 +98,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"},
 		{"top", "Lookup the running processes of a container"},
 		{"ps", "List containers"},
@@ -304,7 +304,7 @@ func (cli *DockerCli) CmdLogin(args ...string) error {
 	}

 	cli.LoadConfigFile()
-	authconfig, ok := cli.configFile.Configs[serverAddress]
+	authconfig, ok := cli.configFile.Configs[auth.IndexServerAddress()]
 	if !ok {
 		authconfig = auth.AuthConfig{}
 	}
@@ -419,7 +419,7 @@ func (cli *DockerCli) CmdVersion(args ...string) error {
 	var out APIVersion
 	err = json.Unmarshal(body, &out)
 	if err != nil {
-		utils.Errorf("Error unmarshal: body: %s, err: %s\n", body, err)
+		utils.Debugf("Error unmarshal: body: %s, err: %s\n", body, err)
 		return err
 	}
 	if out.Version != "" {
@@ -466,11 +466,6 @@ func (cli *DockerCli) CmdInfo(args ...string) error {

 	fmt.Fprintf(cli.out, "Containers: %d\n", out.Containers)
 	fmt.Fprintf(cli.out, "Images: %d\n", out.Images)
-	if out.DevmapperDataTotal != 0 {
-		fmt.Fprintf(cli.out, "Devmapper disk use: Data: %.1f/%.1f Metadata: %.1f/%.1f\n",
-			float64(out.DevmapperDataUsed)/(1024*1024), float64(out.DevmapperDataTotal)/(1024*1024),
-			float64(out.DevmapperMetadataUsed)/(1024*1024), float64(out.DevmapperMetadataTotal)/(1024*1024))
-	}
 	if out.Debug || os.Getenv("DEBUG") != "" {
 		fmt.Fprintf(cli.out, "Debug mode (server): %v\n", out.Debug)
 		fmt.Fprintf(cli.out, "Debug mode (client): %v\n", os.Getenv("DEBUG") != "")
@@ -479,7 +474,6 @@ func (cli *DockerCli) CmdInfo(args ...string) error {
 		fmt.Fprintf(cli.out, "LXC Version: %s\n", out.LXCVersion)
 		fmt.Fprintf(cli.out, "EventsListeners: %d\n", out.NEventsListener)
 		fmt.Fprintf(cli.out, "Kernel Version: %s\n", out.KernelVersion)
-		fmt.Fprintf(cli.out, "Devmapper pool: %s\n", out.DevmapperPool)
 	}

 	if len(out.IndexServerAddress) != 0 {
@@ -517,7 +511,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 {
@@ -542,6 +537,7 @@ func (cli *DockerCli) CmdRestart(args ...string) error {
 	v.Set("t", strconv.Itoa(*nSeconds))

 	for _, name := range cmd.Args() {
+		name = cleanName(name)
 		_, _, err := cli.call("POST", "/containers/"+name+"/restart?"+v.Encode(), nil)
 		if err != nil {
 			fmt.Fprintf(cli.err, "%s\n", err)
@@ -564,7 +560,8 @@ func (cli *DockerCli) CmdStart(args ...string) error {

 	var encounteredError error
 	for _, name := range args {
-		_, _, err := cli.call("POST", "/containers/"+name+"/start", nil)
+		encName := cleanName(name)
+		_, _, err := cli.call("POST", "/containers/"+encName+"/start", nil)
 		if err != nil {
 			fmt.Fprintf(cli.err, "%s\n", err)
 			encounteredError = fmt.Errorf("Error: failed to start one or more containers")
@@ -586,6 +583,7 @@ func (cli *DockerCli) CmdInspect(args ...string) error {
 	}
 	fmt.Fprintf(cli.out, "[")
 	for i, name := range args {
+		name = cleanName(name)
 		if i > 0 {
 			fmt.Fprintf(cli.out, ",")
 		}
@@ -764,7 +762,8 @@ func (cli *DockerCli) CmdRm(args ...string) error {
 		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 {
@@ -786,6 +785,7 @@ func (cli *DockerCli) CmdKill(args ...string) error {
 	}

 	for _, name := range args {
+		name = cleanName(name)
 		_, _, err := cli.call("POST", "/containers/"+name+"/kill", nil)
 		if err != nil {
 			fmt.Fprintf(cli.err, "%s\n", err)
@@ -997,19 +997,25 @@ func (cli *DockerCli) CmdImages(args ...string) error {
 				out.Tag = "<none>"
 			}

-			if !*noTrunc {
-				out.ID = utils.TruncateID(out.ID)
-			}
-
 			if !*quiet {
-				fmt.Fprintf(w, "%s\t%s\t%s\t%s ago\t", out.Repository, out.Tag, out.ID, utils.HumanDuration(time.Now().Sub(time.Unix(out.Created, 0))))
+				fmt.Fprintf(w, "%s\t%s\t", out.Repository, out.Tag)
+				if *noTrunc {
+					fmt.Fprintf(w, "%s\t", out.ID)
+				} else {
+					fmt.Fprintf(w, "%s\t", utils.TruncateID(out.ID))
+				}
+				fmt.Fprintf(w, "%s ago\t", utils.HumanDuration(time.Now().Sub(time.Unix(out.Created, 0))))
 				if out.VirtualSize > 0 {
 					fmt.Fprintf(w, "%s (virtual %s)\n", utils.HumanSize(out.Size), utils.HumanSize(out.VirtualSize))
 				} else {
 					fmt.Fprintf(w, "%s\n", utils.HumanSize(out.Size))
 				}
 			} else {
-				fmt.Fprintln(w, out.ID)
+				if *noTrunc {
+					fmt.Fprintln(w, out.ID)
+				} else {
+					fmt.Fprintln(w, utils.TruncateID(out.ID))
+				}
 			}
 		}

@@ -1088,17 +1094,13 @@ func (cli *DockerCli) CmdPs(args ...string) error {
 	}

 	for _, out := range outs {
-		if !*noTrunc {
-			out.ID = utils.TruncateID(out.ID)
-		}
+		names := strings.Join(out.Names, ",")
 		if !*quiet {
-			if !*noTrunc {
-				out.Command = utils.Trunc(out.Command, 20)
-				for i := 0; i < len(out.Names); i++ {
-					out.Names[i] = utils.Trunc(out.Names[i], 10)
-				}
+			if *noTrunc {
+				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\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)
 			}
-			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), strings.Join(out.Names, ","))
 			if *size {
 				if out.SizeRootFs > 0 {
 					fmt.Fprintf(w, "%s (virtual %s)\n", utils.HumanSize(out.SizeRw), utils.HumanSize(out.SizeRootFs))
@@ -1109,7 +1111,11 @@ func (cli *DockerCli) CmdPs(args ...string) error {
 				fmt.Fprint(w, "\n")
 			}
 		} else {
-			fmt.Fprintln(w, out.ID)
+			if *noTrunc {
+				fmt.Fprintln(w, out.ID)
+			} else {
+				fmt.Fprintln(w, utils.TruncateID(out.ID))
+			}
 		}
 	}

@@ -1121,17 +1127,11 @@ func (cli *DockerCli) CmdPs(args ...string) error {

 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)
+	body, _, err := cli.call("GET", "/containers/links", nil)
 	if err != nil {
 		return err
 	}
@@ -1148,7 +1148,7 @@ func (cli *DockerCli) CmdLs(args ...string) error {
 		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, "%s\t%s\t%s", link.Path, link.ContainerID, link.Image)
 		fmt.Fprintf(w, "\n")
 	}
 	w.Flush()
@@ -1294,7 +1294,7 @@ func (cli *DockerCli) CmdLogs(args ...string) error {
 		cmd.Usage()
 		return nil
 	}
-	name := cmd.Arg(0)
+	name := cleanName(cmd.Arg(0))

 	if err := cli.hijack("POST", "/containers/"+name+"/attach?logs=1&stdout=1&stderr=1", false, nil, cli.out, cli.err); err != nil {
 		return err
@@ -1312,6 +1312,7 @@ func (cli *DockerCli) CmdAttach(args ...string) error {
 		return nil
 	}
 	name := cmd.Arg(0)
+	name = cleanName(name)
 	body, _, err := cli.call("GET", "/containers/"+name+"/json", nil)
 	if err != nil {
 		return err
@@ -1392,6 +1393,18 @@ func (cli *DockerCli) CmdSearch(args ...string) error {
 // Ports type - Used to parse multiple -p flags
 type ports []int

+// ListOpts type
+type ListOpts []string
+
+func (opts *ListOpts) String() string {
+	return fmt.Sprint(*opts)
+}
+
+func (opts *ListOpts) Set(value string) error {
+	*opts = append(*opts, value)
+	return nil
+}
+
 // AttachOpts stores arguments to 'docker run -a', eg. which streams to attach to
 type AttachOpts map[string]bool

@@ -1587,11 +1600,7 @@ func (cli *DockerCli) CmdRun(args ...string) error {
 	if config.AttachStdin || config.AttachStdout || config.AttachStderr {
 		if config.Tty {
 			if err := cli.monitorTtySize(runResult.ID); err != nil {
-				// When running the test suite, there is no terminal, just pipes.
-				// Discard the error then.
-				if os.Getenv("TEST") != "1" {
-					utils.Errorf("Error monitoring TTY size: %s\n", err)
-				}
+				utils.Debugf("Error monitoring TTY size: %s\n", err)
 			}
 		}

@@ -1700,10 +1709,6 @@ func (cli *DockerCli) call(method, path string, data interface{}) ([]byte, int,
 		params = bytes.NewBuffer(buf)
 	}

-	// fixme: refactor client to support redirect
-	re := regexp.MustCompile("/+")
-	path = re.ReplaceAllString(path, "/")
-
 	req, err := http.NewRequest(method, fmt.Sprintf("/v%g%s", APIVERSION, path), params)
 	if err != nil {
 		return nil, -1, err
@@ -1749,11 +1754,6 @@ func (cli *DockerCli) stream(method, path string, in io.Reader, out io.Writer, h
 	if (method == "POST" || method == "PUT") && in == nil {
 		in = bytes.NewReader([]byte{})
 	}
-
-	// fixme: refactor client to support redirect
-	re := regexp.MustCompile("/+")
-	path = re.ReplaceAllString(path, "/")
-
 	req, err := http.NewRequest(method, fmt.Sprintf("/v%g%s", APIVERSION, path), in)
 	if err != nil {
 		return err
@@ -1810,9 +1810,6 @@ func (cli *DockerCli) stream(method, path string, in io.Reader, out io.Writer, h
 }

 func (cli *DockerCli) hijack(method, path string, setRawTerminal bool, in io.ReadCloser, stdout, stderr io.Writer) error {
-	// fixme: refactor client to support redirect
-	re := regexp.MustCompile("/+")
-	path = re.ReplaceAllString(path, "/")

 	req, err := http.NewRequest(method, fmt.Sprintf("/v%g%s", APIVERSION, path), nil)
 	if err != nil {
@@ -1868,11 +1865,11 @@ func (cli *DockerCli) hijack(method, path string, setRawTerminal bool, in io.Rea
 		}
 		if tcpc, ok := rwc.(*net.TCPConn); ok {
 			if err := tcpc.CloseWrite(); err != nil {
-				utils.Errorf("Couldn't send EOF: %s\n", err)
+				utils.Debugf("Couldn't send EOF: %s\n", err)
 			}
 		} else if unixc, ok := rwc.(*net.UnixConn); ok {
 			if err := unixc.CloseWrite(); err != nil {
-				utils.Errorf("Couldn't send EOF: %s\n", err)
+				utils.Debugf("Couldn't send EOF: %s\n", err)
 			}
 		}
 		// Discard errors due to pipe interruption
@@ -1881,14 +1878,14 @@ func (cli *DockerCli) hijack(method, path string, setRawTerminal bool, in io.Rea

 	if stdout != nil {
 		if err := <-receiveStdout; err != nil {
-			utils.Errorf("Error receiveStdout: %s", err)
+			utils.Debugf("Error receiveStdout: %s", err)
 			return err
 		}
 	}

 	if !cli.isTerminal {
 		if err := <-sendStdin; err != nil {
-			utils.Errorf("Error sendStdin: %s", err)
+			utils.Debugf("Error sendStdin: %s", err)
 			return err
 		}
 	}
@@ -1902,7 +1899,7 @@ func (cli *DockerCli) getTtySize() (int, int) {
 	}
 	ws, err := term.GetWinsize(cli.terminalFd)
 	if err != nil {
-		utils.Errorf("Error getting size: %s", err)
+		utils.Debugf("Error getting size: %s", err)
 		if ws == nil {
 			return 0, 0
 		}
@@ -1919,7 +1916,7 @@ func (cli *DockerCli) resizeTty(id string) {
 	v.Set("h", strconv.Itoa(height))
 	v.Set("w", strconv.Itoa(width))
 	if _, _, err := cli.call("POST", "/containers/"+id+"/resize?"+v.Encode(), nil); err != nil {
-		utils.Errorf("Error resize: %s", err)
+		utils.Debugf("Error resize: %s", err)
 	}
 }

@@ -1990,6 +1987,10 @@ func getExitCode(cli *DockerCli, containerId string) (int, error) {
 	return 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
@@ -400,7 +400,7 @@ func TestRunDetach(t *testing.T) {
 	})

 	// wait for CmdRun to return
-	setTimeout(t, "Waiting for CmdRun timed out", 15*time.Second, func() {
+	setTimeout(t, "Waiting for CmdRun timed out", 5*time.Second, func() {
 		<-ch
 	})

@@ -458,7 +458,7 @@ func TestAttachDetach(t *testing.T) {
 	})

 	// wait for CmdRun to return
-	setTimeout(t, "Waiting for CmdAttach timed out", 15*time.Second, func() {
+	setTimeout(t, "Waiting for CmdAttach timed out", 5*time.Second, func() {
 		<-ch
 	})

@@ -545,7 +545,6 @@ func TestAttachDisconnect(t *testing.T) {

 // Expected behaviour: container gets deleted automatically after exit
 func TestRunAutoRemove(t *testing.T) {
-	t.Skip("Fixme. Skipping test for now, race condition")
 	stdout, stdoutPipe := io.Pipe()
 	cli := NewDockerCli(nil, stdoutPipe, ioutil.Discard, testDaemonProto, testDaemonAddr)
 	defer cleanup(globalRuntime)
@@ -5,14 +5,13 @@ import (
 )

 type DaemonConfig struct {
-	Pidfile                     string
-	GraphPath                   string
-	ProtoAddresses              []string
-	AutoRestart                 bool
-	EnableCors                  bool
-	Dns                         []string
-	EnableIptables              bool
-	BridgeIface                 string
-	DefaultIp                   net.IP
-	InterContainerCommunication bool
+	Pidfile        string
+	GraphPath      string
+	ProtoAddresses []string
+	AutoRestart    bool
+	EnableCors     bool
+	Dns            []string
+	EnableIptables bool
+	BridgeIface    string
+	DefaultIp      net.IP
 }
@@ -42,7 +42,6 @@ type Container struct {
 	ResolvConfPath string
 	HostnamePath   string
 	HostsPath      string
-	FilesystemType string

 	cmd       *exec.Cmd
 	stdout    *utils.WriteBroadcaster
@@ -168,30 +167,30 @@ func ParseRun(args []string, capabilities *Capabilities) (*Config, *HostConfig,

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

-	var flPublish utils.ListOpts
+	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 utils.ListOpts
+	var flExpose ListOpts
 	cmd.Var(&flExpose, "expose", "Expose a port from the container without publishing it to your host")

-	var flEnv utils.ListOpts
+	var flEnv ListOpts
 	cmd.Var(&flEnv, "e", "Set environment variables")

-	var flDns utils.ListOpts
+	var flDns ListOpts
 	cmd.Var(&flDns, "dns", "Set custom dns servers")

 	flVolumes := NewPathOpts()
 	cmd.Var(flVolumes, "v", "Bind mount a volume (e.g. from the host: -v /host:/container, from docker: -v /container)")

-	var flVolumesFrom utils.ListOpts
+	var flVolumesFrom ListOpts
 	cmd.Var(&flVolumesFrom, "volumes-from", "Mount volumes from the specified container")

 	flEntrypoint := cmd.String("entrypoint", "", "Overwrite the default entrypoint of the image")

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

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

 	if err := cmd.Parse(args); err != nil {
@@ -359,17 +358,12 @@ func (settings *NetworkSettings) PortMappingAPI() []APIPort {

 // Inject the io.Reader at the given path. Note: do not close the reader
 func (container *Container) Inject(file io.Reader, pth string) error {
-	if err := container.EnsureMounted(); err != nil {
-		return err
-	}
-
 	// Make sure the directory exists
-	if err := os.MkdirAll(path.Join(container.RootfsPath(), path.Dir(pth)), 0755); err != nil {
+	if err := os.MkdirAll(path.Join(container.rwPath(), path.Dir(pth)), 0755); err != nil {
 		return err
 	}
-
 	// FIXME: Handle permissions/already existing dest
-	dest, err := os.Create(path.Join(container.RootfsPath(), pth))
+	dest, err := os.Create(path.Join(container.rwPath(), pth))
 	if err != nil {
 		return err
 	}
@@ -457,9 +451,9 @@ func (container *Container) startPty() error {
 	// Copy the PTYs to our broadcasters
 	go func() {
 		defer container.stdout.CloseWriters()
-		utils.Debugf("startPty: begin of stdout pipe")
+		utils.Debugf("[startPty] Begin of stdout pipe")
 		io.Copy(container.stdout, ptyMaster)
-		utils.Debugf("startPty: end of stdout pipe")
+		utils.Debugf("[startPty] End of stdout pipe")
 	}()

 	// stdin
@@ -468,9 +462,9 @@ func (container *Container) startPty() error {
 		container.cmd.SysProcAttr.Setctty = true
 		go func() {
 			defer container.stdin.Close()
-			utils.Debugf("startPty: begin of stdin pipe")
+			utils.Debugf("[startPty] Begin of stdin pipe")
 			io.Copy(ptyMaster, container.stdin)
-			utils.Debugf("startPty: end of stdin pipe")
+			utils.Debugf("[startPty] End of stdin pipe")
 		}()
 	}
 	if err := container.cmd.Start(); err != nil {
@@ -490,9 +484,9 @@ func (container *Container) start() error {
 		}
 		go func() {
 			defer stdin.Close()
-			utils.Debugf("start: begin of stdin pipe")
+			utils.Debugf("Begin of stdin pipe [start]")
 			io.Copy(stdin, container.stdin)
-			utils.Debugf("start: end of stdin pipe")
+			utils.Debugf("End of stdin pipe [start]")
 		}()
 	}
 	return container.cmd.Start()
@@ -509,8 +503,8 @@ func (container *Container) Attach(stdin io.ReadCloser, stdinCloser io.Closer, s
 			errors <- err
 		} else {
 			go func() {
-				utils.Debugf("attach: stdin: begin")
-				defer utils.Debugf("attach: stdin: end")
+				utils.Debugf("[start] attach stdin\n")
+				defer utils.Debugf("[end] attach stdin\n")
 				// No matter what, when stdin is closed (io.Copy unblock), close stdout and stderr
 				if container.Config.StdinOnce && !container.Config.Tty {
 					defer cStdin.Close()
@@ -528,7 +522,7 @@ func (container *Container) Attach(stdin io.ReadCloser, stdinCloser io.Closer, s
 					_, err = io.Copy(cStdin, stdin)
 				}
 				if err != nil {
-					utils.Errorf("attach: stdin: %s", err)
+					utils.Debugf("[error] attach stdin: %s\n", err)
 				}
 				// Discard error, expecting pipe error
 				errors <- nil
@@ -542,8 +536,8 @@ func (container *Container) Attach(stdin io.ReadCloser, stdinCloser io.Closer, s
 		} else {
 			cStdout = p
 			go func() {
-				utils.Debugf("attach: stdout: begin")
-				defer utils.Debugf("attach: stdout: end")
+				utils.Debugf("[start] attach stdout\n")
+				defer utils.Debugf("[end]  attach stdout\n")
 				// If we are in StdinOnce mode, then close stdin
 				if container.Config.StdinOnce && stdin != nil {
 					defer stdin.Close()
@@ -552,11 +546,8 @@ func (container *Container) Attach(stdin io.ReadCloser, stdinCloser io.Closer, s
 					defer stdinCloser.Close()
 				}
 				_, err := io.Copy(stdout, cStdout)
-				if err == io.ErrClosedPipe {
-					err = nil
-				}
 				if err != nil {
-					utils.Errorf("attach: stdout: %s", err)
+					utils.Debugf("[error] attach stdout: %s\n", err)
 				}
 				errors <- err
 			}()
@@ -566,8 +557,9 @@ func (container *Container) Attach(stdin io.ReadCloser, stdinCloser io.Closer, s
 			if stdinCloser != nil {
 				defer stdinCloser.Close()
 			}
+
 			if cStdout, err := container.StdoutPipe(); err != nil {
-				utils.Errorf("attach: stdout pipe: %s", err)
+				utils.Debugf("Error stdout pipe")
 			} else {
 				io.Copy(&utils.NopWriter{}, cStdout)
 			}
@@ -580,8 +572,8 @@ func (container *Container) Attach(stdin io.ReadCloser, stdinCloser io.Closer, s
 		} else {
 			cStderr = p
 			go func() {
-				utils.Debugf("attach: stderr: begin")
-				defer utils.Debugf("attach: stderr: end")
+				utils.Debugf("[start] attach stderr\n")
+				defer utils.Debugf("[end]  attach stderr\n")
 				// If we are in StdinOnce mode, then close stdin
 				if container.Config.StdinOnce && stdin != nil {
 					defer stdin.Close()
@@ -590,11 +582,8 @@ func (container *Container) Attach(stdin io.ReadCloser, stdinCloser io.Closer, s
 					defer stdinCloser.Close()
 				}
 				_, err := io.Copy(stderr, cStderr)
-				if err == io.ErrClosedPipe {
-					err = nil
-				}
 				if err != nil {
-					utils.Errorf("attach: stderr: %s", err)
+					utils.Debugf("[error] attach stderr: %s\n", err)
 				}
 				errors <- err
 			}()
@@ -606,7 +595,7 @@ func (container *Container) Attach(stdin io.ReadCloser, stdinCloser io.Closer, s
 			}

 			if cStderr, err := container.StderrPipe(); err != nil {
-				utils.Errorf("attach: stdout pipe: %s", err)
+				utils.Debugf("Error stdout pipe")
 			} else {
 				io.Copy(&utils.NopWriter{}, cStderr)
 			}
@@ -620,29 +609,24 @@ func (container *Container) Attach(stdin io.ReadCloser, stdinCloser io.Closer, s
 		if cStderr != nil {
 			defer cStderr.Close()
 		}
-		// FIXME: how to clean up the stdin goroutine without the unwanted side effect
+		// FIXME: how do clean up the stdin goroutine without the unwanted side effect
 		// of closing the passed stdin? Add an intermediary io.Pipe?
 		for i := 0; i < nJobs; i += 1 {
-			utils.Debugf("attach: waiting for job %d/%d", i+1, nJobs)
+			utils.Debugf("Waiting for job %d/%d\n", i+1, nJobs)
 			if err := <-errors; err != nil {
-				utils.Errorf("attach: job %d returned error %s, aborting all jobs", i+1, err)
+				utils.Debugf("Job %d returned error %s. Aborting all jobs\n", i+1, err)
 				return err
 			}
-			utils.Debugf("attach: job %d completed successfully", i+1)
+			utils.Debugf("Job %d completed successfully\n", i+1)
 		}
-		utils.Debugf("attach: all jobs completed successfully")
+		utils.Debugf("All jobs completed successfully\n")
 		return nil
 	})
 }

-func (container *Container) Start(hostConfig *HostConfig) (err error) {
+func (container *Container) Start(hostConfig *HostConfig) error {
 	container.State.Lock()
 	defer container.State.Unlock()
-	defer func() {
-		if err != nil {
-			container.cleanup()
-		}
-	}()

 	if hostConfig == nil { // in docker start of docker restart we want to reuse previous HostConfigFile
 		hostConfig, _ = container.ReadHostConfig()
@@ -820,7 +804,6 @@ func (container *Container) Start(hostConfig *HostConfig) (err error) {
 	}

 	params := []string{
-		"lxc-start",
 		"-n", container.ID,
 		"-f", container.lxcConfigPath(),
 		"--",
@@ -909,21 +892,7 @@ func (container *Container) Start(hostConfig *HostConfig) (err error) {
 	params = append(params, "--", container.Path)
 	params = append(params, container.Args...)

-	if RootIsShared() {
-		// lxc-start really needs / to be private, or all kinds of stuff break
-		// What we really want is to clone into a new namespace and then
-		// mount / MS_REC|MS_PRIVATE, but since we can't really clone or fork
-		// without exec in go we have to do this horrible shell hack...
-		shellString :=
-			"mount --make-rprivate /; exec " +
-				utils.ShellQuoteArguments(params)
-
-		params = []string{
-			"unshare", "-m", "--", "/bin/sh", "-c", shellString,
-		}
-	}
-
-	container.cmd = exec.Command(params[0], params[1:]...)
+	container.cmd = exec.Command("lxc-start", params...)

 	// Setup logging of stdout and stderr to disk
 	if err := container.runtime.LogToDisk(container.stdout, container.logPath("json"), "stdout"); err != nil {
@@ -980,14 +949,9 @@ func (container *Container) Output() (output []byte, err error) {
 	return output, err
 }

-// Container.StdinPipe returns a WriteCloser which can be used to feed data
-// to the standard input of the container's active process.
-// Container.StdoutPipe and Container.StderrPipe each return a ReadCloser
-// which can be used to retrieve the standard output (and error) generated
-// by the container's active process. The output (and error) are actually
-// copied and delivered to all StdoutPipe and StderrPipe consumers, using
-// a kind of "broadcaster".
-
+// StdinPipe() returns a pipe connected to the standard input of the container's
+// active process.
+//
 func (container *Container) StdinPipe() (io.WriteCloser, error) {
 	return container.stdinPipe, nil
 }
@@ -1088,7 +1052,7 @@ func (container *Container) allocateNetwork(hostConfig *HostConfig) error {
 }

 func (container *Container) releaseNetwork() {
-	if container.Config.NetworkDisabled || container.network == nil {
+	if container.Config.NetworkDisabled {
 		return
 	}
 	container.network.Release()
@@ -1096,7 +1060,7 @@ func (container *Container) releaseNetwork() {
 	container.NetworkSettings = &NetworkSettings{}
 }

-// FIXME: replace this with a control socket within dockerinit
+// FIXME: replace this with a control socket within docker-init
 func (container *Container) waitLxc() error {
 	for {
 		output, err := exec.Command("lxc-info", "-n", container.ID).CombinedOutput()
@@ -1112,24 +1076,20 @@ func (container *Container) waitLxc() error {

 func (container *Container) monitor(hostConfig *HostConfig) {
 	// Wait for the program to exit
+	utils.Debugf("Waiting for process")

-	// If the command does not exist, try to wait via lxc
-	// (This probably happens only for ghost containers, i.e. containers that were running when Docker started)
+	// If the command does not exists, try to wait via lxc
 	if container.cmd == nil {
-		utils.Debugf("monitor: waiting for container %s using waitLxc", container.ID)
 		if err := container.waitLxc(); err != nil {
-			// Discard the error as any signals or non 0 returns will generate an error
-			utils.Debugf("monitor: while waiting for container %s, waitLxc had a problem: %s", container.ShortID(), err)
+			utils.Debugf("%s: Process: %s", container.ID, err)
 		}
 	} else {
-		utils.Debugf("monitor: waiting for container %s using cmd.Wait", container.ID)
 		if err := container.cmd.Wait(); err != nil {
-			// Since non-zero exit status and signal terminations will cause err to be non-nil,
-			// we have to actually discard it. Still, log it anyway, just in case.
-			utils.Debugf("monitor: cmd.Wait reported exit status %s for container %s", err, container.ID)
+			// Discard the error as any signals or non 0 returns will generate an error
+			utils.Debugf("%s: Process: %s", container.ID, err)
 		}
 	}
-	utils.Debugf("monitor: container %s finished", container.ID)
+	utils.Debugf("Process finished")

 	exitCode := -1
 	if container.cmd != nil {
@@ -1144,7 +1104,36 @@ func (container *Container) monitor(hostConfig *HostConfig) {
 	}

 	// Cleanup
-	container.cleanup()
+	container.releaseNetwork()
+
+	// Disable all active links
+	if container.activeLinks != nil {
+		for _, link := range container.activeLinks {
+			link.Disable()
+		}
+	}
+
+	if container.Config.OpenStdin {
+		if err := container.stdin.Close(); err != nil {
+			utils.Debugf("%s: Error close stdin: %s", container.ID, err)
+		}
+	}
+	if err := container.stdout.CloseWriters(); err != nil {
+		utils.Debugf("%s: Error close stdout: %s", container.ID, err)
+	}
+	if err := container.stderr.CloseWriters(); err != nil {
+		utils.Debugf("%s: Error close stderr: %s", container.ID, err)
+	}
+
+	if container.ptyMaster != nil {
+		if err := container.ptyMaster.Close(); err != nil {
+			utils.Debugf("%s: Error closing Pty master: %s", container.ID, err)
+		}
+	}
+
+	if err := container.Unmount(); err != nil {
+		log.Printf("%v: Failed to umount filesystem: %v", container.ID, err)
+	}

 	// Re-create a brand new stdin pipe once the container exited
 	if container.Config.OpenStdin {
@@ -1165,39 +1154,6 @@ func (container *Container) monitor(hostConfig *HostConfig) {
 	}
 }

-func (container *Container) cleanup() {
-	container.releaseNetwork()
-
-	// Disable all active links
-	if container.activeLinks != nil {
-		for _, link := range container.activeLinks {
-			link.Disable()
-		}
-	}
-
-	if container.Config.OpenStdin {
-		if err := container.stdin.Close(); err != nil {
-			utils.Errorf("%s: Error close stdin: %s", container.ID, err)
-		}
-	}
-	if err := container.stdout.CloseWriters(); err != nil {
-		utils.Errorf("%s: Error close stdout: %s", container.ID, err)
-	}
-	if err := container.stderr.CloseWriters(); err != nil {
-		utils.Errorf("%s: Error close stderr: %s", container.ID, err)
-	}
-
-	if container.ptyMaster != nil {
-		if err := container.ptyMaster.Close(); err != nil {
-			utils.Errorf("%s: Error closing Pty master: %s", container.ID, err)
-		}
-	}
-
-	if err := container.Unmount(); err != nil {
-		log.Printf("%v: Failed to umount filesystem: %v", container.ID, err)
-	}
-}
-
 func (container *Container) kill() error {
 	if !container.State.Running {
 		return nil
@@ -1286,15 +1242,7 @@ func (container *Container) Resize(h, w int) error {
 }

 func (container *Container) ExportRw() (Archive, error) {
-	if err := container.EnsureMounted(); err != nil {
-		return nil, err
-	}
-
-	image, err := container.GetImage()
-	if err != nil {
-		return nil, err
-	}
-	return image.ExportChanges(container.runtime, container.RootfsPath(), container.rwPath(), container.ID)
+	return Tar(container.rwPath(), Uncompressed)
 }

 func (container *Container) RwChecksum() (string, error) {
@@ -1336,33 +1284,20 @@ func (container *Container) EnsureMounted() error {
 	return container.Mount()
 }

-func (container *Container) EnsureUnmounted() error {
-	if mounted, err := container.Mounted(); err != nil {
-		return err
-	} else if !mounted {
-		return nil
-	}
-	return container.Unmount()
-}
-
 func (container *Container) Mount() error {
 	image, err := container.GetImage()
 	if err != nil {
 		return err
 	}
-	return image.Mount(container.runtime, container.RootfsPath(), container.rwPath(), container.ID)
+	return image.Mount(container.RootfsPath(), container.rwPath())
 }

 func (container *Container) Changes() ([]Change, error) {
-	if err := container.EnsureMounted(); err != nil {
-		return nil, err
-	}
-
 	image, err := container.GetImage()
 	if err != nil {
 		return nil, err
 	}
-	return image.Changes(container.runtime, container.RootfsPath(), container.rwPath(), container.ID)
+	return image.Changes(container.rwPath())
 }

 func (container *Container) GetImage() (*Image, error) {
@@ -1373,20 +1308,11 @@ func (container *Container) GetImage() (*Image, error) {
 }

 func (container *Container) Mounted() (bool, error) {
-	image, err := container.GetImage()
-	if err != nil {
-		return false, err
-	}
-	return image.Mounted(container.runtime, container.RootfsPath(), container.rwPath())
+	return Mounted(container.RootfsPath())
 }

 func (container *Container) Unmount() error {
-	image, err := container.GetImage()
-	if err != nil {
-		return err
-	}
-	err = image.Unmount(container.runtime, container.RootfsPath(), container.ID)
-	return err
+	return Unmount(container.RootfsPath())
 }

 // ShortID returns a shorthand version of the container's id for convenience.
@@ -1474,7 +1400,7 @@ func (container *Container) Copy(resource string) (Archive, error) {
 		filter = []string{path.Base(basePath)}
 		basePath = path.Dir(basePath)
 	}
-	return TarFilter(basePath, Uncompressed, filter, true, nil)
+	return TarFilter(basePath, Uncompressed, filter)
 }

 // Returns true if the container exposes a certain port
@@ -407,27 +407,6 @@ func TestOutput(t *testing.T) {
 	}
 }

-func TestContainerNetwork(t *testing.T) {
-	runtime := mkRuntime(t)
-	defer nuke(runtime)
-	container, _, err := runtime.Create(
-		&Config{
-			Image: GetTestImage(runtime).ID,
-			Cmd:   []string{"ping", "-c", "1", "127.0.0.1"},
-		},
-	)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer runtime.Destroy(container)
-	if err := container.Run(); err != nil {
-		t.Fatal(err)
-	}
-	if container.State.ExitCode != 0 {
-		t.Errorf("Unexpected ping 127.0.0.1 exit code %d (expected 0)", container.State.ExitCode)
-	}
-}
-
 func TestKillDifferentUser(t *testing.T) {
 	runtime := mkRuntime(t)
 	defer nuke(runtime)
@@ -1093,6 +1072,7 @@ func TestLXCConfig(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
+	defer runtime.Destroy(container)
 	container.generateLXCConfig(nil)
 	grepFile(t, container.lxcConfigPath(), "lxc.utsname = foobar")
 	grepFile(t, container.lxcConfigPath(),
@@ -1209,7 +1189,7 @@ func BenchmarkRunParallel(b *testing.B) {
 }

 func tempDir(t *testing.T) string {
-	tmpDir, err := ioutil.TempDir("", "docker-test-container")
+	tmpDir, err := ioutil.TempDir("", "docker-test")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -1,23 +0,0 @@
-# [PackageDev] target_format: plist, ext: tmLanguage
---
-name: Dockerfile
-scopeName: source.dockerfile
-uuid: a39d8795-59d2-49af-aa00-fe74ee29576e
-
-patterns:
-# Keywords
- name: keyword.control.dockerfile
-  match: ^\s*(FROM|MAINTAINER|RUN|CMD|EXPOSE|ENV|ADD)\s
- name: keyword.operator.dockerfile
-  match: ^\s*(ENTRYPOINT|VOLUME|USER|WORKDIR)\s
-# String
- name: string.quoted.double.dockerfile
-  begin: "\""
-  end: "\""
-  patterns:
-  - name: constant.character.escaped.dockerfile
-    match: \\.
-# Comment
- name: comment.block.dockerfile
-  match: ^\s*#.*$
-...
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>name</key>
-	<string>Dockerfile</string>
-	<key>patterns</key>
-	<array>
-		<dict>
-			<key>match</key>
-			<string>^\s*(FROM|MAINTAINER|RUN|CMD|EXPOSE|ENV|ADD)\s</string>
-			<key>name</key>
-			<string>keyword.control.dockerfile</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>^\s*(ENTRYPOINT|VOLUME|USER|WORKDIR)\s</string>
-			<key>name</key>
-			<string>keyword.operator.dockerfile</string>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>"</string>
-			<key>end</key>
-			<string>"</string>
-			<key>name</key>
-			<string>string.quoted.double.dockerfile</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>match</key>
-					<string>\\.</string>
-					<key>name</key>
-					<string>constant.character.escaped.dockerfile</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>^\s*#.*$</string>
-			<key>name</key>
-			<string>comment.block.dockerfile</string>
-		</dict>
-	</array>
-	<key>scopeName</key>
-	<string>source.dockerfile</string>
-	<key>uuid</key>
-	<string>a39d8795-59d2-49af-aa00-fe74ee29576e</string>
-</dict>
-</plist>
@@ -1 +0,0 @@
-Asbjorn Enge <asbjorn@hanafjedle.net> (@asbjornenge)
@@ -1,9 +0,0 @@
-# Dockerfile.tmLanguage
-
-Pretty basic Dockerfile.tmLanguage for Sublime Text syntax highlighting.
-
-PR's with syntax updates, suggestions etc. are all very much appreciated!
-
-I'll get to making this installable via Package Control soon!
-
-enjoy.
@@ -1 +1,2 @@
+Kawsar Saiyeed <kawsar.saiyeed@projiris.com> (@KSid)
 Tianon Gravi <admwiggin@gmail.com> (@tianon)
@@ -1,242 +0,0 @@
-#compdef docker 
-#
-# zsh completion for docker (http://docker.io)
-#
-# version:  0.2.2
-# author:   Felix Riedel
-# license:  BSD License
-# github:   https://github.com/felixr/docker-zsh-completion
-#
-
-__parse_docker_list() {
-    sed -e '/^ID/d' -e 's/[ ]\{2,\}/|/g' -e 's/ \([hdwm]\)\(inutes\|ays\|ours\|eeks\)/\1/' | awk ' BEGIN {FS="|"} { printf("%s:%7s, %s\n", $1, $4, $2)}'
-}
-
-__docker_stoppedcontainers() {
-    local expl
-    declare -a stoppedcontainers 
-    stoppedcontainers=(${(f)"$(docker ps -a | grep --color=never 'Exit' |  __parse_docker_list )"})
-    _describe -t containers-stopped "Stopped Containers" stoppedcontainers 
-}
-
-__docker_runningcontainers() {
-    local expl
-    declare -a containers 
-
-    containers=(${(f)"$(docker ps | __parse_docker_list)"})
-    _describe -t containers-active "Running Containers" containers 
-}
-
-__docker_containers () {
-    __docker_stoppedcontainers 
-    __docker_runningcontainers
-}
-
-__docker_images () {
-    local expl
-    declare -a images
-    images=(${(f)"$(docker images | awk '(NR > 1){printf("%s\\:%s\n", $1,$2)}')"})
-    images=($images ${(f)"$(docker images | awk '(NR > 1){printf("%s:%-15s in %s\n", $3,$2,$1)}')"})
-    _describe -t docker-images "Images" images
-}
-
-__docker_tags() {
-    local expl
-    declare -a tags
-    tags=(${(f)"$(docker images | awk '(NR>1){print $2}'| sort | uniq)"})
-    _describe -t docker-tags "tags" tags
-}
-
-__docker_search() {
-    # declare -a dockersearch
-    local cache_policy
-    zstyle -s ":completion:${curcontext}:" cache-policy cache_policy
-    if [[ -z "$cache_policy" ]]; then
-        zstyle ":completion:${curcontext}:" cache-policy __docker_caching_policy 
-    fi
-
-    local searchterm cachename
-    searchterm="${words[$CURRENT]%/}"
-    cachename=_docker-search-$searchterm
-
-    local expl
-    local -a result 
-    if ( [[ ${(P)+cachename} -eq 0 ]] || _cache_invalid ${cachename#_} ) \
-        && ! _retrieve_cache ${cachename#_}; then
-        _message "Searching for ${searchterm}..."
-        result=(${(f)"$(docker search ${searchterm} | awk '(NR>2){print $1}')"})
-        _store_cache ${cachename#_} result
-    fi 
-    _wanted dockersearch expl 'Available images' compadd -a result 
-}
-
-__docker_caching_policy()
-{
-  # oldp=( "$1"(Nmh+24) )     # 24 hour
-  oldp=( "$1"(Nmh+1) )     # 24 hour
-  (( $#oldp ))
-}
-
-
-__docker_repositories () {
-    local expl
-    declare -a repos
-    repos=(${(f)"$(docker images | sed -e '1d' -e 's/[ ].*//' | sort | uniq)"})
-    _describe -t docker-repos "Repositories" repos
-}
-
-__docker_commands () {
-    # local -a  _docker_subcommands
-    local cache_policy
-
-    zstyle -s ":completion:${curcontext}:" cache-policy cache_policy
-    if [[ -z "$cache_policy" ]]; then
-        zstyle ":completion:${curcontext}:" cache-policy __docker_caching_policy 
-    fi
-
-    if ( [[ ${+_docker_subcommands} -eq 0 ]] || _cache_invalid docker_subcommands) \
-        && ! _retrieve_cache docker_subcommands; 
-    then
-        _docker_subcommands=(${${(f)"$(_call_program commands 
-        docker 2>&1 | sed -e '1,6d' -e '/^[ ]*$/d' -e 's/[ ]*\([^ ]\+\)\s*\([^ ].*\)/\1:\2/' )"}})
-        _docker_subcommands=($_docker_subcommands 'help:Show help for a command') 
-        _store_cache docker_subcommands _docker_subcommands
-    fi
-    _describe -t docker-commands "docker command" _docker_subcommands
-}
-
-__docker_subcommand () {
-    local -a _command_args
-    case "$words[1]" in
-        (attach|wait)
-            _arguments ':containers:__docker_runningcontainers'
-            ;;
-        (build)
-            _arguments \
-                '-t=-:repository:__docker_repositories' \
-                ':path or URL:_directories'
-            ;;
-        (commit)
-            _arguments \
-                ':container:__docker_containers' \
-                ':repository:__docker_repositories' \
-                ':tag: '
-            ;;
-        (diff|export|logs)
-            _arguments '*:containers:__docker_containers'
-            ;;
-        (history)
-            _arguments '*:images:__docker_images'
-            ;;
-        (images)
-            _arguments \
-                '-a[Show all images]' \
-                ':repository:__docker_repositories'
-            ;;
-        (inspect)
-            _arguments '*:containers:__docker_containers'
-            ;;
-        (history)
-            _arguments ':images:__docker_images'
-            ;;
-        (insert)
-            _arguments '1:containers:__docker_containers' \
-                       '2:URL:(http:// file://)' \
-                       '3:file:_files'
-            ;;
-        (kill)
-            _arguments '*:containers:__docker_runningcontainers'
-            ;;
-        (port)
-            _arguments '1:containers:__docker_runningcontainers'
-            ;;
-        (start)
-            _arguments '*:containers:__docker_stoppedcontainers'
-            ;;
-        (rm)
-            _arguments '-v[Remove the volumes associated to the container]' \
-                '*:containers:__docker_stoppedcontainers'
-            ;;
-        (rmi)
-            _arguments '-v[Remove the volumes associated to the container]' \
-                '*:images:__docker_images'
-            ;;
-        (top)
-            _arguments '1:containers:__docker_runningcontainers'
-            ;;
-        (restart|stop)
-            _arguments '-t=-[Number of seconds to try to stop for before killing the container]:seconds to before killing:(1 5 10 30 60)' \
-                '*:containers:__docker_runningcontainers'
-            ;;
-        (top)
-            _arguments ':containers:__docker_runningcontainers'
-            ;;
-        (ps)
-            _arguments '-a[Show all containers. Only running containers are shown by default]' \
-                '-h[Show help]' \
-                '-beforeId=-[Show only container created before Id, include non-running one]:containers:__docker_containers' \
-            '-n=-[Show n last created containers, include non-running one]:n:(1 5 10 25 50)'
-            ;;
-        (tag)
-            _arguments \
-                '-f[force]'\
-                ':image:__docker_images'\
-                ':repository:__docker_repositories' \
-                ':tag:__docker_tags'
-            ;;
-        (run)
-            _arguments \
-                '-a=-[Attach to stdin, stdout or stderr]:toggle:(true false)' \
-                '-c=-[CPU shares (relative weight)]:CPU shares: ' \
-                '-d[Detached mode: leave the container running in the background]' \
-                '*-dns=[Set custom dns servers]:dns server: ' \
-                '*-e=[Set environment variables]:environment variable: ' \
-                '-entrypoint=-[Overwrite the default entrypoint of the image]:entry point: ' \
-                '-h=-[Container host name]:hostname:_hosts' \
-                '-i[Keep stdin open even if not attached]' \
-                '-m=-[Memory limit (in bytes)]:limit: ' \
-                '*-p=-[Expose a container''s port to the host]:port:_ports' \
-                '-t=-[Allocate a pseudo-tty]:toggle:(true false)' \
-                '-u=-[Username or UID]:user:_users' \
-                '*-v=-[Bind mount a volume (e.g. from the host: -v /host:/container, from docker: -v /container)]:volume: '\
-                '-volumes-from=-[Mount volumes from the specified container]:volume: ' \
-                '(-):images:__docker_images' \
-                '(-):command: _command_names -e' \
-                '*::arguments: _normal'
-                ;;
-        (pull|search)
-            _arguments ':name:__docker_search'
-            ;;
-        (help)
-            _arguments ':subcommand:__docker_commands'
-            ;;
-        (*)
-            _message 'Unknown sub command'
-    esac
-
-}
-
-_docker () {
-    local curcontext="$curcontext" state line
-    typeset -A opt_args
-
-    _arguments -C \
-      '-H=-[tcp://host:port to bind/connect to]:socket: ' \
-         '(-): :->command' \
-         '(-)*:: :->option-or-argument' 
-
-    if (( CURRENT == 1 )); then
-
-    fi
-    case $state in 
-        (command)
-            __docker_commands
-            ;;
-        (option-or-argument)
-            curcontext=${curcontext%:*:*}:docker-$words[1]:
-            __docker_subcommand 
-            ;;
-    esac
-}
-
-_docker "$@"
@@ -341,7 +341,7 @@ _docker_pull()

 _docker_push()
 {
-	__docker_image_repos
+	return
 }

 _docker_restart()
@@ -0,0 +1,61 @@
+#!/bin/sh
+# This script is meant for quick & easy install via 'curl URL-OF-SCRIPT | sh'
+# Original version by Jeff Lindsay <progrium@gmail.com>
+# Revamped by Jerome Petazzoni <jerome@dotcloud.com>
+#
+# This script canonical location is https://get.docker.io/; to update it, run:
+# s3cmd put -m text/x-shellscript -P install.sh s3://get.docker.io/index
+
+echo "Ensuring basic dependencies are installed..."
+apt-get -qq update
+apt-get -qq install lxc wget
+
+echo "Looking in /proc/filesystems to see if we have AUFS support..."
+if grep -q aufs /proc/filesystems
+then
+    echo "Found."
+else
+    echo "Ahem, it looks like the current kernel does not support AUFS."
+    echo "Let's see if we can load the AUFS module with modprobe..."
+    if modprobe aufs
+    then
+        echo "Module loaded."
+    else
+        echo "Ahem, things didn't turn out as expected."
+        KPKG=linux-image-extra-$(uname -r)
+        echo "Trying to install $KPKG..."
+        if apt-get -qq install $KPKG
+        then
+            echo "Installed."
+        else
+            echo "Oops, we couldn't install the -extra kernel."
+            echo "Are you sure you are running a supported version of Ubuntu?"
+            echo "Proceeding anyway, but Docker will probably NOT WORK!"
+        fi
+    fi
+fi
+
+echo "Downloading docker binary to /usr/local/bin..."
+curl -s https://get.docker.io/builds/$(uname -s)/$(uname -m)/docker-latest \
+    > /usr/local/bin/docker
+chmod +x /usr/local/bin/docker
+
+if [ -f /etc/init/dockerd.conf ]
+then
+  echo "Upstart script already exists."
+else
+  echo "Creating /etc/init/dockerd.conf..."
+  cat >/etc/init/dockerd.conf <<EOF
+description "Docker daemon"
+start on filesystem and started lxc-net
+stop on runlevel [!2345]
+respawn
+exec /usr/local/bin/docker -d
+EOF
+fi
+
+echo "Starting dockerd..."
+start dockerd > /dev/null
+
+echo "Done."
+echo
@@ -1,67 +0,0 @@
-#!/bin/bash
-# Generate a minimal filesystem for archlinux and load it into the local
-# docker as "archlinux"
-# requires root
-set -e
-
-PACSTRAP=$(which pacstrap)
-[ "$PACSTRAP" ] || {
-    echo "Could not find pacstrap. Run pacman -S arch-install-scripts"
-    exit 1
-}
-EXPECT=$(which expect)
-[ "$EXPECT" ] || {
-    echo "Could not find expect. Run pacman -S expect"
-    exit 1
-}
-
-ROOTFS=~/rootfs-arch-$$-$RANDOM
-mkdir $ROOTFS
-
-#packages to ignore for space savings
-PKGIGNORE=linux,jfsutils,lvm2,cryptsetup,groff,man-db,man-pages,mdadm,pciutils,pcmciautils,reiserfsprogs,s-nail,xfsprogs
- 
-expect <<EOF
-  set timeout 60
-  set send_slow {1 1}
-  spawn pacstrap -c -d -G -i $ROOTFS base haveged --ignore $PKGIGNORE
-  expect {
-    "Install anyway?" { send n\r; exp_continue }
-    "(default=all)" { send \r; exp_continue }
-    "Proceed with installation?" { send "\r"; exp_continue }
-    "skip the above package" {send "y\r"; exp_continue }
-    "checking" { exp_continue }
-    "loading" { exp_continue }
-    "installing" { exp_continue }
-  }
-EOF
-
-arch-chroot $ROOTFS /bin/sh -c "haveged -w 1024; pacman-key --init; pkill haveged; pacman -Rs --noconfirm haveged; pacman-key --populate archlinux"
-arch-chroot $ROOTFS /bin/sh -c "ln -s /usr/share/zoneinfo/UTC /etc/localtime"
-cat > $ROOTFS/etc/locale.gen <<DELIM
-en_US.UTF-8 UTF-8
-en_US ISO-8859-1
-DELIM
-arch-chroot $ROOTFS locale-gen
-arch-chroot $ROOTFS /bin/sh -c 'echo "Server = http://mirrors.kernel.org/archlinux/\$repo/os/\$arch" > /etc/pacman.d/mirrorlist'
-
-# udev doesn't work in containers, rebuild /dev
-DEV=${ROOTFS}/dev
-mv ${DEV} ${DEV}.old
-mkdir -p ${DEV}
-mknod -m 666 ${DEV}/null c 1 3
-mknod -m 666 ${DEV}/zero c 1 5
-mknod -m 666 ${DEV}/random c 1 8
-mknod -m 666 ${DEV}/urandom c 1 9
-mkdir -m 755 ${DEV}/pts
-mkdir -m 1777 ${DEV}/shm
-mknod -m 666 ${DEV}/tty c 5 0
-mknod -m 600 ${DEV}/console c 5 1
-mknod -m 666 ${DEV}/tty0 c 4 0
-mknod -m 666 ${DEV}/full c 1 7
-mknod -m 600 ${DEV}/initctl p
-mknod -m 666 ${DEV}/ptmx c 5 2
-
-tar -C $ROOTFS -c . | docker import - archlinux
-docker run -i -t archlinux echo Success.
-rm -rf $ROOTFS
@@ -10,18 +10,12 @@ variant='minbase'
 include='iproute,iputils-ping'

 repo="$1"
-suite="$2"
+suite="${2:-$stableSuite}"
 mirror="${3:-}" # stick to the default debootstrap mirror if one is not provided

-if [ ! "$repo" ] || [ ! "$suite" ]; then
-	echo >&2 "usage: $0 repo suite [mirror]"
-	echo >&2
+if [ ! "$repo" ]; then
+	echo >&2 "usage: $0 repo [suite [mirror]]"
 	echo >&2 "   ie: $0 tianon/debian squeeze"
-	echo >&2 "       $0 tianon/debian squeeze http://ftp.uk.debian.org/debian/"
-	echo >&2
-	echo >&2 "   ie: $0 tianon/ubuntu precise"
-	echo >&2 "       $0 tianon/ubuntu precise http://mirrors.melbourne.co.uk/ubuntu/"
-	echo >&2
 	exit 1
 fi

@@ -39,12 +33,8 @@ sudo debootstrap --verbose --variant="$variant" --include="$include" "$suite" "$
 cd "$target"

 # prevent init scripts from running during install/update
-#  policy-rc.d (for most scripts)
 echo $'#!/bin/sh\nexit 101' | sudo tee usr/sbin/policy-rc.d > /dev/null
 sudo chmod +x usr/sbin/policy-rc.d
-#  initctl (for some pesky upstart scripts)
-sudo chroot . dpkg-divert --local --rename --add /sbin/initctl
-sudo ln -sf /bin/true sbin/initctl
 # see https://github.com/dotcloud/docker/issues/446#issuecomment-16953173

 # shrink the image, since apt makes us fat (wheezy: ~157.5MB vs ~120MB)
@@ -52,16 +42,9 @@ sudo chroot . apt-get clean

 # while we're at it, apt is unnecessarily slow inside containers
 #  this forces dpkg not to call sync() after package extraction and speeds up install
-#    the benefit is huge on spinning disks, and the penalty is nonexistent on SSD or decent server virtualization
 echo 'force-unsafe-io' | sudo tee etc/dpkg/dpkg.cfg.d/02apt-speedup > /dev/null
-#  we want to effectively run "apt-get clean" after every install to keep images small
-echo 'DPkg::Post-Invoke {"/bin/rm -f /var/cache/apt/archives/*.deb || true";};' | sudo tee etc/apt/apt.conf.d/no-cache > /dev/null
-
-# helpful undo lines for each the above tweaks (for lack of a better home to keep track of them):
-#  rm /usr/sbin/policy-rc.d
-#  rm /sbin/initctl; dpkg-divert --rename --remove /sbin/initctl
-#  rm /etc/dpkg/dpkg.cfg.d/02apt-speedup
-#  rm /etc/apt/apt.conf.d/no-cache
+#  we don't need an apt cache in a container
+echo 'Acquire::http {No-Cache=True;};' | sudo tee etc/apt/apt.conf.d/no-cache > /dev/null

 # create the image (and tag $repo:$suite)
 sudo tar -c . | docker import - $repo $suite
@@ -1,22 +0,0 @@
-Copyright (c) 2013 Honza Pokorny
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
@@ -1,23 +0,0 @@
-dockerfile.vim
-==============
-
-Syntax highlighting for Dockerfiles
-
-Installation
------------
-
-Via pathogen, the usual way...
-
-Features
--------
-
-The syntax highlighting includes:
-
-* The directives (e.g. `FROM`)
-* Strings
-* Comments
-
-License
-------
-
-BSD, short and sweet
@@ -1,18 +0,0 @@
-*dockerfile.txt*  Syntax highlighting for Dockerfiles
-
-Author: Honza Pokorny <http://honza.ca>
-License: BSD
-
-INSTALLATION                                                     *installation*
-
-Drop it on your Pathogen path and you're all set.
-
-FEATURES                                                             *features*
-
-The syntax highlighting includes:
-
-* The directives (e.g. FROM)
-* Strings
-* Comments
-
- vim:tw=78:et:ft=help:norl:
@@ -1 +0,0 @@
-au BufNewFile,BufRead Dockerfile set filetype=dockerfile
@@ -1,22 +0,0 @@
-" dockerfile.vim - Syntax highlighting for Dockerfiles
-" Maintainer:   Honza Pokorny <http://honza.ca>
-" Version:      0.5
-
-
-if exists("b:current_syntax")
-    finish
-endif
-
-let b:current_syntax = "dockerfile"
-
-syntax case ignore
-
-syntax match dockerfileKeyword /\v^\s*(FROM|MAINTAINER|RUN|CMD|EXPOSE|ENV|ADD)\s/
-syntax match dockerfileKeyword /\v^\s*(ENTRYPOINT|VOLUME|USER|WORKDIR)\s/
-highlight link dockerfileKeyword Keyword
-
-syntax region dockerfileString start=/\v"/ skip=/\v\\./ end=/\v"/
-highlight link dockerfileString String
-
-syntax match dockerfileComment "\v^\s*#.*$"
-highlight link dockerfileComment Comment
@@ -1,850 +0,0 @@
-package devmapper
-
-import (
-	"encoding/json"
-	"fmt"
-	"github.com/dotcloud/docker/utils"
-	"io"
-	"io/ioutil"
-	"os"
-	"os/exec"
-	"path"
-	"path/filepath"
-	"strconv"
-	"sync"
-	"syscall"
-	"time"
-)
-
-var (
-	DefaultDataLoopbackSize     int64  = 100 * 1024 * 1024 * 1024
-	DefaultMetaDataLoopbackSize int64  = 2 * 1024 * 1024 * 1024
-	DefaultBaseFsSize           uint64 = 10 * 1024 * 1024 * 1024
-)
-
-type DevInfo struct {
-	Hash          string     `json:"-"`
-	DeviceId      int        `json:"device_id"`
-	Size          uint64     `json:"size"`
-	TransactionId uint64     `json:"transaction_id"`
-	Initialized   bool       `json:"initialized"`
-	devices       *DeviceSet `json:"-"`
-}
-
-type MetaData struct {
-	Devices map[string]*DevInfo `json:devices`
-}
-
-type DeviceSet struct {
-	MetaData
-	sync.Mutex
-	initialized      bool
-	root             string
-	devicePrefix     string
-	TransactionId    uint64
-	NewTransactionId uint64
-	nextFreeDevice   int
-	activeMounts     map[string]int
-}
-
-type DiskUsage struct {
-	Used  uint64
-	Total uint64
-}
-
-type Status struct {
-	PoolName         string
-	DataLoopback     string
-	MetadataLoopback string
-	Data             DiskUsage
-	Metadata         DiskUsage
-}
-
-func getDevName(name string) string {
-	return "/dev/mapper/" + name
-}
-
-func (info *DevInfo) Name() string {
-	hash := info.Hash
-	if hash == "" {
-		hash = "base"
-	}
-	return fmt.Sprintf("%s-%s", info.devices.devicePrefix, hash)
-}
-
-func (info *DevInfo) DevName() string {
-	return getDevName(info.Name())
-}
-
-func (devices *DeviceSet) loopbackDir() string {
-	return path.Join(devices.root, "devicemapper")
-}
-
-func (devices *DeviceSet) jsonFile() string {
-	return path.Join(devices.loopbackDir(), "json")
-}
-
-func (devices *DeviceSet) getPoolName() string {
-	return devices.devicePrefix + "-pool"
-}
-
-func (devices *DeviceSet) getPoolDevName() string {
-	return getDevName(devices.getPoolName())
-}
-
-func (devices *DeviceSet) hasImage(name string) bool {
-	dirname := devices.loopbackDir()
-	filename := path.Join(dirname, name)
-
-	_, err := os.Stat(filename)
-	return err == nil
-}
-
-// ensureImage creates a sparse file of <size> bytes at the path
-// <root>/devicemapper/<name>.
-// If the file already exists, it does nothing.
-// Either way it returns the full path.
-func (devices *DeviceSet) ensureImage(name string, size int64) (string, error) {
-	dirname := devices.loopbackDir()
-	filename := path.Join(dirname, name)
-
-	if err := os.MkdirAll(dirname, 0700); err != nil && !os.IsExist(err) {
-		return "", err
-	}
-
-	if _, err := os.Stat(filename); err != nil {
-		if !os.IsNotExist(err) {
-			return "", err
-		}
-		utils.Debugf("Creating loopback file %s for device-manage use", filename)
-		file, err := os.OpenFile(filename, os.O_RDWR|os.O_CREATE, 0600)
-		if err != nil {
-			return "", err
-		}
-
-		if err = file.Truncate(size); err != nil {
-			return "", err
-		}
-	}
-	return filename, nil
-}
-
-func (devices *DeviceSet) allocateDeviceId() int {
-	// TODO: Add smarter reuse of deleted devices
-	id := devices.nextFreeDevice
-	devices.nextFreeDevice = devices.nextFreeDevice + 1
-	return id
-}
-
-func (devices *DeviceSet) allocateTransactionId() uint64 {
-	devices.NewTransactionId = devices.NewTransactionId + 1
-	return devices.NewTransactionId
-}
-
-func (devices *DeviceSet) saveMetadata() error {
-	jsonData, err := json.Marshal(devices.MetaData)
-	if err != nil {
-		return fmt.Errorf("Error encoding metaadata to json: %s", err)
-	}
-	tmpFile, err := ioutil.TempFile(filepath.Dir(devices.jsonFile()), ".json")
-	if err != nil {
-		return fmt.Errorf("Error creating metadata file: %s", err)
-	}
-
-	n, err := tmpFile.Write(jsonData)
-	if err != nil {
-		return fmt.Errorf("Error writing metadata to %s: %s", tmpFile.Name(), err)
-	}
-	if n < len(jsonData) {
-		return io.ErrShortWrite
-	}
-	if err := tmpFile.Sync(); err != nil {
-		return fmt.Errorf("Error syncing metadata file %s: %s", tmpFile.Name(), err)
-	}
-	if err := tmpFile.Close(); err != nil {
-		return fmt.Errorf("Error closing metadata file %s: %s", tmpFile.Name(), err)
-	}
-	if err := os.Rename(tmpFile.Name(), devices.jsonFile()); err != nil {
-		return fmt.Errorf("Error committing metadata file", err)
-	}
-
-	if devices.NewTransactionId != devices.TransactionId {
-		if err = setTransactionId(devices.getPoolDevName(), devices.TransactionId, devices.NewTransactionId); err != nil {
-			return fmt.Errorf("Error setting devmapper transition ID: %s", err)
-		}
-		devices.TransactionId = devices.NewTransactionId
-	}
-	return nil
-}
-
-func (devices *DeviceSet) registerDevice(id int, hash string, size uint64) (*DevInfo, error) {
-	utils.Debugf("registerDevice(%v, %v)", id, hash)
-	info := &DevInfo{
-		Hash:          hash,
-		DeviceId:      id,
-		Size:          size,
-		TransactionId: devices.allocateTransactionId(),
-		Initialized:   false,
-		devices:       devices,
-	}
-
-	devices.Devices[hash] = info
-	if err := devices.saveMetadata(); err != nil {
-		// Try to remove unused device
-		delete(devices.Devices, hash)
-		return nil, err
-	}
-
-	return info, nil
-}
-
-func (devices *DeviceSet) activateDeviceIfNeeded(hash string) error {
-	utils.Debugf("activateDeviceIfNeeded(%v)", hash)
-	info := devices.Devices[hash]
-	if info == nil {
-		return fmt.Errorf("Unknown device %s", hash)
-	}
-
-	if devinfo, _ := getInfo(info.Name()); devinfo != nil && devinfo.Exists != 0 {
-		return nil
-	}
-
-	return activateDevice(devices.getPoolDevName(), info.Name(), info.DeviceId, info.Size)
-}
-
-func (devices *DeviceSet) createFilesystem(info *DevInfo) error {
-	devname := info.DevName()
-
-	err := exec.Command("mkfs.ext4", "-E", "discard,lazy_itable_init=0,lazy_journal_init=0", devname).Run()
-	if err != nil {
-		err = exec.Command("mkfs.ext4", "-E", "discard,lazy_itable_init=0", devname).Run()
-	}
-	if err != nil {
-		utils.Debugf("\n--->Err: %s\n", err)
-		return err
-	}
-	return nil
-}
-
-func (devices *DeviceSet) loadMetaData() error {
-	utils.Debugf("loadMetadata()")
-	defer utils.Debugf("loadMetadata END")
-	_, _, _, params, err := getStatus(devices.getPoolName())
-	if err != nil {
-		utils.Debugf("\n--->Err: %s\n", err)
-		return err
-	}
-
-	if _, err := fmt.Sscanf(params, "%d", &devices.TransactionId); err != nil {
-		utils.Debugf("\n--->Err: %s\n", err)
-		return err
-	}
-	devices.NewTransactionId = devices.TransactionId
-
-	jsonData, err := ioutil.ReadFile(devices.jsonFile())
-	if err != nil && !os.IsNotExist(err) {
-		utils.Debugf("\n--->Err: %s\n", err)
-		return err
-	}
-
-	devices.MetaData.Devices = make(map[string]*DevInfo)
-	if jsonData != nil {
-		if err := json.Unmarshal(jsonData, &devices.MetaData); err != nil {
-			utils.Debugf("\n--->Err: %s\n", err)
-			return err
-		}
-	}
-
-	for hash, d := range devices.Devices {
-		d.Hash = hash
-		d.devices = devices
-
-		if d.DeviceId >= devices.nextFreeDevice {
-			devices.nextFreeDevice = d.DeviceId + 1
-		}
-
-		// If the transaction id is larger than the actual one we lost the device due to some crash
-		if d.TransactionId > devices.TransactionId {
-			utils.Debugf("Removing lost device %s with id %d", hash, d.TransactionId)
-			delete(devices.Devices, hash)
-		}
-	}
-	return nil
-}
-
-func (devices *DeviceSet) setupBaseImage() error {
-	oldInfo := devices.Devices[""]
-	if oldInfo != nil && oldInfo.Initialized {
-		return nil
-	}
-
-	if oldInfo != nil && !oldInfo.Initialized {
-		utils.Debugf("Removing uninitialized base image")
-		if err := devices.removeDevice(""); err != nil {
-			utils.Debugf("\n--->Err: %s\n", err)
-			return err
-		}
-	}
-
-	utils.Debugf("Initializing base device-manager snapshot")
-
-	id := devices.allocateDeviceId()
-
-	// Create initial device
-	if err := createDevice(devices.getPoolDevName(), id); err != nil {
-		utils.Debugf("\n--->Err: %s\n", err)
-		return err
-	}
-
-	utils.Debugf("Registering base device (id %v) with FS size %v", id, DefaultBaseFsSize)
-	info, err := devices.registerDevice(id, "", DefaultBaseFsSize)
-	if err != nil {
-		_ = deleteDevice(devices.getPoolDevName(), id)
-		utils.Debugf("\n--->Err: %s\n", err)
-		return err
-	}
-
-	utils.Debugf("Creating filesystem on base device-manager snapshot")
-
-	if err = devices.activateDeviceIfNeeded(""); err != nil {
-		utils.Debugf("\n--->Err: %s\n", err)
-		return err
-	}
-
-	if err := devices.createFilesystem(info); err != nil {
-		utils.Debugf("\n--->Err: %s\n", err)
-		return err
-	}
-
-	info.Initialized = true
-	if err = devices.saveMetadata(); err != nil {
-		info.Initialized = false
-		utils.Debugf("\n--->Err: %s\n", err)
-		return err
-	}
-
-	return nil
-}
-
-func setCloseOnExec(name string) {
-	fileInfos, _ := ioutil.ReadDir("/proc/self/fd")
-	if fileInfos != nil {
-		for _, i := range fileInfos {
-			link, _ := os.Readlink(filepath.Join("/proc/self/fd", i.Name()))
-			if link == name {
-				fd, err := strconv.Atoi(i.Name())
-				if err == nil {
-					syscall.CloseOnExec(fd)
-				}
-			}
-		}
-	}
-}
-
-func (devices *DeviceSet) log(level int, file string, line int, dmError int, message string) {
-	if level >= 7 {
-		return // Ignore _LOG_DEBUG
-	}
-
-	utils.Debugf("libdevmapper(%d): %s:%d (%d) %s", level, file, line, dmError, message)
-}
-
-func major(device uint64) uint64 {
-	return (device >> 8) & 0xfff
-}
-
-func minor(device uint64) uint64 {
-	return (device & 0xff) | ((device >> 12) & 0xfff00)
-}
-
-func (devices *DeviceSet) initDevmapper() error {
-	logInit(devices)
-
-	// Make sure the sparse images exist in <root>/devicemapper/data and
-	// <root>/devicemapper/metadata
-
-	createdLoopback := !devices.hasImage("data") || !devices.hasImage("metadata")
-	data, err := devices.ensureImage("data", DefaultDataLoopbackSize)
-	if err != nil {
-		utils.Debugf("Error device ensureImage (data): %s\n", err)
-		return err
-	}
-	metadata, err := devices.ensureImage("metadata", DefaultMetaDataLoopbackSize)
-	if err != nil {
-		utils.Debugf("Error device ensureImage (metadata): %s\n", err)
-		return err
-	}
-
-	// Set the device prefix from the device id and inode of the docker root dir
-
-	st, err := os.Stat(devices.root)
-	if err != nil {
-		return fmt.Errorf("Error looking up dir %s: %s", devices.root, err)
-	}
-	sysSt := st.Sys().(*syscall.Stat_t)
-	// "reg-" stands for "regular file".
-	// In the future we might use "dev-" for "device file", etc.
-	// docker-maj,min[-inode] stands for:
-	//	- Managed by docker
-	//	- The target of this device is at major <maj> and minor <min>
-	//	- If <inode> is defined, use that file inside the device as a loopback image. Otherwise use the device itself.
-	devices.devicePrefix = fmt.Sprintf("docker-%d:%d-%d", major(sysSt.Dev), minor(sysSt.Dev), sysSt.Ino)
-	utils.Debugf("Generated prefix: %s", devices.devicePrefix)
-
-	// Check for the existence of the device <prefix>-pool
-	utils.Debugf("Checking for existence of the pool '%s'", devices.getPoolName())
-	info, err := getInfo(devices.getPoolName())
-	if info == nil {
-		utils.Debugf("Error device getInfo: %s", err)
-		return err
-	}
-
-	// It seems libdevmapper opens this without O_CLOEXEC, and go exec will not close files
-	// that are not Close-on-exec, and lxc-start will die if it inherits any unexpected files,
-	// so we add this badhack to make sure it closes itself
-	setCloseOnExec("/dev/mapper/control")
-
-	// If the pool doesn't exist, create it
-	if info.Exists == 0 {
-		utils.Debugf("Pool doesn't exist. Creating it.")
-
-		dataFile, err := AttachLoopDevice(data)
-		if err != nil {
-			utils.Debugf("\n--->Err: %s\n", err)
-			return err
-		}
-		defer dataFile.Close()
-
-		metadataFile, err := AttachLoopDevice(metadata)
-		if err != nil {
-			utils.Debugf("\n--->Err: %s\n", err)
-			return err
-		}
-		defer metadataFile.Close()
-
-		if err := createPool(devices.getPoolName(), dataFile, metadataFile); err != nil {
-			utils.Debugf("\n--->Err: %s\n", err)
-			return err
-		}
-	}
-
-	// If we didn't just create the data or metadata image, we need to
-	// load the metadata from the existing file.
-	if !createdLoopback {
-		if err = devices.loadMetaData(); err != nil {
-			utils.Debugf("\n--->Err: %s\n", err)
-			return err
-		}
-	}
-
-	// Setup the base image
-	if err := devices.setupBaseImage(); err != nil {
-		utils.Debugf("Error device setupBaseImage: %s\n", err)
-		return err
-	}
-
-	return nil
-}
-
-func (devices *DeviceSet) AddDevice(hash, baseHash string) error {
-	devices.Lock()
-	defer devices.Unlock()
-
-	if err := devices.ensureInit(); err != nil {
-		utils.Debugf("Error init: %s\n", err)
-		return err
-	}
-
-	if devices.Devices[hash] != nil {
-		return fmt.Errorf("hash %s already exists", hash)
-	}
-
-	baseInfo := devices.Devices[baseHash]
-	if baseInfo == nil {
-		return fmt.Errorf("Error adding device for '%s': can't find device for parent '%s'", hash, baseHash)
-	}
-
-	deviceId := devices.allocateDeviceId()
-
-	if err := devices.createSnapDevice(devices.getPoolDevName(), deviceId, baseInfo.Name(), baseInfo.DeviceId); err != nil {
-		utils.Debugf("Error creating snap device: %s\n", err)
-		return err
-	}
-
-	if _, err := devices.registerDevice(deviceId, hash, baseInfo.Size); err != nil {
-		deleteDevice(devices.getPoolDevName(), deviceId)
-		utils.Debugf("Error registering device: %s\n", err)
-		return err
-	}
-	return nil
-}
-
-func (devices *DeviceSet) removeDevice(hash string) error {
-	info := devices.Devices[hash]
-	if info == nil {
-		return fmt.Errorf("hash %s doesn't exists", hash)
-	}
-
-	devinfo, _ := getInfo(info.Name())
-	if devinfo != nil && devinfo.Exists != 0 {
-		if err := removeDevice(info.Name()); err != nil {
-			utils.Debugf("Error removing device: %s\n", err)
-			return err
-		}
-	}
-
-	if info.Initialized {
-		info.Initialized = false
-		if err := devices.saveMetadata(); err != nil {
-			utils.Debugf("Error saving meta data: %s\n", err)
-			return err
-		}
-	}
-
-	if err := deleteDevice(devices.getPoolDevName(), info.DeviceId); err != nil {
-		utils.Debugf("Error deleting device: %s\n", err)
-		return err
-	}
-
-	devices.allocateTransactionId()
-	delete(devices.Devices, info.Hash)
-
-	if err := devices.saveMetadata(); err != nil {
-		devices.Devices[info.Hash] = info
-		utils.Debugf("Error saving meta data: %s\n", err)
-		return err
-	}
-
-	return nil
-}
-
-func (devices *DeviceSet) RemoveDevice(hash string) error {
-	devices.Lock()
-	defer devices.Unlock()
-
-	if err := devices.ensureInit(); err != nil {
-		utils.Debugf("\n--->Err: %s\n", err)
-		return err
-	}
-
-	return devices.removeDevice(hash)
-}
-
-func (devices *DeviceSet) deactivateDevice(hash string) error {
-	utils.Debugf("[devmapper] deactivateDevice(%s)", hash)
-	defer utils.Debugf("[devmapper] deactivateDevice END")
-	var devname string
-	// FIXME: shouldn't we just register the pool into devices?
-	devname, err := devices.byHash(hash)
-	if err != nil {
-		return err
-	}
-	devinfo, err := getInfo(devname)
-	if err != nil {
-		utils.Debugf("\n--->Err: %s\n", err)
-		return err
-	}
-	if devinfo.Exists != 0 {
-		if err := removeDevice(devname); err != nil {
-			utils.Debugf("\n--->Err: %s\n", err)
-			return err
-		}
-		if err := devices.waitRemove(hash); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-// waitRemove blocks until either:
-// a) the device registered at <device_set_prefix>-<hash> is removed,
-// or b) the 1 second timeout expires.
-func (devices *DeviceSet) waitRemove(hash string) error {
-	utils.Debugf("[deviceset %s] waitRemove(%s)", devices.devicePrefix, hash)
-	defer utils.Debugf("[deviceset %s] waitRemove END", devices.devicePrefix, hash)
-	devname, err := devices.byHash(hash)
-	if err != nil {
-		return err
-	}
-	i := 0
-	for ; i < 1000; i += 1 {
-		devinfo, err := getInfo(devname)
-		if err != nil {
-			// If there is an error we assume the device doesn't exist.
-			// The error might actually be something else, but we can't differentiate.
-			return nil
-		}
-		utils.Debugf("Waiting for removal of %s: exists=%d", devname, devinfo.Exists)
-		if devinfo.Exists == 0 {
-			break
-		}
-		time.Sleep(1 * time.Millisecond)
-	}
-	if i == 1000 {
-		return fmt.Errorf("Timeout while waiting for device %s to be removed", devname)
-	}
-	return nil
-}
-
-// waitClose blocks until either:
-// a) the device registered at <device_set_prefix>-<hash> is closed,
-// or b) the 1 second timeout expires.
-func (devices *DeviceSet) waitClose(hash string) error {
-	devname, err := devices.byHash(hash)
-	if err != nil {
-		return err
-	}
-	i := 0
-	for ; i < 1000; i += 1 {
-		devinfo, err := getInfo(devname)
-		if err != nil {
-			return err
-		}
-		utils.Debugf("Waiting for unmount of %s: opencount=%d", devname, devinfo.OpenCount)
-		if devinfo.OpenCount == 0 {
-			break
-		}
-		time.Sleep(1 * time.Millisecond)
-	}
-	if i == 1000 {
-		return fmt.Errorf("Timeout while waiting for device %s to close", devname)
-	}
-	return nil
-}
-
-// byHash is a hack to allow looking up the deviceset's pool by the hash "pool".
-// FIXME: it seems probably cleaner to register the pool in devices.Devices,
-// but I am afraid of arcane implications deep in the devicemapper code,
-// so this will do.
-func (devices *DeviceSet) byHash(hash string) (devname string, err error) {
-	if hash == "pool" {
-		return devices.getPoolDevName(), nil
-	}
-	info := devices.Devices[hash]
-	if info == nil {
-		return "", fmt.Errorf("hash %s doesn't exists", hash)
-	}
-	return info.Name(), nil
-}
-
-func (devices *DeviceSet) Shutdown() error {
-	utils.Debugf("[deviceset %s] shutdown()", devices.devicePrefix)
-	defer utils.Debugf("[deviceset %s] shutdown END", devices.devicePrefix)
-	devices.Lock()
-	utils.Debugf("[devmapper] Shutting down DeviceSet: %s", devices.root)
-	defer devices.Unlock()
-
-	if !devices.initialized {
-		return nil
-	}
-
-	for path, count := range devices.activeMounts {
-		for i := count; i > 0; i-- {
-			if err := syscall.Unmount(path, 0); err != nil {
-				utils.Debugf("Shutdown unmounting %s, error: %s\n", path, err)
-			}
-		}
-		delete(devices.activeMounts, path)
-	}
-
-	for _, d := range devices.Devices {
-		if err := devices.waitClose(d.Hash); err != nil {
-			utils.Errorf("Warning: error waiting for device %s to unmount: %s\n", d.Hash, err)
-		}
-		if err := devices.deactivateDevice(d.Hash); err != nil {
-			utils.Debugf("Shutdown deactivate %s , error: %s\n", d.Hash, err)
-		}
-	}
-
-	pool := devices.getPoolDevName()
-	if devinfo, err := getInfo(pool); err == nil && devinfo.Exists != 0 {
-		if err := devices.deactivateDevice("pool"); err != nil {
-			utils.Debugf("Shutdown deactivate %s , error: %s\n", pool, err)
-		}
-	}
-
-	return nil
-}
-
-func (devices *DeviceSet) MountDevice(hash, path string, readOnly bool) error {
-	devices.Lock()
-	defer devices.Unlock()
-
-	if err := devices.ensureInit(); err != nil {
-		return fmt.Errorf("Error initializing devmapper: %s", err)
-	}
-
-	if err := devices.activateDeviceIfNeeded(hash); err != nil {
-		return fmt.Errorf("Error activating devmapper device for '%s': %s", hash, err)
-	}
-
-	info := devices.Devices[hash]
-
-	var flags uintptr = syscall.MS_MGC_VAL
-
-	if readOnly {
-		flags = flags | syscall.MS_RDONLY
-	}
-
-	err := syscall.Mount(info.DevName(), path, "ext4", flags, "discard")
-	if err != nil && err == syscall.EINVAL {
-		err = syscall.Mount(info.DevName(), path, "ext4", flags, "")
-	}
-	if err != nil {
-		return fmt.Errorf("Error mounting '%s' on '%s': %s", info.DevName(), path, err)
-	}
-
-	count := devices.activeMounts[path]
-	devices.activeMounts[path] = count + 1
-
-	return nil
-}
-
-func (devices *DeviceSet) UnmountDevice(hash, path string, deactivate bool) error {
-	utils.Debugf("[devmapper] UnmountDevice(hash=%s path=%s)", hash, path)
-	defer utils.Debugf("[devmapper] UnmountDevice END")
-	devices.Lock()
-	defer devices.Unlock()
-
-	utils.Debugf("[devmapper] Unmount(%s)", path)
-	if err := syscall.Unmount(path, 0); err != nil {
-		utils.Debugf("\n--->Err: %s\n", err)
-		return err
-	}
-	utils.Debugf("[devmapper] Unmount done")
-	// Wait for the unmount to be effective,
-	// by watching the value of Info.OpenCount for the device
-	if err := devices.waitClose(hash); err != nil {
-		return err
-	}
-
-	if count := devices.activeMounts[path]; count > 1 {
-		devices.activeMounts[path] = count - 1
-	} else {
-		delete(devices.activeMounts, path)
-	}
-
-	if deactivate {
-		devices.deactivateDevice(hash)
-	}
-
-	return nil
-}
-
-func (devices *DeviceSet) HasDevice(hash string) bool {
-	devices.Lock()
-	defer devices.Unlock()
-
-	if err := devices.ensureInit(); err != nil {
-		return false
-	}
-	return devices.Devices[hash] != nil
-}
-
-func (devices *DeviceSet) HasInitializedDevice(hash string) bool {
-	devices.Lock()
-	defer devices.Unlock()
-
-	if err := devices.ensureInit(); err != nil {
-		return false
-	}
-
-	info := devices.Devices[hash]
-	return info != nil && info.Initialized
-}
-
-func (devices *DeviceSet) HasActivatedDevice(hash string) bool {
-	devices.Lock()
-	defer devices.Unlock()
-
-	if err := devices.ensureInit(); err != nil {
-		return false
-	}
-
-	info := devices.Devices[hash]
-	if info == nil {
-		return false
-	}
-	devinfo, _ := getInfo(info.Name())
-	return devinfo != nil && devinfo.Exists != 0
-}
-
-func (devices *DeviceSet) SetInitialized(hash string) error {
-	devices.Lock()
-	defer devices.Unlock()
-
-	if err := devices.ensureInit(); err != nil {
-		utils.Debugf("\n--->Err: %s\n", err)
-		return err
-	}
-
-	info := devices.Devices[hash]
-	if info == nil {
-		return fmt.Errorf("Unknown device %s", hash)
-	}
-
-	info.Initialized = true
-	if err := devices.saveMetadata(); err != nil {
-		info.Initialized = false
-		utils.Debugf("\n--->Err: %s\n", err)
-		return err
-	}
-
-	return nil
-}
-
-func (devices *DeviceSet) Status() *Status {
-	devices.Lock()
-	defer devices.Unlock()
-
-	status := &Status{}
-
-	if err := devices.ensureInit(); err != nil {
-		return status
-	}
-
-	status.PoolName = devices.getPoolName()
-	status.DataLoopback = path.Join(devices.loopbackDir(), "data")
-	status.MetadataLoopback = path.Join(devices.loopbackDir(), "metadata")
-
-	_, totalSizeInSectors, _, params, err := getStatus(devices.getPoolName())
-	if err == nil {
-		var transactionId, dataUsed, dataTotal, metadataUsed, metadataTotal uint64
-		if _, err := fmt.Sscanf(params, "%d %d/%d %d/%d", &transactionId, &metadataUsed, &metadataTotal, &dataUsed, &dataTotal); err == nil {
-			// Convert from blocks to bytes
-			blockSizeInSectors := totalSizeInSectors / dataTotal
-
-			status.Data.Used = dataUsed * blockSizeInSectors * 512
-			status.Data.Total = dataTotal * blockSizeInSectors * 512
-
-			// metadata blocks are always 4k
-			status.Metadata.Used = metadataUsed * 4096
-			status.Metadata.Total = metadataTotal * 4096
-		}
-	}
-
-	return status
-}
-
-func (devices *DeviceSet) ensureInit() error {
-	if !devices.initialized {
-		devices.initialized = true
-		if err := devices.initDevmapper(); err != nil {
-			utils.Debugf("\n--->Err: %s\n", err)
-			return err
-		}
-	}
-	return nil
-}
-
-func NewDeviceSet(root string) *DeviceSet {
-	SetDevDir("/dev")
-
-	return &DeviceSet{
-		initialized:  false,
-		root:         root,
-		MetaData:     MetaData{Devices: make(map[string]*DevInfo)},
-		activeMounts: make(map[string]int),
-	}
-}
@@ -1,709 +0,0 @@
-package devmapper
-
-/*
-#cgo LDFLAGS: -L. -ldevmapper
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <libdevmapper.h>
-#include <linux/loop.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <sys/ioctl.h>
-#include <linux/fs.h>
-#include <errno.h>
-
-#ifndef LOOP_CTL_GET_FREE
-#define LOOP_CTL_GET_FREE       0x4C82
-#endif
-
-// FIXME: this could easily be rewritten in go
-char*			attach_loop_device(const char *filename, int *loop_fd_out)
-{
-  struct loop_info64	loopinfo = {0};
-  struct stat		st;
-  char			buf[64];
-  int			i, loop_fd, fd, start_index;
-  char*			loopname;
-
-
-  *loop_fd_out = -1;
-
-  start_index = 0;
-  fd = open("/dev/loop-control", O_RDONLY);
-  if (fd >= 0) {
-    start_index = ioctl(fd, LOOP_CTL_GET_FREE);
-    close(fd);
-
-    if (start_index < 0)
-      start_index = 0;
-  }
-
-  fd = open(filename, O_RDWR);
-  if (fd < 0) {
-    perror("open");
-    return NULL;
-  }
-
-  loop_fd = -1;
-  for (i = start_index ; loop_fd < 0 ; i++ ) {
-    if (sprintf(buf, "/dev/loop%d", i) < 0) {
-	close(fd);
-	return NULL;
-    }
-
-    if (stat(buf, &st)) {
-      if (!S_ISBLK(st.st_mode)) {
-	 fprintf(stderr, "[error] Loopback device %s is not a block device.\n", buf);
-      } else if (errno == ENOENT) {
-	fprintf(stderr, "[error] There are no more loopback device available.\n");
-      } else {
-	fprintf(stderr, "[error] Unkown error trying to stat the loopback device %s (errno: %d).\n", buf, errno);
-      }
-      close(fd);
-      return NULL;
-    }
-
-    loop_fd = open(buf, O_RDWR);
-    if (loop_fd < 0 && errno == ENOENT) {
-      fprintf(stderr, "[error] The loopback device %s does not exists.\n", buf);
-      close(fd);
-      return NULL;
-    } else if (loop_fd < 0) {
-	fprintf(stderr, "[error] Unkown error openning the loopback device %s. (errno: %d)\n", buf, errno);
-	continue;
-    }
-
-    if (ioctl(loop_fd, LOOP_SET_FD, (void *)(size_t)fd) < 0) {
-      int errsv = errno;
-      close(loop_fd);
-      loop_fd = -1;
-      if (errsv != EBUSY) {
-        close(fd);
-        fprintf(stderr, "cannot set up loopback device %s: %s", buf, strerror(errsv));
-        return NULL;
-      }
-      continue;
-    }
-
-    close(fd);
-
-    strncpy((char*)loopinfo.lo_file_name, buf, LO_NAME_SIZE);
-    loopinfo.lo_offset = 0;
-    loopinfo.lo_flags = LO_FLAGS_AUTOCLEAR;
-
-    if (ioctl(loop_fd, LOOP_SET_STATUS64, &loopinfo) < 0) {
-      perror("ioctl LOOP_SET_STATUS64");
-      if (ioctl(loop_fd, LOOP_CLR_FD, 0) < 0) {
-        perror("ioctl LOOP_CLR_FD");
-      }
-      close(loop_fd);
-      fprintf (stderr, "cannot set up loopback device info");
-      return (NULL);
-    }
-
-    loopname = strdup(buf);
-    if (loopname == NULL) {
-      close(loop_fd);
-      return (NULL);
-    }
-
-    *loop_fd_out = loop_fd;
-    return (loopname);
-  }
-
-  return (NULL);
-}
-
-static int64_t	get_block_size(int fd)
-{
-  uint64_t	size;
-
-  if (ioctl(fd, BLKGETSIZE64, &size) == -1)
-    return -1;
-  return ((int64_t)size);
-}
-
-extern void DevmapperLogCallback(int level, char *file, int line, int dm_errno_or_class, char *str);
-
-static void
-log_cb(int level, const char *file, int line,
-       int dm_errno_or_class, const char *f, ...)
-{
-  char buffer[256];
-  va_list ap;
-
-  va_start(ap, f);
-  vsnprintf(buffer, 256, f, ap);
-  va_end(ap);
-
-  DevmapperLogCallback(level, (char *)file, line, dm_errno_or_class, buffer);
-}
-
-static void
-log_with_errno_init ()
-{
-  dm_log_with_errno_init(log_cb);
-}
-
-*/
-import "C"
-
-import (
-	"errors"
-	"fmt"
-	"github.com/dotcloud/docker/utils"
-	"os"
-	"runtime"
-	"syscall"
-	"unsafe"
-)
-
-type DevmapperLogger interface {
-	log(level int, file string, line int, dmError int, message string)
-}
-
-const (
-	DeviceCreate TaskType = iota
-	DeviceReload
-	DeviceRemove
-	DeviceRemoveAll
-	DeviceSuspend
-	DeviceResume
-	DeviceInfo
-	DeviceDeps
-	DeviceRename
-	DeviceVersion
-	DeviceStatus
-	DeviceTable
-	DeviceWaitevent
-	DeviceList
-	DeviceClear
-	DeviceMknodes
-	DeviceListVersions
-	DeviceTargetMsg
-	DeviceSetGeometry
-)
-
-const (
-	AddNodeOnResume AddNodeType = iota
-	AddNodeOnCreate
-)
-
-var (
-	ErrTaskRun              = errors.New("dm_task_run failed")
-	ErrTaskSetName          = errors.New("dm_task_set_name failed")
-	ErrTaskSetMessage       = errors.New("dm_task_set_message failed")
-	ErrTaskSetAddNode       = errors.New("dm_task_set_add_node failed")
-	ErrTaskSetRO            = errors.New("dm_task_set_ro failed")
-	ErrTaskAddTarget        = errors.New("dm_task_add_target failed")
-	ErrGetDriverVersion     = errors.New("dm_task_get_driver_version failed")
-	ErrAttachLoopbackDevice = errors.New("loopback mounting failed")
-	ErrGetBlockSize         = errors.New("Can't get block size")
-	ErrUdevWait             = errors.New("wait on udev cookie failed")
-	ErrSetDevDir            = errors.New("dm_set_dev_dir failed")
-	ErrGetLibraryVersion    = errors.New("dm_get_library_version failed")
-	ErrCreateRemoveTask     = errors.New("Can't create task of type DeviceRemove")
-	ErrRunRemoveDevice      = errors.New("running removeDevice failed")
-)
-
-type (
-	Task struct {
-		unmanaged *C.struct_dm_task
-	}
-	Info struct {
-		Exists        int
-		Suspended     int
-		LiveTable     int
-		InactiveTable int
-		OpenCount     int32
-		EventNr       uint32
-		Major         uint32
-		Minor         uint32
-		ReadOnly      int
-		TargetCount   int32
-	}
-	TaskType    int
-	AddNodeType int
-)
-
-func (t *Task) destroy() {
-	if t != nil {
-		C.dm_task_destroy(t.unmanaged)
-		runtime.SetFinalizer(t, nil)
-	}
-}
-
-func TaskCreate(tasktype TaskType) *Task {
-	c_task := C.dm_task_create(C.int(tasktype))
-	if c_task == nil {
-		return nil
-	}
-	task := &Task{unmanaged: c_task}
-	runtime.SetFinalizer(task, (*Task).destroy)
-	return task
-}
-
-func (t *Task) Run() error {
-	if res := C.dm_task_run(t.unmanaged); res != 1 {
-		return ErrTaskRun
-	}
-	return nil
-}
-
-func (t *Task) SetName(name string) error {
-	c_name := C.CString(name)
-	defer free(c_name)
-
-	if res := C.dm_task_set_name(t.unmanaged, c_name); res != 1 {
-		return ErrTaskSetName
-	}
-	return nil
-}
-
-func (t *Task) SetMessage(message string) error {
-	c_message := C.CString(message)
-	defer free(c_message)
-
-	if res := C.dm_task_set_message(t.unmanaged, c_message); res != 1 {
-		return ErrTaskSetMessage
-	}
-	return nil
-}
-
-func (t *Task) SetSector(sector uint64) error {
-	if res := C.dm_task_set_sector(t.unmanaged, C.uint64_t(sector)); res != 1 {
-		return ErrTaskSetAddNode
-	}
-	return nil
-}
-
-func (t *Task) SetCookie(cookie *uint32, flags uint16) error {
-	c_cookie := C.uint32_t(*cookie)
-	if res := C.dm_task_set_cookie(t.unmanaged, &c_cookie, C.uint16_t(flags)); res != 1 {
-		return ErrTaskSetAddNode
-	}
-	*cookie = uint32(c_cookie)
-	return nil
-}
-
-func (t *Task) SetAddNode(add_node AddNodeType) error {
-	if res := C.dm_task_set_add_node(t.unmanaged, C.dm_add_node_t(add_node)); res != 1 {
-		return ErrTaskSetAddNode
-	}
-	return nil
-}
-
-func (t *Task) SetRo() error {
-	if res := C.dm_task_set_ro(t.unmanaged); res != 1 {
-		return ErrTaskSetRO
-	}
-	return nil
-}
-
-func (t *Task) AddTarget(start uint64, size uint64, ttype string, params string) error {
-	c_ttype := C.CString(ttype)
-	defer free(c_ttype)
-
-	c_params := C.CString(params)
-	defer free(c_params)
-
-	if res := C.dm_task_add_target(t.unmanaged, C.uint64_t(start), C.uint64_t(size), c_ttype, c_params); res != 1 {
-		return ErrTaskAddTarget
-	}
-	return nil
-}
-
-func (t *Task) GetDriverVersion() (string, error) {
-	buffer := C.CString(string(make([]byte, 128)))
-	defer free(buffer)
-
-	if res := C.dm_task_get_driver_version(t.unmanaged, buffer, 128); res != 1 {
-		return "", ErrGetDriverVersion
-	}
-	return C.GoString(buffer), nil
-}
-
-func (t *Task) GetInfo() (*Info, error) {
-	c_info := C.struct_dm_info{}
-	if res := C.dm_task_get_info(t.unmanaged, &c_info); res != 1 {
-		return nil, ErrGetDriverVersion
-	}
-	return &Info{
-		Exists:        int(c_info.exists),
-		Suspended:     int(c_info.suspended),
-		LiveTable:     int(c_info.live_table),
-		InactiveTable: int(c_info.inactive_table),
-		OpenCount:     int32(c_info.open_count),
-		EventNr:       uint32(c_info.event_nr),
-		Major:         uint32(c_info.major),
-		Minor:         uint32(c_info.minor),
-		ReadOnly:      int(c_info.read_only),
-		TargetCount:   int32(c_info.target_count),
-	}, nil
-}
-
-func (t *Task) GetNextTarget(next uintptr) (uintptr, uint64, uint64, string, string) {
-	var (
-		c_start, c_length       C.uint64_t
-		c_target_type, c_params *C.char
-	)
-
-	nextp := C.dm_get_next_target(t.unmanaged, unsafe.Pointer(next), &c_start, &c_length, &c_target_type, &c_params)
-	return uintptr(nextp), uint64(c_start), uint64(c_length), C.GoString(c_target_type), C.GoString(c_params)
-}
-
-func AttachLoopDevice(filename string) (*os.File, error) {
-	c_filename := C.CString(filename)
-	defer free(c_filename)
-
-	var fd C.int
-	res := C.attach_loop_device(c_filename, &fd)
-	if res == nil {
-		if os.Getenv("DEBUG") != "" {
-			C.perror(C.CString(fmt.Sprintf("[debug] Error attach_loop_device(%s, %d)", filename, int(fd))))
-		}
-		return nil, ErrAttachLoopbackDevice
-	}
-	defer free(res)
-
-	return os.NewFile(uintptr(fd), C.GoString(res)), nil
-}
-
-func getBlockSize(fd uintptr) int {
-	var size uint64
-
-	if _, _, err := syscall.Syscall(syscall.SYS_IOCTL, fd, C.BLKGETSIZE64, uintptr(unsafe.Pointer(&size))); err != 0 {
-		utils.Debugf("Error ioctl: %s", err)
-		return -1
-	}
-	return int(size)
-}
-
-func GetBlockDeviceSize(file *os.File) (uint64, error) {
-	if size := C.get_block_size(C.int(file.Fd())); size == -1 {
-		return 0, ErrGetBlockSize
-	} else {
-		return uint64(size), nil
-	}
-}
-
-func UdevWait(cookie uint32) error {
-	if res := C.dm_udev_wait(C.uint32_t(cookie)); res != 1 {
-		utils.Debugf("Failed to wait on udev cookie %d", cookie)
-		return ErrUdevWait
-	}
-	return nil
-}
-
-func LogInitVerbose(level int) {
-	C.dm_log_init_verbose(C.int(level))
-}
-
-var dmLogger DevmapperLogger = nil
-
-func logInit(logger DevmapperLogger) {
-	dmLogger = logger
-	C.log_with_errno_init()
-}
-
-func SetDevDir(dir string) error {
-	c_dir := C.CString(dir)
-	defer free(c_dir)
-
-	if res := C.dm_set_dev_dir(c_dir); res != 1 {
-		utils.Debugf("Error dm_set_dev_dir")
-		return ErrSetDevDir
-	}
-	return nil
-}
-
-func GetLibraryVersion() (string, error) {
-	buffer := C.CString(string(make([]byte, 128)))
-	defer free(buffer)
-
-	if res := C.dm_get_library_version(buffer, 128); res != 1 {
-		return "", ErrGetLibraryVersion
-	}
-	return C.GoString(buffer), nil
-}
-
-// Useful helper for cleanup
-func RemoveDevice(name string) error {
-	task := TaskCreate(DeviceRemove)
-	if task == nil {
-		return ErrCreateRemoveTask
-	}
-	if err := task.SetName(name); err != nil {
-		utils.Debugf("Can't set task name %s", name)
-		return err
-	}
-	if err := task.Run(); err != nil {
-		return ErrRunRemoveDevice
-	}
-	return nil
-}
-
-func free(p *C.char) {
-	C.free(unsafe.Pointer(p))
-}
-
-// This is the programmatic example of "dmsetup create"
-func createPool(poolName string, dataFile *os.File, metadataFile *os.File) error {
-	task, err := createTask(DeviceCreate, poolName)
-	if task == nil {
-		return err
-	}
-
-	size, err := GetBlockDeviceSize(dataFile)
-	if err != nil {
-		return fmt.Errorf("Can't get data size")
-	}
-
-	params := metadataFile.Name() + " " + dataFile.Name() + " 128 32768"
-	if err := task.AddTarget(0, size/512, "thin-pool", params); err != nil {
-		return fmt.Errorf("Can't add target")
-	}
-
-	var cookie uint32 = 0
-	if err := task.SetCookie(&cookie, 0); err != nil {
-		return fmt.Errorf("Can't set cookie")
-	}
-
-	if err := task.Run(); err != nil {
-		return fmt.Errorf("Error running DeviceCreate")
-	}
-
-	UdevWait(cookie)
-
-	return nil
-}
-
-func createTask(t TaskType, name string) (*Task, error) {
-	task := TaskCreate(t)
-	if task == nil {
-		return nil, fmt.Errorf("Can't create task of type %d", int(t))
-	}
-	if err := task.SetName(name); err != nil {
-		return nil, fmt.Errorf("Can't set task name %s", name)
-	}
-	return task, nil
-}
-
-func getInfo(name string) (*Info, error) {
-	task, err := createTask(DeviceInfo, name)
-	if task == nil {
-		return nil, err
-	}
-	if err := task.Run(); err != nil {
-		return nil, err
-	}
-	return task.GetInfo()
-}
-
-func getStatus(name string) (uint64, uint64, string, string, error) {
-	task, err := createTask(DeviceStatus, name)
-	if task == nil {
-		utils.Debugf("getStatus: Error createTask: %s", err)
-		return 0, 0, "", "", err
-	}
-	if err := task.Run(); err != nil {
-		utils.Debugf("getStatus: Error Run: %s", err)
-		return 0, 0, "", "", err
-	}
-
-	devinfo, err := task.GetInfo()
-	if err != nil {
-		utils.Debugf("getStatus: Error GetInfo: %s", err)
-		return 0, 0, "", "", err
-	}
-	if devinfo.Exists == 0 {
-		utils.Debugf("getStatus: Non existing device %s", name)
-		return 0, 0, "", "", fmt.Errorf("Non existing device %s", name)
-	}
-
-	_, start, length, target_type, params := task.GetNextTarget(0)
-	return start, length, target_type, params, nil
-}
-
-func setTransactionId(poolName string, oldId uint64, newId uint64) error {
-	task, err := createTask(DeviceTargetMsg, poolName)
-	if task == nil {
-		return err
-	}
-
-	if err := task.SetSector(0); err != nil {
-		return fmt.Errorf("Can't set sector")
-	}
-
-	if err := task.SetMessage(fmt.Sprintf("set_transaction_id %d %d", oldId, newId)); err != nil {
-		return fmt.Errorf("Can't set message")
-	}
-
-	if err := task.Run(); err != nil {
-		return fmt.Errorf("Error running setTransactionId")
-	}
-	return nil
-}
-
-func suspendDevice(name string) error {
-	task, err := createTask(DeviceSuspend, name)
-	if task == nil {
-		return err
-	}
-	if err := task.Run(); err != nil {
-		return fmt.Errorf("Error running DeviceSuspend")
-	}
-	return nil
-}
-
-func resumeDevice(name string) error {
-	task, err := createTask(DeviceResume, name)
-	if task == nil {
-		return err
-	}
-
-	var cookie uint32 = 0
-	if err := task.SetCookie(&cookie, 0); err != nil {
-		return fmt.Errorf("Can't set cookie")
-	}
-
-	if err := task.Run(); err != nil {
-		return fmt.Errorf("Error running DeviceSuspend")
-	}
-
-	UdevWait(cookie)
-
-	return nil
-}
-
-func createDevice(poolName string, deviceId int) error {
-	utils.Debugf("[devmapper] createDevice(poolName=%v, deviceId=%v)", poolName, deviceId)
-	task, err := createTask(DeviceTargetMsg, poolName)
-	if task == nil {
-		return err
-	}
-
-	if err := task.SetSector(0); err != nil {
-		return fmt.Errorf("Can't set sector")
-	}
-
-	if err := task.SetMessage(fmt.Sprintf("create_thin %d", deviceId)); err != nil {
-		return fmt.Errorf("Can't set message")
-	}
-
-	if err := task.Run(); err != nil {
-		return fmt.Errorf("Error running createDevice")
-	}
-	return nil
-}
-
-func deleteDevice(poolName string, deviceId int) error {
-	task, err := createTask(DeviceTargetMsg, poolName)
-	if task == nil {
-		return err
-	}
-
-	if err := task.SetSector(0); err != nil {
-		return fmt.Errorf("Can't set sector")
-	}
-
-	if err := task.SetMessage(fmt.Sprintf("delete %d", deviceId)); err != nil {
-		return fmt.Errorf("Can't set message")
-	}
-
-	if err := task.Run(); err != nil {
-		return fmt.Errorf("Error running deleteDevice")
-	}
-	return nil
-}
-
-func removeDevice(name string) error {
-	utils.Debugf("[devmapper] removeDevice START")
-	defer utils.Debugf("[devmapper] removeDevice END")
-	task, err := createTask(DeviceRemove, name)
-	if task == nil {
-		return err
-	}
-	if err = task.Run(); err != nil {
-		return fmt.Errorf("Error running removeDevice")
-	}
-	return nil
-}
-
-func activateDevice(poolName string, name string, deviceId int, size uint64) error {
-	task, err := createTask(DeviceCreate, name)
-	if task == nil {
-		return err
-	}
-
-	params := fmt.Sprintf("%s %d", poolName, deviceId)
-	if err := task.AddTarget(0, size/512, "thin", params); err != nil {
-		return fmt.Errorf("Can't add target")
-	}
-	if err := task.SetAddNode(AddNodeOnCreate); err != nil {
-		return fmt.Errorf("Can't add node")
-	}
-
-	var cookie uint32 = 0
-	if err := task.SetCookie(&cookie, 0); err != nil {
-		return fmt.Errorf("Can't set cookie")
-	}
-
-	if err := task.Run(); err != nil {
-		return fmt.Errorf("Error running DeviceCreate")
-	}
-
-	UdevWait(cookie)
-
-	return nil
-}
-
-func (devices *DeviceSet) createSnapDevice(poolName string, deviceId int, baseName string, baseDeviceId int) error {
-	devinfo, _ := getInfo(baseName)
-	doSuspend := devinfo != nil && devinfo.Exists != 0
-
-	if doSuspend {
-		if err := suspendDevice(baseName); err != nil {
-			return err
-		}
-	}
-
-	task, err := createTask(DeviceTargetMsg, poolName)
-	if task == nil {
-		if doSuspend {
-			resumeDevice(baseName)
-		}
-		return err
-	}
-
-	if err := task.SetSector(0); err != nil {
-		if doSuspend {
-			resumeDevice(baseName)
-		}
-		return fmt.Errorf("Can't set sector")
-	}
-
-	if err := task.SetMessage(fmt.Sprintf("create_snap %d %d", deviceId, baseDeviceId)); err != nil {
-		if doSuspend {
-			resumeDevice(baseName)
-		}
-		return fmt.Errorf("Can't set message")
-	}
-
-	if err := task.Run(); err != nil {
-		if doSuspend {
-			resumeDevice(baseName)
-		}
-		return fmt.Errorf("Error running DeviceCreate")
-	}
-
-	if doSuspend {
-		if err := resumeDevice(baseName); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
@@ -1,13 +0,0 @@
-package devmapper
-
-import "C"
-
-// Due to the way cgo works this has to be in a separate file, as devmapper.go has
-// definitions in the cgo block, which is incompatible with using "//export"
-
-//export DevmapperLogCallback
-func DevmapperLogCallback(level C.int, file *C.char, line C.int, dm_errno_or_class C.int, message *C.char) {
-	if dmLogger != nil {
-		dmLogger.log(int(level), C.GoString(file), int(line), int(dm_errno_or_class), C.GoString(message))
-	}
-}
@@ -1,62 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"github.com/dotcloud/docker/devmapper"
-	"os"
-)
-
-func usage() {
-	fmt.Printf("Usage: %s [snap new-id base-id] | [remove id] | [mount id mountpoint]\n", os.Args[0])
-	os.Exit(1)
-}
-
-func main() {
-	devices := devmapper.NewDeviceSet("/var/lib/docker")
-
-	if len(os.Args) < 2 {
-		usage()
-	}
-
-	cmd := os.Args[1]
-	if cmd == "snap" {
-		if len(os.Args) < 4 {
-			usage()
-		}
-
-		err := devices.AddDevice(os.Args[2], os.Args[3])
-		if err != nil {
-			fmt.Println("Can't create snap device: ", err)
-			os.Exit(1)
-		}
-	} else if cmd == "remove" {
-		if len(os.Args) < 3 {
-			usage()
-		}
-
-		err := devices.RemoveDevice(os.Args[2])
-		if err != nil {
-			fmt.Println("Can't remove device: ", err)
-			os.Exit(1)
-		}
-	} else if cmd == "mount" {
-		if len(os.Args) < 4 {
-			usage()
-		}
-
-		err := devices.MountDevice(os.Args[2], os.Args[3])
-		if err != nil {
-			fmt.Println("Can't create snap device: ", err)
-			os.Exit(1)
-		}
-	} else {
-		fmt.Printf("Unknown command %s\n", cmd)
-		if len(os.Args) < 4 {
-			usage()
-		}
-
-		os.Exit(1)
-	}
-
-	return
-}
@@ -4,7 +4,6 @@ import (
 	"flag"
 	"fmt"
 	"github.com/dotcloud/docker"
-	"github.com/dotcloud/docker/sysinit"
 	"github.com/dotcloud/docker/utils"
 	"io/ioutil"
 	"log"
@@ -24,24 +23,23 @@ var (
 func main() {
 	if selfPath := utils.SelfPath(); selfPath == "/sbin/init" || selfPath == "/.dockerinit" {
 		// Running in init mode
-		sysinit.SysInit()
+		docker.SysInit()
 		return
 	}
 	// FIXME: Switch d and D ? (to be more sshd like)
 	flVersion := flag.Bool("v", false, "Print version information and quit")
 	flDaemon := flag.Bool("d", false, "Daemon mode")
 	flDebug := flag.Bool("D", false, "Debug mode")
-	flAutoRestart := flag.Bool("r", true, "Restart previously running containers")
+	flAutoRestart := flag.Bool("r", false, "Restart previously running containers")
 	bridgeName := flag.String("b", "", "Attach containers to a pre-existing network bridge. Use 'none' to disable container networking")
 	pidfile := flag.String("p", "/var/run/docker.pid", "File containing process PID")
 	flGraphPath := flag.String("g", "/var/lib/docker", "Path to graph storage base dir.")
 	flEnableCors := flag.Bool("api-enable-cors", false, "Enable CORS requests in the remote api.")
 	flDns := flag.String("dns", "", "Set custom dns servers")
-	flHosts := utils.ListOpts{fmt.Sprintf("unix://%s", docker.DEFAULTUNIXSOCKET)}
+	flHosts := docker.ListOpts{fmt.Sprintf("unix://%s", docker.DEFAULTUNIXSOCKET)}
 	flag.Var(&flHosts, "H", "tcp://host:port to bind/connect to or unix://path/to/socket to use")
 	flEnableIptables := flag.Bool("iptables", true, "Disable iptables within docker")
 	flDefaultIp := flag.String("ip", "0.0.0.0", "Default ip address to use when binding a containers ports")
-	flInterContainerComm := flag.Bool("enable-container-comm", false, "Enable inter-container communication")

 	flag.Parse()

@@ -78,16 +76,15 @@ func main() {
 		ip := net.ParseIP(*flDefaultIp)

 		config := &docker.DaemonConfig{
-			Pidfile:                     *pidfile,
-			GraphPath:                   *flGraphPath,
-			AutoRestart:                 *flAutoRestart,
-			EnableCors:                  *flEnableCors,
-			Dns:                         dns,
-			EnableIptables:              *flEnableIptables,
-			BridgeIface:                 bridge,
-			ProtoAddresses:              flHosts,
-			DefaultIp:                   ip,
-			InterContainerCommunication: *flInterContainerComm,
+			Pidfile:        *pidfile,
+			GraphPath:      *flGraphPath,
+			AutoRestart:    *flAutoRestart,
+			EnableCors:     *flEnableCors,
+			Dns:            dns,
+			EnableIptables: *flEnableIptables,
+			BridgeIface:    bridge,
+			ProtoAddresses: flHosts,
+			DefaultIp:      ip,
 		}
 		if err := daemon(config); err != nil {
 			log.Fatal(err)
@@ -147,7 +144,7 @@ func daemon(config *docker.DaemonConfig) error {
 	defer removePidFile(config.Pidfile)

 	c := make(chan os.Signal, 1)
-	signal.Notify(c, os.Interrupt, os.Kill, syscall.SIGTERM)
+	signal.Notify(c, os.Interrupt, os.Kill, os.Signal(syscall.SIGTERM))
 	go func() {
 		sig := <-c
 		log.Printf("Received signal '%v', exiting\n", sig)
@@ -1,16 +0,0 @@
-package main
-
-import (
-	"github.com/dotcloud/docker/sysinit"
-)
-
-var (
-	GITCOMMIT string
-	VERSION   string
-)
-
-func main() {
-	// Running in init mode
-	sysinit.SysInit()
-	return
-}
@@ -1,93 +1,38 @@
 Docker Documentation
 ====================

-Overview
--------
+Documentation
+-------------
+This is your definite place to contribute to the docker documentation. After each push to master the documentation
+is automatically generated and made available on [docs.docker.io](http://docs.docker.io)

-The source for Docker documentation is here under ``sources/`` in the
-form of .rst files. These files use
-[reStructuredText](http://docutils.sourceforge.net/rst.html)
-formatting with [Sphinx](http://sphinx-doc.org/) extensions for
-structure, cross-linking and indexing.
+Each of the .rst files under sources reflects a page on the documentation. 

-The HTML files are built and hosted on
-[readthedocs.org](https://readthedocs.org/projects/docker/), appearing
-via proxy on https://docs.docker.io. The HTML files update
-automatically after each change to the master or release branch of the
-[docker files on GitHub](https://github.com/dotcloud/docker) thanks to
-post-commit hooks. The "release" branch maps to the "latest"
-documentation and the "master" branch maps to the "master"
-documentation. 
-
-**Warning**: The "master" documentation may include features not yet
-part of any official docker release. "Master" docs should be used only
-for understanding bleeding-edge development and "latest" should be
-used for the latest official release.
-
-If you need to manually trigger a build of an existing branch, then
-you can do that through the [readthedocs
-interface](https://readthedocs.org/builds/docker/). If you would like
-to add new build targets, including new branches or tags, then you
-must contact one of the existing maintainers and get your
-readthedocs.org account added to the maintainers list, or just file an
-issue on GitHub describing the branch/tag and why it needs to be added
-to the docs, and one of the maintainers will add it for you.
-
-Getting Started
---------------
-
-To edit and test the docs, you'll need to install the Sphinx tool and
-its dependencies. There are two main ways to install this tool:
-
-Native Installation
-...................
+Installation
+------------

+* Work in your own fork of the code, we accept pull requests.
 * Install sphinx: `pip install sphinx`
-    * Mac OS X: `[sudo] pip-2.7 install sphinx`
+    * Mac OS X: `[sudo] pip-2.7 install sphinx`)
 * Install sphinx httpdomain contrib package: `pip install sphinxcontrib-httpdomain`
    * Mac OS X: `[sudo] pip-2.7 install sphinxcontrib-httpdomain`
 * If pip is not available you can probably install it using your favorite package manager as **python-pip**

-Alternative Installation: Docker Container
-..........................................
-
-If you're running ``docker`` on your development machine then you may
-find it easier and cleaner to use the Dockerfile. This installs Sphinx
-in a container, adds the local ``docs/`` directory and builds the HTML
-docs inside the container, even starting a simple HTTP server on port
-8000 so that you can connect and see your changes. Just run ``docker
-build .`` and run the resulting image. This is the equivalent to
-``make clean server`` since each container starts clean.
-
 Usage
 -----
-* Follow the contribution guidelines (``../CONTRIBUTING.md``)
-* Work in your own fork of the code, we accept pull requests.
-* Change the ``.rst`` files with your favorite editor -- try to keep the
-  lines short and respect RST and Sphinx conventions. 
-* Run ``make clean docs`` to clean up old files and generate new ones,
-  or just ``make docs`` to update after small changes.
-* Your static website can now be found in the ``_build`` directory.
-* To preview what you have generated run ``make server`` and open
-  http://localhost:8000/ in your favorite browser.
-
-``make clean docs`` must complete without any warnings or errors.
+* Change the `.rst` files with your favorite editor to your liking.
+* Run `make docs` to clean up old files and generate new ones.
+* Your static website can now be found in the `_build` directory.
+* To preview what you have generated run `make server` and open http://localhost:8000/ in your favorite browser.

 Working using GitHub's file editor
 ----------------------------------
-
-Alternatively, for small changes and typos you might want to use
-GitHub's built in file editor. It allows you to preview your changes
-right online (though there can be some differences between GitHub
-markdown and Sphinx RST). Just be careful not to create many commits.
+Alternatively, for small changes and typo's you might want to use GitHub's built in file editor. It allows
+you to preview your changes right online. Just be careful not to create many commits.

 Images
 ------
-
-When you need to add images, try to make them as small as possible
-(e.g. as gif). Usually images should go in the same directory as the
-.rst file which references them, or in a subdirectory if one already
-exists.
+When you need to add images, try to make them as small as possible (e.g. as gif).

 Notes
 -----
@@ -96,7 +41,7 @@ lessc ``lessc main.less`` or watched using watch-lessc ``watch-lessc -i main.les

 Guides on using sphinx
 ----------------------
-* To make links to certain sections create a link target like so:
+* To make links to certain pages create a link target like so:

  ```
    .. _hello_world:
@@ -107,10 +52,7 @@ Guides on using sphinx
    This is.. (etc.)
  ```

-  The ``_hello_world:`` will make it possible to link to this position
-  (page and section heading) from all other pages. See the [Sphinx
-  docs](http://sphinx-doc.org/markup/inline.html#role-ref) for more
-  information and examples.
+  The ``_hello_world:`` will make it possible to link to this position (page and marker) from all other pages.

 * Notes, warnings and alarms

@@ -126,17 +68,13 @@ Guides on using sphinx

 * Code examples

-  * Start without $, so it's easy to copy and paste.
-  * Use "sudo" with docker to ensure that your command is runnable
-    even if they haven't [used the *docker*
-    group](http://docs.docker.io/en/latest/use/basics/#why-sudo).
+  Start without $, so it's easy to copy and paste.

 Manpages
 --------

-* To make the manpages, run ``make man``. Please note there is a bug
-  in spinx 1.1.3 which makes this fail.  Upgrade to the latest version
-  of Sphinx.
-* Then preview the manpage by running ``man _build/man/docker.1``,
-  where ``_build/man/docker.1`` is the path to the generated manfile
-
+* To make the manpages, simply run 'make man'. Please note there is a bug in spinx 1.1.3 which makes this fail.
+Upgrade to the latest version of sphinx.
+* Then preview the manpage by running `man _build/man/docker.1`, where _build/man/docker.1 is the path to the generated
+manfile
+* The manpages are also autogenerated by our hosted readthedocs here: http://docs-docker.dotcloud.com/projects/docker/downloads/
@@ -34,13 +34,8 @@ Calling /images/<name>/insert is the same as calling
 You can still call an old version of the api using
 /v1.0/images/<name>/insert

-v1.6
-****
-
-Full Documentation
------------------
-
 :doc:`docker_remote_api_v1.6`
+*****************************

 What's new
 ----------
@@ -54,13 +49,8 @@ What's new
   stderr are merged.


-v1.5
-****
-
-Full Documentation
------------------
-
 :doc:`docker_remote_api_v1.5`
+*****************************

 What's new
 ----------
@@ -81,13 +71,8 @@ What's new
   dicts each containing `PublicPort`, `PrivatePort` and `Type` describing a
   port mapping.

-v1.4
-****
-
-Full Documentation
------------------
-
 :doc:`docker_remote_api_v1.4`
+*****************************

 What's new
 ----------
@@ -104,16 +89,11 @@ What's new

   **New!** Image's name added in the events

-v1.3
-****
+:doc:`docker_remote_api_v1.3`
+*****************************

 docker v0.5.0 51f6c4a_

-Full Documentation
------------------
-
-:doc:`docker_remote_api_v1.3`
-
 What's new
 ----------

@@ -146,16 +126,11 @@ Start containers (/containers/<id>/start):
 - You can now pass host-specific configuration (e.g. bind mounts) in
  the POST body for start calls

-v1.2
-****
+:doc:`docker_remote_api_v1.2`
+*****************************

 docker v0.4.2 2e7649b_

-Full Documentation
------------------
-
-:doc:`docker_remote_api_v1.2`
-
 What's new
 ----------

@@ -181,16 +156,11 @@ The client should send it's authConfig as POST on each call of
  deleted/untagged.


-v1.1
-****
+:doc:`docker_remote_api_v1.1`
+*****************************

 docker v0.4.0 a8ae398_

-Full Documentation
------------------
-
-:doc:`docker_remote_api_v1.1`
-
 What's new
 ----------

@@ -210,15 +180,11 @@ What's new
 	   {"error":"Invalid..."}
 	   ...

-v1.0
-****
-
-docker v0.3.4 8d73740_
-
-Full Documentation
------------------

 :doc:`docker_remote_api_v1.0`
+*****************************
+
+docker v0.3.4 8d73740_

 What's new
 ----------
@@ -14,5 +14,5 @@ Your programs and scripts can access Docker's functionality via these interfaces
  registry_api
  index_api
  docker_remote_api
-  remote_api_client_libraries
+

@@ -463,7 +463,7 @@ Ancestry
 2.4 Status
 ----------

-.. http:get:: /v1/_ping
+.. http:get /v1/_ping

    Check status of the registry. This endpoint is also used to determine if
    the registry supports SSL.
@@ -479,6 +479,9 @@ Ancestry

        ""

+    :parameter namespace: namespace for the repo
+    :parameter repository: name for the repo
+
    **Example Response**:

    .. sourcecode:: http
@@ -4,8 +4,11 @@

 .. _cli:

-Command Line Help
-----------------
+Overview
+======================
+
+Docker Usage
+~~~~~~~~~~~~~~~~~~

 To list available commands, either run ``docker`` with no parameters or execute
 ``docker help``::
@@ -18,749 +21,75 @@ To list available commands, either run ``docker`` with no parameters or execute

    ...

-.. _cli_attach:

-``attach``
----------

-::
+Available Commands
+~~~~~~~~~~~~~~~~~~

-    Usage: docker attach CONTAINER
+.. include:: command/attach.rst

-    Attach to a running container.
+.. include:: command/build.rst

-You can detach from the container again (and leave it running) with
-``CTRL-c`` (for a quiet exit) or ``CTRL-\`` to get a stacktrace of
-the Docker client when it quits.
+.. include:: command/commit.rst

-To stop a container, use ``docker stop``
+.. include:: command/cp.rst

-To kill the container, use ``docker kill``
+.. include:: command/diff.rst

-.. _cli_attach_examples:
- 
-Examples:
-~~~~~~~~~
+.. include:: command/events.rst

-.. code-block:: bash
+.. include:: command/export.rst

-     $ ID=$(sudo docker run -d ubuntu /usr/bin/top -b)
-     $ sudo docker attach $ID
-     top - 02:05:52 up  3:05,  0 users,  load average: 0.01, 0.02, 0.05
-     Tasks:   1 total,   1 running,   0 sleeping,   0 stopped,   0 zombie
-     Cpu(s):  0.1%us,  0.2%sy,  0.0%ni, 99.7%id,  0.0%wa,  0.0%hi,  0.0%si,  0.0%st
-     Mem:    373572k total,   355560k used,    18012k free,    27872k buffers
-     Swap:   786428k total,        0k used,   786428k free,   221740k cached
+.. include:: command/history.rst

-     PID USER      PR  NI  VIRT  RES  SHR S %CPU %MEM    TIME+  COMMAND            
-      1 root      20   0 17200 1116  912 R    0  0.3   0:00.03 top                
+.. include:: command/images.rst

-      top - 02:05:55 up  3:05,  0 users,  load average: 0.01, 0.02, 0.05
-      Tasks:   1 total,   1 running,   0 sleeping,   0 stopped,   0 zombie
-      Cpu(s):  0.0%us,  0.2%sy,  0.0%ni, 99.8%id,  0.0%wa,  0.0%hi,  0.0%si,  0.0%st
-      Mem:    373572k total,   355244k used,    18328k free,    27872k buffers
-      Swap:   786428k total,        0k used,   786428k free,   221776k cached
+.. include:: command/import.rst

-        PID USER      PR  NI  VIRT  RES  SHR S %CPU %MEM    TIME+  COMMAND            
-	    1 root      20   0 17208 1144  932 R    0  0.3   0:00.03 top                
+.. include:: command/info.rst

+.. include:: command/insert.rst

-      top - 02:05:58 up  3:06,  0 users,  load average: 0.01, 0.02, 0.05
-      Tasks:   1 total,   1 running,   0 sleeping,   0 stopped,   0 zombie
-      Cpu(s):  0.2%us,  0.3%sy,  0.0%ni, 99.5%id,  0.0%wa,  0.0%hi,  0.0%si,  0.0%st
-      Mem:    373572k total,   355780k used,    17792k free,    27880k buffers
-      Swap:   786428k total,        0k used,   786428k free,   221776k cached
+.. include:: command/inspect.rst

-      PID USER      PR  NI  VIRT  RES  SHR S %CPU %MEM    TIME+  COMMAND            
-           1 root      20   0 17208 1144  932 R    0  0.3   0:00.03 top                
-     ^C$ 
-     $ sudo docker stop $ID
+.. include:: command/kill.rst

-.. _cli_build:
+.. include:: command/link.rst

-``build``
---------
+.. include:: command/login.rst

-::
+.. include:: command/logs.rst

-    Usage: docker build [OPTIONS] PATH | URL | -
-    Build a new container image from the source code at PATH
-      -t="": Repository name (and optionally a tag) to be applied to the resulting image in case of success.
-      -q=false: Suppress verbose build output.
-      -no-cache: Do not use the cache when building the image.
-      -rm: Remove intermediate containers after a successful build
-    When a single Dockerfile is given as URL, then no context is set. When a git repository is set as URL, the repository is used as context
+.. include:: command/ls.rst

-.. _cli_build_examples:
+.. include:: command/port.rst

-Examples:
-~~~~~~~~~
+.. include:: command/ps.rst

-.. code-block:: bash
+.. include:: command/pull.rst

-    sudo docker build .
+.. include:: command/push.rst

-This will read the ``Dockerfile`` from the current directory. It will
-also send any other files and directories found in the current
-directory to the ``docker`` daemon.
+.. include:: command/restart.rst

-The contents of this directory would be used by ``ADD`` commands found
-within the ``Dockerfile``.  This will send a lot of data to the
-``docker`` daemon if the current directory contains a lot of data.  If
-the absolute path is provided instead of ``.`` then only the files and
-directories required by the ADD commands from the ``Dockerfile`` will be
-added to the context and transferred to the ``docker`` daemon.
+.. include:: command/rm.rst

-.. code-block:: bash
+.. include:: command/rmi.rst

-   sudo docker build -t vieux/apache:2.0 .
+.. include:: command/run.rst

-This will build like the previous example, but it will then tag the
-resulting image. The repository name will be ``vieux/apache`` and the
-tag will be ``2.0``
+.. include:: command/search.rst

+.. include:: command/start.rst

-.. code-block:: bash
+.. include:: command/stop.rst

-    sudo docker build - < Dockerfile
+.. include:: command/tag.rst

-This will read a ``Dockerfile`` from *stdin* without context. Due to
-the lack of a context, no contents of any local directory will be sent
-to the ``docker`` daemon.  ``ADD`` doesn't work when running in this
-mode because the absence of the context provides no source files to
-copy to the container.
+.. include:: command/top.rst

+.. include:: command/version.rst

-.. code-block:: bash
-
-    sudo docker build github.com/creack/docker-firefox
-
-This will clone the Github repository and use it as context. The
-``Dockerfile`` at the root of the repository is used as
-``Dockerfile``.  Note that you can specify an arbitrary git repository
-by using the ``git://`` schema.
-
-
-.. _cli_commit:
-
-``commit``
----------
-
-::
-
-    Usage: docker commit [OPTIONS] CONTAINER [REPOSITORY [TAG]]
-
-    Create a new image from a container's changes
-
-      -m="": Commit message
-      -author="": Author (eg. "John Hannibal Smith <hannibal@a-team.com>"
-      -run="": Configuration to be applied when the image is launched with `docker run`. 
-               (ex: '{"Cmd": ["cat", "/world"], "PortSpecs": ["22"]}')
-
-Full -run example (multiline is ok within a single quote ``'``)
-
-::
-
-  $ sudo docker commit -run='
-  {
-      "Entrypoint" : null,
-      "Privileged" : false,
-      "User" : "",
-      "VolumesFrom" : "",
-      "Cmd" : ["cat", "-e", "/etc/resolv.conf"],
-      "Dns" : ["8.8.8.8", "8.8.4.4"],
-      "MemorySwap" : 0,
-      "AttachStdin" : false,
-      "AttachStderr" : false,
-      "CpuShares" : 0,
-      "OpenStdin" : false,
-      "Volumes" : null,
-      "Hostname" : "122612f45831",
-      "PortSpecs" : ["22", "80", "443"],
-      "Image" : "b750fe79269d2ec9a3c593ef05b4332b1d1a02a62b4accb2c21d589ff2f5f2dc",
-      "Tty" : false,
-      "Env" : [
-         "HOME=/",
-         "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-      ],
-      "StdinOnce" : false,
-      "Domainname" : "",
-      "WorkingDir" : "/",
-      "NetworkDisabled" : false,
-      "Memory" : 0,
-      "AttachStdout" : false
-  }' $CONTAINER_ID
-
-.. _cli_cp:
-
-``cp``
------
-
-::
-
-    Usage: docker cp CONTAINER:RESOURCE HOSTPATH
-
-    Copy files/folders from the containers filesystem to the host
-    path.  Paths are relative to the root of the filesystem.
-
-.. _cli_diff:
-
-``diff``
--------
-
-::
-
-    Usage: docker diff CONTAINER [OPTIONS]
-
-    Inspect changes on a container's filesystem
-
-.. _cli_events:
-
-``events``
----------
-
-::
-
-    Usage: docker events
-
-    Get real time events from the server
-
-.. _cli_events_example:
-
-Examples
-~~~~~~~~
-
-You'll need two shells for this example.
-
-Shell 1: Listening for events
-.............................
-
-.. code-block:: bash
-    
-    $ sudo docker events
-
-Shell 2: Start and Stop a Container
-...................................
-
-.. code-block:: bash
-
-    $ sudo docker start 4386fb97867d
-    $ sudo docker stop 4386fb97867d
-
-Shell 1: (Again .. now showing events)
-......................................
-
-.. code-block:: bash
-
-    [2013-09-03 15:49:26 +0200 CEST] 4386fb97867d: (from 12de384bfb10) start
-    [2013-09-03 15:49:29 +0200 CEST] 4386fb97867d: (from 12de384bfb10) die
-    [2013-09-03 15:49:29 +0200 CEST] 4386fb97867d: (from 12de384bfb10) stop
-
-
-.. _cli_export:
-
-``export``
----------
-
-::
-
-    Usage: docker export CONTAINER
-
-    Export the contents of a filesystem as a tar archive
-
-.. _cli_history:
-
-``history``
-----------
-
-::
-
-    Usage: docker history [OPTIONS] IMAGE
-
-    Show the history of an image
-
-.. _cli_images:
-
-``images``
----------
-
-::
-
-    Usage: docker images [OPTIONS] [NAME]
-
-    List images
-
-      -a=false: show all images
-      -q=false: only show numeric IDs
-      -viz=false: output in graphviz format
-
-Displaying images visually
-~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-::
-
-    sudo docker images -viz | dot -Tpng -o docker.png
-
-.. image:: docker_images.gif
-   :alt: Example inheritance graph of Docker images.
-
-.. _cli_import:
-
-``import``
----------
-
-::
-
-    Usage: docker import URL|- [REPOSITORY [TAG]]
-
-    Create a new filesystem image from the contents of a tarball
-
-At this time, the URL must start with ``http`` and point to a single
-file archive (.tar, .tar.gz, .tgz, .bzip, .tar.xz, .txz) containing a
-root filesystem. If you would like to import from a local directory or
-archive, you can use the ``-`` parameter to take the data from
-standard in.
-
-Examples
-~~~~~~~~
-
-Import from a remote location
-.............................
-
-``$ sudo docker import http://example.com/exampleimage.tgz exampleimagerepo``
-
-Import from a local file
-........................
-
-Import to docker via pipe and standard in
-
-``$ cat exampleimage.tgz | sudo docker import - exampleimagelocal``
-
-Import from a local directory
-.............................
-
-``$ sudo tar -c . | docker import - exampleimagedir``
-
-Note the ``sudo`` in this example -- you must preserve the ownership
-of the files (especially root ownership) during the archiving with
-tar. If you are not root (or sudo) when you tar, then the ownerships
-might not get preserved.
-
-.. _cli_info:
-
-``info``
--------
-
-::
-
-    Usage: docker info
-
-    Display system-wide information.
-
-.. _cli_insert:
-
-``insert``
----------
-
-::
-
-    Usage: docker insert IMAGE URL PATH
-
-    Insert a file from URL in the IMAGE at PATH
-
-Examples
-~~~~~~~~
-
-Insert file from github
-.......................
-
-.. code-block:: bash
-
-    $ sudo docker insert 8283e18b24bc https://raw.github.com/metalivedev/django/master/postinstall /tmp/postinstall.sh
-
-.. _cli_inspect:
-
-``inspect``
-----------
-
-::
-
-    Usage: docker inspect [OPTIONS] CONTAINER
-
-    Return low-level information on a container
-
-.. _cli_kill:
-
-``kill``
--------
-
-::
-
-    Usage: docker kill [OPTIONS] CONTAINER [CONTAINER...]
-
-    Kill a running container
-
-.. _cli_link:
-
-``link``
--------
-
-::
-
-    Usage: docker link CURRENT_NAME NEW_NAME
-
-    Link a container to a new name.
-
-
-Examples:
-~~~~~~~~~
-
-.. code-block:: bash
-
-    $ docker link /59669e088202c2ebe150b4346cb3301562d073b51261176a354a74e8f618bfbc /redis
-    $ docker ls
-    NAME                                                                      ID                                                                 IMAGE
-    /redis                                                                    59669e088202c2ebe150b4346cb3301562d073b51261176a354a74e8f618bfbc   crosbymichael/redis:latest
-    /59669e088202c2ebe150b4346cb3301562d073b51261176a354a74e8f618bfbc         59669e088202c2ebe150b4346cb3301562d073b51261176a354a74e8f618bfbc   crosbymichael/redis:latest
-
-
-This will create a new link for the existing name ``/59669e088202c2ebe150b4346cb3301562d073b51261176a354a74e8f618bfbc`` 
-with the new name ``/redis`` so that we can new reference the same container under the new name ``/redis``.
-
-.. _cli_login:
-
-``login``
---------
-
-::
-
-    Usage: docker login [OPTIONS] [SERVER]
-
-    Register or Login to the docker registry server
-
-    -e="": email
-    -p="": password
-    -u="": username
-
-    If you want to login to a private registry you can
-    specify this by adding the server name.
-
-    example:
-    docker login localhost:8080
-
-
-.. _cli_logs:
-
-``logs``
--------
-
-::
-
-    Usage: docker logs [OPTIONS] CONTAINER
-
-    Fetch the logs of a container
-
-
-.. _cli_port:
-
-``port``
--------
-
-::
-
-    Usage: docker port [OPTIONS] CONTAINER PRIVATE_PORT
-
-    Lookup the public-facing port which is NAT-ed to PRIVATE_PORT
-
-
-.. _cli_ps:
-
-``ps``
------
-
-::
-
-    Usage: docker ps [OPTIONS]
-
-    List containers
-
-      -a=false: Show all containers. Only running containers are shown by default.
-      -notrunc=false: Don't truncate output
-      -q=false: Only display numeric IDs
-
-.. _cli_pull:
-
-``pull``
--------
-
-::
-
-    Usage: docker pull NAME
-
-    Pull an image or a repository from the registry
-
-
-.. _cli_push:
-
-``push``
--------
-
-::
-
-    Usage: docker push NAME
-
-    Push an image or a repository to the registry
-
-
-.. _cli_restart:
-
-``restart``
-----------
-
-::
-
-    Usage: docker restart [OPTIONS] NAME
-
-    Restart a running container
-
-.. _cli_rm:
-
-``rm``
------
-
-::
-
-    Usage: docker rm [OPTIONS] CONTAINER
-
-    Remove one or more containers
-        -link="": Remove the link instead of the actual container
- 
-
-Examples:
-~~~~~~~~~
-
-.. code-block:: bash
-
-    $ docker rm /redis
-    /redis
-
-
-This will remove the container referenced under the link ``/redis``.
-
-
-.. code-block:: bash
-
-    $ docker rm -link /webapp/redis
-    /webapp/redis
-
-
-This will remove the underlying link between ``/webapp`` and the ``/redis`` containers removing all
-network communication.
-
-.. _cli_rmi:
-
-``rmi``
-------
-
-::
-
-    Usage: docker rmi IMAGE [IMAGE...]
-
-    Remove one or more images
-
-.. _cli_run:
-
-``run``
-------
-
-::
-
-    Usage: docker run [OPTIONS] IMAGE[:TAG] [COMMAND] [ARG...]
-
-    Run a command in a new container
-
-      -a=map[]: Attach to stdin, stdout or stderr
-      -c=0: CPU shares (relative weight)
-      -cidfile="": Write the container ID to the file
-      -d=false: Detached mode: Run container in the background, print new container id
-      -e=[]: Set environment variables
-      -h="": Container host name
-      -i=false: Keep stdin open even if not attached
-      -privileged=false: Give extended privileges to this container
-      -m=0: Memory limit (in bytes)
-      -n=true: Enable networking for this container
-      -p=[]: Map a network port to the container
-      -rm=false: Automatically remove the container when it exits (incompatible with -d)
-      -t=false: Allocate a pseudo-tty
-      -u="": Username or UID
-      -dns=[]: Set custom dns servers for the container
-      -v=[]: Create a bind mount with: [host-dir]:[container-dir]:[rw|ro]. If "container-dir" is missing, then docker creates a new volume.
-      -volumes-from="": Mount all volumes from the given container
-      -entrypoint="": Overwrite the default entrypoint set by the image
-      -w="": Working directory inside the container
-      -lxc-conf=[]: Add custom lxc options -lxc-conf="lxc.cgroup.cpuset.cpus = 0,1"
-      -expose=[]: Expose a port from the container without publishing it to your host
-      -link="": Add link to another container (containerid:alias)
-
-Examples
--------
-
-.. code-block:: bash
-
-    sudo docker run -cidfile /tmp/docker_test.cid ubuntu echo "test"
-
-This will create a container and print "test" to the console. The
-``cidfile`` flag makes docker attempt to create a new file and write the
-container ID to it. If the file exists already, docker will return an
-error. Docker will close this file when docker run exits.
-
-.. code-block:: bash
-
-   docker run mount -t tmpfs none /var/spool/squid
-
-This will *not* work, because by default, most potentially dangerous
-kernel capabilities are dropped; including ``cap_sys_admin`` (which is
-required to mount filesystems). However, the ``-privileged`` flag will
-allow it to run:
-
-.. code-block:: bash
-
-   docker run -privileged mount -t tmpfs none /var/spool/squid
-
-The ``-privileged`` flag gives *all* capabilities to the container,
-and it also lifts all the limitations enforced by the ``device``
-cgroup controller. In other words, the container can then do almost
-everything that the host can do. This flag exists to allow special
-use-cases, like running Docker within Docker.
-
-.. code-block:: bash
-
-   docker  run -w /path/to/dir/ -i -t  ubuntu pwd
-
-The ``-w`` lets the command being executed inside directory given, 
-here /path/to/dir/. If the path does not exists it is created inside the 
-container.
-
-.. code-block:: bash
-
-   docker  run  -v `pwd`:`pwd` -w `pwd` -i -t  ubuntu pwd
-
-The ``-v`` flag mounts the current working directory into the container. 
-The ``-w`` lets the command being executed inside the current 
-working directory, by changing into the directory to the value
-returned by ``pwd``. So this combination executes the command
-using the container, but inside the current working directory.
-
-.. code-block:: bash
-
-    docker run -p 127.0.0.0::80 ubuntu bash
-
-This the ``-p`` flag now allows you to bind a port to a specific
-interface of the host machine.  In this example port ``80`` of the 
-container will have a dynamically allocated port bound to 127.0.0.1 
-of the host.
-
-.. code-block:: bash
-
-    docker run -p 127.0.0.1:80:80 ubuntu bash
-
-This will bind port ``80`` of the container to port ``80`` on 127.0.0.1 of your
-host machine.
-
-.. code-block:: bash
-
-    docker run -expose 80 ubuntu bash
-
-This will expose port ``80`` of the container for use within a link
-without publishing the port to the host system's interfaces.  
-
-.. code-block:: bash
-
-    docker run -link /redis:redis ubuntu bash
-
-The ``-link`` flag will link the container named ``/redis`` into the 
-newly created container with the alias ``redis``.  The new container
-can access the network and environment of the redis container via
-environment variables.
-
-.. _cli_search:
-
-``search``
----------
-
-::
-
-    Usage: docker search TERM
-
-    Searches for the TERM parameter on the Docker index and prints out
-    a list of repositories that match.
-
-.. _cli_start:
-
-``start``
---------
-
-::
-
-    Usage: docker start [OPTIONS] NAME
-
-    Start a stopped container
-
-.. _cli_stop:
-
-``stop``
--------
-
-::
-
-    Usage: docker stop [OPTIONS] CONTAINER [CONTAINER...]
-
-    Stop a running container
-
-      -t=10: Number of seconds to wait for the container to stop before killing it.
-
-.. _cli_tag:
-
-``tag``
-------
-
-::
-
-    Usage: docker tag [OPTIONS] IMAGE REPOSITORY [TAG]
-
-    Tag an image into a repository
-
-      -f=false: Force
-
-.. _cli_top:
-
-``top``
-------
-
-::
-
-    Usage: docker top CONTAINER
-
-    Lookup the running processes of a container
-
-.. _cli_version:
-
-``version``
-----------
-
-Show the version of the docker client, daemon, and latest released version.
-
-
-.. _cli_wait:
-
-``wait``
--------
-
-::
-
-    Usage: docker wait [OPTIONS] NAME
-
-    Block until a container stops, then print its exit code.
-
+.. include:: command/wait.rst


@@ -0,0 +1,59 @@
+:title: Attach Command
+:description: Attach to a running container
+:keywords: attach, container, docker, documentation
+
+===========================================
+``attach`` -- Attach to a running container
+===========================================
+
+::
+
+    Usage: docker attach CONTAINER
+
+    Attach to a running container.
+
+You can detach from the container again (and leave it running) with
+``CTRL-c`` (for a quiet exit) or ``CTRL-\`` to get a stacktrace of
+the Docker client when it quits.
+
+To stop a container, use ``docker stop``
+
+To kill the container, use ``docker kill``
+ 
+Examples:
+---------
+
+.. code-block:: bash
+
+     $ ID=$(sudo docker run -d ubuntu /usr/bin/top -b)
+     $ sudo docker attach $ID
+     top - 02:05:52 up  3:05,  0 users,  load average: 0.01, 0.02, 0.05
+     Tasks:   1 total,   1 running,   0 sleeping,   0 stopped,   0 zombie
+     Cpu(s):  0.1%us,  0.2%sy,  0.0%ni, 99.7%id,  0.0%wa,  0.0%hi,  0.0%si,  0.0%st
+     Mem:    373572k total,   355560k used,    18012k free,    27872k buffers
+     Swap:   786428k total,        0k used,   786428k free,   221740k cached
+
+     PID USER      PR  NI  VIRT  RES  SHR S %CPU %MEM    TIME+  COMMAND            
+      1 root      20   0 17200 1116  912 R    0  0.3   0:00.03 top                
+
+      top - 02:05:55 up  3:05,  0 users,  load average: 0.01, 0.02, 0.05
+      Tasks:   1 total,   1 running,   0 sleeping,   0 stopped,   0 zombie
+      Cpu(s):  0.0%us,  0.2%sy,  0.0%ni, 99.8%id,  0.0%wa,  0.0%hi,  0.0%si,  0.0%st
+      Mem:    373572k total,   355244k used,    18328k free,    27872k buffers
+      Swap:   786428k total,        0k used,   786428k free,   221776k cached
+
+        PID USER      PR  NI  VIRT  RES  SHR S %CPU %MEM    TIME+  COMMAND            
+	    1 root      20   0 17208 1144  932 R    0  0.3   0:00.03 top                
+
+
+      top - 02:05:58 up  3:06,  0 users,  load average: 0.01, 0.02, 0.05
+      Tasks:   1 total,   1 running,   0 sleeping,   0 stopped,   0 zombie
+      Cpu(s):  0.2%us,  0.3%sy,  0.0%ni, 99.5%id,  0.0%wa,  0.0%hi,  0.0%si,  0.0%st
+      Mem:    373572k total,   355780k used,    17792k free,    27880k buffers
+      Swap:   786428k total,        0k used,   786428k free,   221776k cached
+
+      PID USER      PR  NI  VIRT  RES  SHR S %CPU %MEM    TIME+  COMMAND            
+           1 root      20   0 17208 1144  932 R    0  0.3   0:00.03 top                
+     ^C$ 
+     $ sudo docker stop $ID
+
@@ -0,0 +1,65 @@
+:title: Build Command
+:description: Build a new image from the Dockerfile passed via stdin
+:keywords: build, docker, container, documentation
+
+================================================
+``build`` -- Build a container from a Dockerfile
+================================================
+
+::
+
+    Usage: docker build [OPTIONS] PATH | URL | -
+    Build a new container image from the source code at PATH
+      -t="": Repository name (and optionally a tag) to be applied to the resulting image in case of success.
+      -q=false: Suppress verbose build output.
+      -no-cache: Do not use the cache when building the image.
+      -rm: Remove intermediate containers after a successful build
+    When a single Dockerfile is given as URL, then no context is set. When a git repository is set as URL, the repository is used as context
+
+
+Examples
+--------
+
+.. code-block:: bash
+
+    sudo docker build .
+
+This will read the ``Dockerfile`` from the current directory. It will
+also send any other files and directories found in the current
+directory to the ``docker`` daemon.
+
+The contents of this directory would be used by ``ADD`` commands found
+within the ``Dockerfile``.  This will send a lot of data to the
+``docker`` daemon if the current directory contains a lot of data.  If
+the absolute path is provided instead of ``.`` then only the files and
+directories required by the ADD commands from the ``Dockerfile`` will be
+added to the context and transferred to the ``docker`` daemon.
+
+.. code-block:: bash
+
+   sudo docker build -t vieux/apache:2.0 .
+
+This will build like the previous example, but it will then tag the
+resulting image. The repository name will be ``vieux/apache`` and the
+tag will be ``2.0``
+
+
+.. code-block:: bash
+
+    sudo docker build - < Dockerfile
+
+This will read a ``Dockerfile`` from *stdin* without context. Due to
+the lack of a context, no contents of any local directory will be sent
+to the ``docker`` daemon.  ``ADD`` doesn't work when running in this
+mode because the absence of the context provides no source files to
+copy to the container.
+
+
+.. code-block:: bash
+
+    sudo docker build github.com/creack/docker-firefox
+
+This will clone the Github repository and use it as context. The
+``Dockerfile`` at the root of the repository is used as
+``Dockerfile``.  Note that you can specify an arbitrary git repository
+by using the ``git://`` schema.
@@ -0,0 +1,52 @@
+:title: Commit Command
+:description: Create a new image from a container's changes
+:keywords: commit, docker, container, documentation
+
+===========================================================
+``commit`` -- Create a new image from a container's changes
+===========================================================
+
+::
+
+    Usage: docker commit [OPTIONS] CONTAINER [REPOSITORY [TAG]]
+
+    Create a new image from a container's changes
+
+      -m="": Commit message
+      -author="": Author (eg. "John Hannibal Smith <hannibal@a-team.com>"
+      -run="": Configuration to be applied when the image is launched with `docker run`. 
+               (ex: '{"Cmd": ["cat", "/world"], "PortSpecs": ["22"]}')
+
+Full -run example (multiline is ok within a single quote ``'``)
+
+::
+
+  $ sudo docker commit -run='
+  {
+      "Entrypoint" : null,
+      "Privileged" : false,
+      "User" : "",
+      "VolumesFrom" : "",
+      "Cmd" : ["cat", "-e", "/etc/resolv.conf"],
+      "Dns" : ["8.8.8.8", "8.8.4.4"],
+      "MemorySwap" : 0,
+      "AttachStdin" : false,
+      "AttachStderr" : false,
+      "CpuShares" : 0,
+      "OpenStdin" : false,
+      "Volumes" : null,
+      "Hostname" : "122612f45831",
+      "PortSpecs" : ["22", "80", "443"],
+      "Image" : "b750fe79269d2ec9a3c593ef05b4332b1d1a02a62b4accb2c21d589ff2f5f2dc",
+      "Tty" : false,
+      "Env" : [
+         "HOME=/",
+         "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+      ],
+      "StdinOnce" : false,
+      "Domainname" : "",
+      "WorkingDir" : "/",
+      "NetworkDisabled" : false,
+      "Memory" : 0,
+      "AttachStdout" : false
+  }' $CONTAINER_ID
@@ -0,0 +1,14 @@
+:title: Cp Command
+:description: Copy files/folders from the containers filesystem to the host path
+:keywords: cp, docker, container, documentation, copy
+
+============================================================================
+``cp`` -- Copy files/folders from the containers filesystem to the host path
+============================================================================
+
+::
+
+    Usage: docker cp CONTAINER:RESOURCE HOSTPATH
+
+    Copy files/folders from the containers filesystem to the host
+    path.  Paths are relative to the root of the filesystem.
@@ -0,0 +1,13 @@
+:title: Diff Command
+:description: Inspect changes on a container's filesystem
+:keywords: diff, docker, container, documentation
+
+=======================================================
+``diff`` -- Inspect changes on a container's filesystem
+=======================================================
+
+::
+
+    Usage: docker diff CONTAINER [OPTIONS]
+
+    Inspect changes on a container's filesystem
@@ -0,0 +1,34 @@
+:title: Events Command
+:description: Get real time events from the server
+:keywords: events, docker, documentation
+
+=================================================================
+``events`` -- Get real time events from the server
+=================================================================
+
+::
+
+    Usage: docker events
+
+    Get real time events from the server
+
+Examples
+--------
+
+Starting and stopping a container
+.................................
+
+.. code-block:: bash
+
+    $ sudo docker start 4386fb97867d
+    $ sudo docker stop 4386fb97867d
+
+In another shell
+
+.. code-block:: bash
+    
+    $ sudo docker events
+    [2013-09-03 15:49:26 +0200 CEST] 4386fb97867d: (from 12de384bfb10) start
+    [2013-09-03 15:49:29 +0200 CEST] 4386fb97867d: (from 12de384bfb10) die
+    [2013-09-03 15:49:29 +0200 CEST] 4386fb97867d: (from 12de384bfb10) stop
+
@@ -0,0 +1,13 @@
+:title: Export Command
+:description: Export the contents of a filesystem as a tar archive
+:keywords: export, docker, container, documentation
+
+=================================================================
+``export`` -- Stream the contents of a container as a tar archive
+=================================================================
+
+::
+
+    Usage: docker export CONTAINER
+
+    Export the contents of a filesystem as a tar archive
@@ -0,0 +1,13 @@
+:title: History Command
+:description: Show the history of an image
+:keywords: history, docker, container, documentation
+
+===========================================
+``history`` -- Show the history of an image
+===========================================
+
+::
+
+    Usage: docker history [OPTIONS] IMAGE
+
+    Show the history of an image
@@ -0,0 +1,26 @@
+:title: Images Command
+:description: List images
+:keywords: images, docker, container, documentation
+
+=========================
+``images`` -- List images
+=========================
+
+::
+
+    Usage: docker images [OPTIONS] [NAME]
+
+    List images
+
+      -a=false: show all images
+      -q=false: only show numeric IDs
+      -viz=false: output in graphviz format
+
+Displaying images visually
+--------------------------
+
+::
+
+    sudo docker images -viz | dot -Tpng -o docker.png
+
+.. image:: https://docs.docker.io/en/latest/_static/docker_images.gif
@@ -0,0 +1,44 @@
+:title: Import Command
+:description: Create a new filesystem image from the contents of a tarball
+:keywords: import, tarball, docker, url, documentation
+
+==========================================================================
+``import`` -- Create a new filesystem image from the contents of a tarball
+==========================================================================
+
+::
+
+    Usage: docker import URL|- [REPOSITORY [TAG]]
+
+    Create a new filesystem image from the contents of a tarball
+
+At this time, the URL must start with ``http`` and point to a single
+file archive (.tar, .tar.gz, .tgz, .bzip, .tar.xz, .txz) containing a
+root filesystem. If you would like to import from a local directory or
+archive, you can use the ``-`` parameter to take the data from
+standard in.
+
+Examples
+--------
+
+Import from a remote location
+.............................
+
+``$ sudo docker import http://example.com/exampleimage.tgz exampleimagerepo``
+
+Import from a local file
+........................
+
+Import to docker via pipe and standard in
+
+``$ cat exampleimage.tgz | sudo docker import - exampleimagelocal``
+
+Import from a local directory
+.............................
+
+``$ sudo tar -c . | docker import - exampleimagedir``
+
+Note the ``sudo`` in this example -- you must preserve the ownership
+of the files (especially root ownership) during the archiving with
+tar. If you are not root (or sudo) when you tar, then the ownerships
+might not get preserved.
@@ -0,0 +1,13 @@
+:title: Info Command
+:description: Display system-wide information.
+:keywords: info, docker, information, documentation
+
+===========================================
+``info`` -- Display system-wide information
+===========================================
+
+::
+
+    Usage: docker info
+
+    Display system-wide information.
@@ -0,0 +1,23 @@
+:title: Insert Command
+:description: Insert a file in an image
+:keywords: insert, image, docker, documentation
+
+==========================================================================
+``insert`` -- Insert a file in an image
+==========================================================================
+
+::
+
+    Usage: docker insert IMAGE URL PATH
+
+    Insert a file from URL in the IMAGE at PATH
+
+Examples
+--------
+
+Insert file from github
+.......................
+
+.. code-block:: bash
+
+    $ sudo docker insert 8283e18b24bc https://raw.github.com/metalivedev/django/master/postinstall /tmp/postinstall.sh
@@ -0,0 +1,13 @@
+:title: Inspect Command
+:description: Return low-level information on a container
+:keywords: inspect, container, docker, documentation
+
+==========================================================
+``inspect`` -- Return low-level information on a container
+==========================================================
+
+::
+
+    Usage: docker inspect [OPTIONS] CONTAINER
+
+    Return low-level information on a container
@@ -0,0 +1,13 @@
+:title: Kill Command
+:description: Kill a running container
+:keywords: kill, container, docker, documentation
+
+====================================
+``kill`` -- Kill a running container
+====================================
+
+::
+
+    Usage: docker kill [OPTIONS] CONTAINER [CONTAINER...]
+
+    Kill a running container
@@ -0,0 +1,29 @@
+:title: Link Command
+:description: Add a link or rename the link for a container
+:keywords: link, docker, container, documentation, link, links
+
+============================================================================
+``link`` -- Add a link or rename the link for a container
+============================================================================
+
+::
+
+    Usage: docker link CURRENT_NAME NEW_NAME
+
+    Link a container to a new name.
+
+
+Examples:
+--------
+
+.. code-block:: bash
+
+    $ docker link /59669e088202c2ebe150b4346cb3301562d073b51261176a354a74e8f618bfbc /redis
+    $ docker ls
+    NAME                                                                      ID                                                                 IMAGE
+    /redis                                                                    59669e088202c2ebe150b4346cb3301562d073b51261176a354a74e8f618bfbc   crosbymichael/redis:latest
+    /59669e088202c2ebe150b4346cb3301562d073b51261176a354a74e8f618bfbc         59669e088202c2ebe150b4346cb3301562d073b51261176a354a74e8f618bfbc   crosbymichael/redis:latest
+
+
+This will create a new link for the existing name ``/59669e088202c2ebe150b4346cb3301562d073b51261176a354a74e8f618bfbc`` 
+with the new name ``/redis`` so that we can new reference the same container under the new name ``/redis``.
@@ -0,0 +1,24 @@
+:title: Login Command
+:description: Register or Login to the docker registry server
+:keywords: login, docker, documentation
+
+============================================================
+``login`` -- Register or Login to the docker registry server
+============================================================
+
+::
+
+    Usage: docker login [OPTIONS] [SERVER]
+
+    Register or Login to the docker registry server
+
+    -e="": email
+    -p="": password
+    -u="": username
+
+    If you want to login to a private registry you can
+    specify this by adding the server name.
+
+    example:
+    docker login localhost:8080
+
@@ -0,0 +1,13 @@
+:title: Logs Command
+:description: Fetch the logs of a container
+:keywords: logs, container, docker, documentation
+
+=========================================
+``logs`` -- Fetch the logs of a container
+=========================================
+
+::
+
+    Usage: docker logs [OPTIONS] CONTAINER
+
+    Fetch the logs of a container
@@ -0,0 +1,29 @@
+:title: Ls Command
+:description: Ls all links for containers
+:keywords: ls, docker, container, documentation, link, links
+
+============================================================================
+``ls`` -- List all links for containers
+============================================================================
+
+::
+
+    Usage: docker ls
+
+    List all links for containers and display the relationship between parent
+    and child containers.
+
+
+Examples:
+--------
+
+.. code-block:: bash
+
+    $ docker ls
+    NAME                                                                      ID                                                                 IMAGE
+    /redis                                                                    39588b6a45100ef5b328b2c302ea085624f29e6cbab70f88be04793af02cec89   crosbymichael/redis:latest
+    /webapp                                                                   cffb86ffa80b11cd8777d300759ee53c4e61729431c30ec9552dd9e6d3abc87d   demo:latest
+    /webapp/redis                                                             39588b6a45100ef5b328b2c302ea085624f29e6cbab70f88be04793af02cec89   crosbymichael/redis:latest
+
+This will display all links and the names that you can use the reference the link.  Parent child 
+relationships are also displayed with ls.
@@ -0,0 +1,13 @@
+:title: Port Command
+:description: Lookup the public-facing port which is NAT-ed to PRIVATE_PORT
+:keywords: port, docker, container, documentation
+
+=========================================================================
+``port`` -- Lookup the public-facing port which is NAT-ed to PRIVATE_PORT
+=========================================================================
+
+::
+
+    Usage: docker port [OPTIONS] CONTAINER PRIVATE_PORT
+
+    Lookup the public-facing port which is NAT-ed to PRIVATE_PORT
@@ -0,0 +1,17 @@
+:title: Ps Command
+:description: List containers
+:keywords: ps, docker, documentation, container
+
+=========================
+``ps`` -- List containers
+=========================
+
+::
+
+    Usage: docker ps [OPTIONS]
+
+    List containers
+
+      -a=false: Show all containers. Only running containers are shown by default.
+      -notrunc=false: Don't truncate output
+      -q=false: Only display numeric IDs
@@ -0,0 +1,13 @@
+:title: Pull Command
+:description: Pull an image or a repository from the registry
+:keywords: pull, image, repo, repository, documentation, docker
+
+=========================================================================
+``pull`` -- Pull an image or a repository from the docker registry server
+=========================================================================
+
+::
+
+    Usage: docker pull NAME
+
+    Pull an image or a repository from the registry
@@ -0,0 +1,13 @@
+:title: Push Command
+:description: Push an image or a repository to the registry
+:keywords: push, docker, image, repository, documentation, repo
+
+=======================================================================
+``push`` -- Push an image or a repository to the docker registry server
+=======================================================================
+
+::
+
+    Usage: docker push NAME
+
+    Push an image or a repository to the registry
@@ -0,0 +1,13 @@
+:title: Restart Command
+:description: Restart a running container
+:keywords: restart, container, docker, documentation
+
+==========================================
+``restart`` -- Restart a running container
+==========================================
+
+::
+
+    Usage: docker restart [OPTIONS] NAME
+
+    Restart a running container
@@ -0,0 +1,36 @@
+:title: Rm Command
+:description: Remove a container
+:keywords: remove, container, docker, documentation, rm
+
+============================
+``rm`` -- Remove a container
+============================
+
+::
+
+    Usage: docker rm [OPTIONS] CONTAINER
+
+    Remove one or more containers
+        -link="": Remove the link instead of the actual container
+ 
+
+Examples:
+--------
+
+.. code-block:: bash
+
+    $ docker rm /redis
+    /redis
+
+
+This will remove the container referenced under the link ``/redis``.
+
+
+.. code-block:: bash
+
+    $ docker rm -link /webapp/redis
+    /webapp/redis
+
+
+This will remove the underlying link between ``/webapp`` and the ``/redis`` containers removing all
+network communication.
@@ -0,0 +1,13 @@
+:title: Rmi Command
+:description: Remove an image
+:keywords: rmi, remove, image, docker, documentation
+
+==========================
+``rmi`` -- Remove an image
+==========================
+
+::
+
+    Usage: docker rmi IMAGE [IMAGE...]
+
+    Remove one or more images
@@ -0,0 +1,117 @@
+:title: Run Command
+:description: Run a command in a new container
+:keywords: run, container, docker, documentation 
+
+===========================================
+``run`` -- Run a command in a new container
+===========================================
+
+::
+
+    Usage: docker run [OPTIONS] IMAGE[:TAG] [COMMAND] [ARG...]
+
+    Run a command in a new container
+
+      -a=map[]: Attach to stdin, stdout or stderr
+      -c=0: CPU shares (relative weight)
+      -cidfile="": Write the container ID to the file
+      -d=false: Detached mode: Run container in the background, print new container id
+      -e=[]: Set environment variables
+      -h="": Container host name
+      -i=false: Keep stdin open even if not attached
+      -privileged=false: Give extended privileges to this container
+      -m=0: Memory limit (in bytes)
+      -n=true: Enable networking for this container
+      -p=[]: Map a network port to the container
+      -rm=false: Automatically remove the container when it exits (incompatible with -d)
+      -t=false: Allocate a pseudo-tty
+      -u="": Username or UID
+      -dns=[]: Set custom dns servers for the container
+      -v=[]: Create a bind mount with: [host-dir]:[container-dir]:[rw|ro]. If "host-dir" is missing, then docker creates a new volume
+      -volumes-from="": Mount all volumes from the given container
+      -entrypoint="": Overwrite the default entrypoint set by the image
+      -w="": Working directory inside the container
+      -lxc-conf=[]: Add custom lxc options -lxc-conf="lxc.cgroup.cpuset.cpus = 0,1"
+      -expose=[]: Expose a port from the container without publishing it to your host
+      -link="": Add link to another container (containerid:alias)
+
+Examples
+--------
+
+.. code-block:: bash
+
+    sudo docker run -cidfile /tmp/docker_test.cid ubuntu echo "test"
+
+This will create a container and print "test" to the console. The
+``cidfile`` flag makes docker attempt to create a new file and write the
+container ID to it. If the file exists already, docker will return an
+error. Docker will close this file when docker run exits.
+
+.. code-block:: bash
+
+   docker run mount -t tmpfs none /var/spool/squid
+
+This will *not* work, because by default, most potentially dangerous
+kernel capabilities are dropped; including ``cap_sys_admin`` (which is
+required to mount filesystems). However, the ``-privileged`` flag will
+allow it to run:
+
+.. code-block:: bash
+
+   docker run -privileged mount -t tmpfs none /var/spool/squid
+
+The ``-privileged`` flag gives *all* capabilities to the container,
+and it also lifts all the limitations enforced by the ``device``
+cgroup controller. In other words, the container can then do almost
+everything that the host can do. This flag exists to allow special
+use-cases, like running Docker within Docker.
+
+.. code-block:: bash
+
+   docker  run -w /path/to/dir/ -i -t  ubuntu pwd
+
+The ``-w`` lets the command being executed inside directory given, 
+here /path/to/dir/. If the path does not exists it is created inside the 
+container.
+
+.. code-block:: bash
+
+   docker  run  -v `pwd`:`pwd` -w `pwd` -i -t  ubuntu pwd
+
+The ``-v`` flag mounts the current working directory into the container. 
+The ``-w`` lets the command being executed inside the current 
+working directory, by changing into the directory to the value
+returned by ``pwd``. So this combination executes the command
+using the container, but inside the current working directory.
+
+.. code-block:: bash
+
+    docker run -p 127.0.0.0::80 ubuntu bash
+
+This the ``-p`` flag now allows you to bind a port to a specific
+interface of the host machine.  In this example port ``80`` of the 
+container will have a dynamically allocated port bound to 127.0.0.1 
+of the host.
+
+.. code-block:: bash
+
+    docker run -p 127.0.0.1:80:80 ubuntu bash
+
+This will bind port ``80`` of the container to port ``80`` on 127.0.0.1 of your
+host machine.
+
+.. code-block:: bash
+
+    docker run -expose 80 ubuntu bash
+
+This will expose port ``80`` of the container for use within a link
+without publishing the port to the host system's interfaces.  
+
+.. code-block:: bash
+
+    docker run -link /redis:redis ubuntu bash
+
+The ``-link`` flag will link the container named ``/redis`` into the 
+newly created container with the alias ``redis``.  The new container
+can access the network and environment of the redis container via
+environment variables.
@@ -0,0 +1,14 @@
+:title: Search Command
+:description: Searches for the TERM parameter on the Docker index and prints out a list of repositories that match.
+:keywords: search, docker, image, documentation 
+
+===================================================================
+``search`` -- Search for an image in the docker index
+===================================================================
+
+::
+
+    Usage: docker search TERM
+
+    Searches for the TERM parameter on the Docker index and prints out
+    a list of repositories that match.
@@ -0,0 +1,13 @@
+:title: Start Command
+:description: Start a stopped container
+:keywords: start, docker, container, documentation
+
+======================================
+``start`` -- Start a stopped container
+======================================
+
+::
+
+    Usage: docker start [OPTIONS] NAME
+
+    Start a stopped container
@@ -0,0 +1,15 @@
+:title: Stop Command
+:description: Stop a running container
+:keywords: stop, container, docker, documentation
+
+====================================
+``stop`` -- Stop a running container
+====================================
+
+::
+
+    Usage: docker stop [OPTIONS] CONTAINER [CONTAINER...]
+
+    Stop a running container
+
+      -t=10: Number of seconds to wait for the container to stop before killing it.
@@ -0,0 +1,15 @@
+:title: Tag Command
+:description: Tag an image into a repository
+:keywords: tag, docker, image, repository, documentation, repo
+
+=========================================
+``tag`` -- Tag an image into a repository
+=========================================
+
+::
+
+    Usage: docker tag [OPTIONS] IMAGE REPOSITORY [TAG]
+
+    Tag an image into a repository
+
+      -f=false: Force
@@ -0,0 +1,13 @@
+:title: Top Command
+:description: Lookup the running processes of a container
+:keywords: top, docker, container, documentation
+
+=======================================================
+``top`` -- Lookup the running processes of a container
+=======================================================
+
+::
+
+    Usage: docker top CONTAINER
+
+    Lookup the running processes of a container
@@ -0,0 +1,7 @@
+:title: Version Command
+:description: 
+:keywords: version, docker, documentation
+
+==================================================
+``version`` -- Show the docker version information
+==================================================
@@ -0,0 +1,13 @@
+:title: Wait Command
+:description: Block until a container stops, then print its exit code.
+:keywords: wait, docker, container, documentation
+
+===================================================================
+``wait`` -- Block until a container stops, then print its exit code
+===================================================================
+
+::
+
+    Usage: docker wait [OPTIONS] NAME
+
+    Block until a container stops, then print its exit code.
@@ -1,6 +1,6 @@
 :title: Commands
-:description: docker command line interface
-:keywords: commands, command line, help, docker
+:description: -- todo: change me
+:keywords: todo, commands, command line, help, docker, documentation


 Commands
@@ -12,3 +12,34 @@ Contents:
  :maxdepth: 1

  cli
+  attach  <command/attach>
+  build   <command/build>
+  commit  <command/commit>
+  cp      <command/cp>
+  diff    <command/diff>
+  events  <command/events>
+  export  <command/export>
+  history <command/history>
+  images  <command/images>
+  import  <command/import>
+  info    <command/info>
+  insert  <command/insert>
+  inspect <command/inspect>
+  kill    <command/kill>
+  login   <command/login>
+  logs    <command/logs>
+  port    <command/port>
+  ps      <command/ps>
+  pull    <command/pull>
+  push    <command/push>
+  restart <command/restart>
+  rm      <command/rm>
+  rmi     <command/rmi>
+  run     <command/run>
+  search  <command/search>
+  start   <command/start>
+  stop    <command/stop>
+  tag     <command/tag>
+  top     <command/top>
+  version <command/version>
+  wait    <command/wait>
@@ -124,7 +124,7 @@ You can run an interactive session in the newly built container:



-.. note:: The binary is available outside the container in the directory  ``./bundles/<version>-dev/binary/``. You can swap your host docker executable with this binary for live testing - for example, on ubuntu: ``sudo service docker stop ; sudo cp $(which docker) $(which docker)_ ; sudo cp ./bundles/<version>-dev/binary/docker-<version>-dev $(which docker);sudo service docker start``.
+.. note:: The binary is availalbe outside the container in the directory  ``./bundles/<version>-dev/binary/``.


 **Need More Help?**
@@ -178,4 +178,4 @@ you could skip to any of the other examples:
 * :ref:`running_ssh_service`
 * :ref:`running_couchdb_service`
 * :ref:`postgresql_service`
-* :ref:`mongodb_image`
+* :ref:`mongodb`
@@ -54,16 +54,24 @@ Run the redis container

 .. code-block:: bash
    
-    docker run -d -e PASSWORD=docker crosbymichael/redis --requirepass docker
+    docker run -d -e PASSWORD=docker crosbymichael/redis --requirepass=docker
 
 This will run our redis container using the default port of 6379 and using
 as password to secure our service. Next we will link the redis container to 
-a new name using ``docker link``.
+a new name using ``docker link`` and ``docker ls``.


 Linking an existing container
 -----------------------------

+.. code-block:: bash
+
+    docker ls
+
+    NAME                                                                      ID                                                                 IMAGE
+    /39588b6a45100ef5b328b2c302ea085624f29e6cbab70f88be04793af02cec89         39588b6a45100ef5b328b2c302ea085624f29e6cbab70f88be04793af02cec89   crosbymichael/redis:latest
+
+
 Docker will automatically create an initial link with the container's id but
 because the is long and not very user friendly we can link the container with
 a new name.
@@ -72,6 +80,12 @@ a new name.

    docker link /39588b6a45100ef5b328b2c302ea085624f29e6cbab70f88be04793af02cec89 /redis

+    docker ls 
+
+    NAME                                                                      ID                                                                 IMAGE
+    /redis                                                                    39588b6a45100ef5b328b2c302ea085624f29e6cbab70f88be04793af02cec89   crosbymichael/redis:latest
+    /39588b6a45100ef5b328b2c302ea085624f29e6cbab70f88be04793af02cec89         39588b6a45100ef5b328b2c302ea085624f29e6cbab70f88be04793af02cec89   crosbymichael/redis:latest
+
 Now we can reference our running redis service using the friendly name ``/redis``.  
 We can issue all the commands that you would expect; start, stop, attach, using the new name.

@@ -39,12 +39,12 @@ Update its dependencies.

    apt-get update

-Install ``python-software-properties``.
+Install ``python-software-properies``.

 .. code-block:: bash

-    apt-get -y install python-software-properties
-    apt-get -y install software-properties-common
+    apt-get install python-software-properties
+    apt-get install software-properties-common

 Add Pitti's PostgreSQL repository. It contains the most recent stable release
 of PostgreSQL i.e. ``9.2``.
@@ -77,8 +77,7 @@ role.

 Adjust PostgreSQL configuration so that remote connections to the
 database are possible. Make sure that inside
-``/etc/postgresql/9.2/main/pg_hba.conf`` you have following line (you will need
-to install an editor, e.g. ``apt-get install vim``):
+``/etc/postgresql/9.2/main/pg_hba.conf`` you have following line:

 .. code-block:: bash

@@ -91,17 +90,9 @@ uncomment ``listen_addresses`` so it is as follows:

    listen_addresses='*'

-.. note::
-
-    This PostgreSQL setup is for development only purposes. Refer
-    to PostgreSQL documentation how to fine-tune these settings so that it
-    is enough secure.
-
-Exit.
-
-.. code-block:: bash
-
-    exit
+*Note:* this PostgreSQL setup is for development only purposes. Refer
+to PostgreSQL documentation how to fine-tune these settings so that it
+is enough secure.

 Create an image and assign it a name. ``<container_id>`` is in the
 Bash prompt; you can also locate it using ``docker ps -a``.
@@ -120,9 +111,7 @@ Finally, run PostgreSQL server via ``docker``.
        -D /var/lib/postgresql/9.2/main \
        -c config_file=/etc/postgresql/9.2/main/postgresql.conf')

-Connect the PostgreSQL server using ``psql`` (You will need postgres installed
-on the machine.  For ubuntu, use something like
-``sudo apt-get install postgresql``).
+Connect the PostgreSQL server using ``psql``.

 .. code-block:: bash

@@ -139,7 +128,7 @@ As before, create roles or databases if needed.
    docker=# CREATE DATABASE foo OWNER=docker;
    CREATE DATABASE

-Additionally, publish your newly created image on Docker Index.
+Additionally, publish there your newly created image on Docker Index.

 .. code-block:: bash

@@ -160,11 +149,10 @@ container starts.

 .. code-block:: bash

-    sudo docker commit -run='{"Cmd": \
+    sudo docker commit <container_id> <your username> postgresql -run='{"Cmd": \
      ["/bin/su", "postgres", "-c", "/usr/lib/postgresql/9.2/bin/postgres -D \
      /var/lib/postgresql/9.2/main -c \
-      config_file=/etc/postgresql/9.2/main/postgresql.conf"], "PortSpecs": ["5432"]}' \
-      <container_id> <your username>/postgresql
+      config_file=/etc/postgresql/9.2/main/postgresql.conf"], "PortSpecs": ["5432"]}'

 From now on, just type ``docker run <your username>/postgresql`` and
 PostgreSQL should automatically start.
@@ -2,6 +2,8 @@
 :description: An overview of the Docker Documentation
 :keywords: containers, lxc, concepts, explanation

+.. image:: https://www.docker.io/static/img/linked/dockerlogo-horizontal.png
+
 Introduction
 ------------

@@ -44,10 +44,10 @@ Security Group to allow SSH.** By default all incoming ports to your
 new instance will be blocked by the AWS Security Group, so you might
 just get timeouts when you try to connect.

-Installing with ``get.docker.io`` (as above) will create a service named
-``lxc-docker``. It will also set up a :ref:`docker group <dockergroup>` and you
-may want to add the *ubuntu* user to it so that you don't have to use ``sudo``
-for every Docker command.
+Installing with ``get.docker.io`` (as above) will create a service
+named ``dockerd``. You may want to set up a :ref:`docker group
+<dockergroup>` and add the *ubuntu* user to it so that you don't have
+to use ``sudo`` for every Docker command.

 Once you've got Docker installed, you're ready to try it out -- head
 on over to the :doc:`../use/basics` or :doc:`../examples/index` section.
@@ -96,3 +96,16 @@ Or, to enable it more permanently:
 .. code-block:: bash

   echo net.ipv4.ip_forward = 1 | sudo tee /etc/sysctl.d/docker.conf
+
+fork/exec /usr/sbin/lxc-start: operation not permitted
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Unfortunately, Gentoo suffers from `issue #1422
+<https://github.com/dotcloud/docker/issues/1422>`_, meaning that after every
+fresh start of docker, the first docker run fails due to some tricky terminal
+issues, so be sure to run something trivial (such as ``docker run -i -t busybox
+echo hi``) before attempting to run anything important.
+
+There is a tentative (and very hacky) workaround for this in the OpenRC init
+script, and it can be enabled by modifying the appropriate value in
+``/etc/conf.d/docker`` after successful installation.
@@ -75,7 +75,7 @@ Docker is available as a Debian package, which makes installation easy.

   # Add the Docker repository key to your local keychain
   # using apt-key finger you can check the fingerprint matches 36A1 D786 9245 C895 0F96 6E92 D857 6A8B A88D 21E9
-   sudo sh -c "wget -qO- https://get.docker.io/gpg | apt-key add -"
+   sudo sh -c "curl https://get.docker.io/gpg | apt-key add -"

   # Add the Docker repository to your apt sources list.
   sudo sh -c "echo deb http://get.docker.io/ubuntu docker main > /etc/apt/sources.list.d/docker.list"
@@ -129,7 +129,7 @@ to follow them again.*

   # Add the Docker repository key to your local keychain
   # using apt-key finger you can check the fingerprint matches 36A1 D786 9245 C895 0F96 6E92 D857 6A8B A88D 21E9
-   sudo sh -c "wget -qO- https://get.docker.io/gpg | apt-key add -"
+   sudo sh -c "curl https://get.docker.io/gpg | apt-key add -"

   # Add the Docker repository to your apt sources list.
   sudo sh -c "echo deb http://get.docker.io/ubuntu docker main > /etc/apt/sources.list.d/docker.list"
@@ -53,7 +53,9 @@ Spin it up

   * Download the 'official' Precise64 base ubuntu virtual machine image from vagrantup.com
   * Boot this image in virtualbox
-   * Follow official :ref:`ubuntu_linux` installation path
+   * Add the `Docker PPA sources <https://launchpad.net/~dotcloud/+archive/lxc-docker>`_ to /etc/apt/sources.lst
+   * Update your sources
+   * Install lxc-docker

   You now have a Ubuntu Virtual Machine running with docker pre-installed.

@@ -54,14 +54,8 @@ Docker evaluates the instructions in a Dockerfile in order. **The
 first instruction must be `FROM`** in order to specify the
 :ref:`base_image_def` from which you are building.

-Docker will treat lines that *begin* with ``#`` as a comment. A ``#``
-marker anywhere else in the line will be treated as an argument. This
-allows statements like:
-
-::
-
-    # Comment
-    RUN echo 'we are running some # of cool things'
+Docker will ignore **comment lines** *beginning* with ``#``. A comment
+marker anywhere in the rest of the line will be treated as an argument.

 3. Instructions
 ===============
@@ -232,10 +226,10 @@ The copy obeys the following rules:
  with conflicts resolved in favor of 2) on a file-by-file basis.

 * If ``<src>`` is any other kind of file, it is copied individually
-  along with its metadata. In this case, if ``<dest>`` ends with a
+  along with its metadata. In this case, if ``<dst>`` ends with a
  trailing slash ``/``, it will be considered a directory and the
-  contents of ``<src>`` will be written at ``<dest>/base(<src>)``.
-* If ``<dest>`` does not end with a trailing slash, it will be
+  contents of ``<src>`` will be written at ``<dst>/base(<src>)``.
+* If ``<dst>`` does not end with a trailing slash, it will be
  considered a regular file and the contents of ``<src>`` will be
  written at ``<dst>``.
 * If ``<dest>`` doesn't exist, it is created along with all missing
@@ -327,7 +321,7 @@ the command given by ``CMD`` is executed.
    # VERSION               0.0.1

    FROM      ubuntu
-    MAINTAINER Guillaume J. Charmes <guillaume@dotcloud.com>
+    MAINTAINER Guillaume J. Charmes "guillaume@dotcloud.com"

    # make sure the package repository is up to date
    RUN echo "deb http://archive.ubuntu.com/ubuntu precise main universe" > /etc/apt/sources.list
@@ -6,9 +6,6 @@
    <title>{{ meta['title'] if meta and meta['title'] else title }} - Docker Documentation</title>
    <meta name="description" content="{{ meta['description'] if meta }}" />
    <meta name="keywords" content="{{ meta['keywords'] if meta }}" />
-    <!-- Swiftype tags: https://swiftype.com/documentation/meta_tags -->
-    <meta property='st:popularity' content='4' />
-    <meta property='st:type' content='docker_doc' />

    {%- set url_root = pathto('', 1) %}
    {%- if url_root == '#' %}{% set url_root = '' %}{% endif %}
@@ -28,20 +25,11 @@
    + ['//fonts.googleapis.com/css?family=Cabin:400,700,400italic']
    %}

-    {#
-        This part is hopefully complex because things like |cut '/index/' are not available in spinx jinja
-        and will make it crash. (and we need index/ out.
-    #}
-    <link rel="canonical" href="http://docs.docker.io/en/latest/
-    {%- for word in pagename.split('/') -%}
-        {%- if word != 'index' -%}
-            {%- if word != '' -%}
-                {{ word }}/
-            {%- endif -%}
-        {%- endif -%}
-    {%- endfor -%}
-    ">
-
+    {%- if pagename == 'index' %}
+    <link rel="canonical" href="http://docs.docker.io/en/latest/">
+    {% else %}
+    <link rel="canonical" href="http://docs.docker.io/en/latest/{{ pagename }}/">
+    {% endif %}
    {%- for cssfile in css_files %}
    <link rel="stylesheet" href="{{ pathto(cssfile, 1) }}" type="text/css" />
    {%- endfor %}
@@ -136,14 +124,7 @@
                                <small>Current version:</small>
                                <ul class="inline">
                                    {% for slug, url in versions %}
-                                    <li class="alternative"><a href="{{ url }}{%- for word in pagename.split('/') -%}
-                                        {%- if word != 'index' -%}
-                                            {%- if word != '' -%}
-                                                {{ word }}/
-                                            {%- endif -%}
-                                        {%- endif -%}
-                                    {%- endfor -%}"
-                                    title="Switch to {{ slug }}">{{ slug }}</a></li>
+                                    <li class="alternative"><a href="{{ url }}{{ pagename }}/" title="Switch to {{ slug }}">{{ slug }}</a></li>
                                    {% endfor %}
                                </ul>
                            </div>
@@ -171,9 +152,6 @@
  Swiftype.resultContainingElement = '#st-results-container';
  Swiftype.attachElement = '#st-search-input';
  Swiftype.renderStyle = "overlay";
-  // from https://swiftype.com/questions/how-can-i-make-more-popular-content-rank-higher 
-  // Use "page" for now -- they don't subgroup by document type yet.
-  Swiftype.searchFunctionalBoosts = {"page": {"popularity": "linear"}};

  var script = document.createElement('script');
  script.type = 'text/javascript';
@@ -397,8 +397,7 @@ dt:hover > a.headerlink {
 .admonition .admonition-title {
  font-size: larger;
 }
-.admonition.warning,
-.admonition.danger {
+.admonition.warning {
  border-color: #ac0004;
 }
 .admonition.note {
@@ -594,7 +594,7 @@ dt:hover > a.headerlink {
      font-size: larger;
  }

-  &.warning, &.danger {
+  &.warning {
    border-color: #ac0004;
  }

@@ -22,9 +22,7 @@ const (
        CONSTRAINT "parent_fk" FOREIGN KEY ("parent_id") REFERENCES "entity" ("id"),
        CONSTRAINT "entity_fk" FOREIGN KEY ("entity_id") REFERENCES "entity" ("id")
        );
-    `

-	createEdgeIndices = `
    CREATE UNIQUE INDEX "name_parent_ix" ON "edge" (parent_id, name);
    `
 )
@@ -49,11 +47,12 @@ type WalkFunc func(fullPath string, entity *Entity) error
 // Graph database for storing entities and their relationships
 type Database struct {
 	dbPath string
+	rootID string
 }

 // Create a new graph database initialized with a root entity
-func NewDatabase(dbPath string) (*Database, error) {
-	db := &Database{dbPath}
+func NewDatabase(dbPath, rootId string) (*Database, error) {
+	db := &Database{dbPath, rootId}
 	if _, err := os.Stat(dbPath); err == nil {
 		return db, nil
 	}
@@ -69,9 +68,6 @@ func NewDatabase(dbPath string) (*Database, error) {
 	if _, err := conn.Exec(createEdgeTable); err != nil {
 		return nil, err
 	}
-	if _, err := conn.Exec(createEdgeIndices); err != nil {
-		return nil, err
-	}

 	rollback := func() {
 		conn.Exec("ROLLBACK")
@@ -81,12 +77,12 @@ func NewDatabase(dbPath string) (*Database, error) {
 	if _, err := conn.Exec("BEGIN"); err != nil {
 		return nil, err
 	}
-	if _, err := conn.Exec("INSERT INTO entity (id) VALUES (?);", "0"); err != nil {
+	if _, err := conn.Exec("INSERT INTO entity (id) VALUES (?);", rootId); err != nil {
 		rollback()
 		return nil, err
 	}

-	if _, err := conn.Exec("INSERT INTO edge (entity_id, name) VALUES(?,?);", "0", "/"); err != nil {
+	if _, err := conn.Exec("INSERT INTO edge (entity_id, name) VALUES(?,?);", rootId, "/"); err != nil {
 		rollback()
 		return nil, err
 	}
@@ -104,11 +100,9 @@ func (db *Database) Set(fullPath, id string) (*Entity, error) {
 		return nil, err
 	}
 	defer conn.Close()
-	// FIXME: is rollback implicit when closing the connection?
 	rollback := func() {
 		conn.Exec("ROLLBACK")
 	}
-	// FIXME: use exclusive transactions to avoid race conditions
 	if _, err := conn.Exec("BEGIN"); err != nil {
 		return nil, err
 	}
@@ -156,7 +150,7 @@ func (db *Database) setEdge(conn *sql.DB, parentPath, name string, e *Entity) er
 // Return the root "/" entity for the database
 func (db *Database) RootEntity() *Entity {
 	return &Entity{
-		id: "0",
+		id: db.rootID,
 	}
 }

@@ -288,7 +282,7 @@ func (db *Database) Delete(name string) error {
 		return err
 	}

-	if _, err := conn.Exec("DELETE FROM edge WHERE parent_id = ? AND name LIKE ?;", parent.id, n+"%"); err != nil {
+	if _, err := conn.Exec("DELETE FROM edge WHERE parent_id = ? AND name = ?;", parent.id, n); err != nil {
 		return err
 	}
 	return nil
@@ -356,7 +350,7 @@ func (db *Database) Rename(currentName, newName string) error {
 		return err
 	}

-	rows, err := conn.Exec("UPDATE edge SET name = ? WHERE parent_id = ? AND name LIKE ?;", newEdgeName, parent.id, name+"%")
+	rows, err := conn.Exec("UPDATE edge SET name = ? WHERE parent_id = ? AND name = ?;", newEdgeName, parent.id, name)
 	if err != nil {
 		return err
 	}
@@ -433,7 +427,7 @@ func (db *Database) children(conn *sql.DB, name string, depth int) <-chan WalkMe
 // Return the entity based on the parent path and name
 func (db *Database) child(conn *sql.DB, parent *Entity, name string) *Entity {
 	var id string
-	if err := conn.QueryRow("SELECT entity_id FROM edge WHERE parent_id = ? AND name LIKE ?;", parent.id, name+"%").Scan(&id); err != nil {
+	if err := conn.QueryRow("SELECT entity_id FROM edge WHERE parent_id = ? AND name = ?;", parent.id, name).Scan(&id); err != nil {
 		return nil
 	}
 	return &Entity{id}
@@ -8,7 +8,7 @@ import (
 )

 func newTestDb(t *testing.T) *Database {
-	db, err := NewDatabase(path.Join(os.TempDir(), "sqlite.db"))
+	db, err := NewDatabase(path.Join(os.TempDir(), "sqlite.db"), "0")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -22,7 +22,7 @@ func destroyTestDb(db *Database) {
 func TestNewDatabase(t *testing.T) {
 	db := newTestDb(t)
 	if db == nil {
-		t.Fatal("Database should not be nil")
+		t.Fatal("Datbase should not be nil")
 	}
 	defer destroyTestDb(db)
 }
@@ -59,18 +59,6 @@ func TestSetEntityWithDifferentName(t *testing.T) {
 	}
 }

-func TestSetDuplicateEntity(t *testing.T) {
-	db := newTestDb(t)
-	defer destroyTestDb(db)
-
-	if _, err := db.Set("/foo", "42"); err != nil {
-		t.Fatal(err)
-	}
-	if _, err := db.Set("/foo", "43"); err == nil {
-		t.Fatalf("Creating an entry with a duplciate path did not cause an error")
-	}
-}
-
 func TestCreateChild(t *testing.T) {
 	db := newTestDb(t)
 	defer destroyTestDb(db)
@@ -121,9 +121,6 @@ func TestRegister(t *testing.T) {
 }

 func TestMount(t *testing.T) {
-	runtime := mkRuntime(t)
-	defer nuke(runtime)
-
 	graph := tempGraph(t)
 	defer os.RemoveAll(graph.Root)
 	archive, err := fakeTar()
@@ -147,12 +144,12 @@ func TestMount(t *testing.T) {
 	if err := os.MkdirAll(rw, 0700); err != nil {
 		t.Fatal(err)
 	}
-	if err := image.Mount(runtime, rootfs, rw, "testing"); err != nil {
+	if err := image.Mount(rootfs, rw); err != nil {
 		t.Fatal(err)
 	}
 	// FIXME: test for mount contents
 	defer func() {
-		if err := image.Unmount(runtime, rootfs, "testing"); err != nil {
+		if err := Unmount(rootfs); err != nil {
 			t.Error(err)
 		}
 	}()
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Michael Crosby	e245abcc4d	Fix rebase conflicts from master	2013-10-02 13:58:43 -07:00
Michael Crosby	19c53c3833	Add docs and maintainers file for new sub pkgs	2013-10-02 12:48:27 -07:00
Michael Crosby	51db855bc3	Remove network connection when link is removed	2013-10-02 12:44:41 -07:00
Michael Crosby	8c1fae65d3	Convert links to upper case	2013-10-02 12:44:41 -07:00
Michael Crosby	018d3178e3	Add support for names with start command	2013-10-02 12:43:09 -07:00
Michael Crosby	2bae258bff	Update make script for ldl	2013-10-02 12:43:09 -07:00
Michael Crosby	394d2f4ea7	Add sqlite as graphdb backend Add build steps to compile docker statically with CGO enabled	2013-10-02 12:43:09 -07:00
Michael Crosby	457a9260bc	Refactor to use graph for linking	2013-10-02 12:38:41 -07:00
Michael Crosby	e4fbeddf53	Add gograph database to handle linking	2013-10-02 12:38:41 -07:00
Michael Crosby	a32741b1c2	Remove top level link command and endpoint	2013-10-02 12:38:41 -07:00
Michael Crosby	a5dbb9a900	Add name and alias to docker ps output	2013-10-02 12:38:41 -07:00
Michael Crosby	21b9c9c7b4	Restore container links at runtime start	2013-10-02 12:38:41 -07:00
Michael Crosby	828ba3494d	Update new unittests after rebase	2013-10-02 12:38:41 -07:00
Michael Crosby	583340bd56	Add default port for link Add links unit test file	2013-10-02 12:38:41 -07:00
Michael Crosby	12d3e3e644	Add view all links for the engine	2013-10-02 12:38:41 -07:00
Michael Crosby	e574bbf55e	Do not reference ports for linking containers	2013-10-02 12:38:41 -07:00
Michael Crosby	377bfc3ad2	Create LinkRepository during runtime init	2013-10-02 12:38:41 -07:00
Michael Crosby	c7d854af01	Create private link via iptables to linked containers Allow active links to be removed	2013-10-02 12:38:41 -07:00
Michael Crosby	a712b7467e	Prevent inter-container communication	2013-10-02 12:38:41 -07:00
Michael Crosby	248e0c63db	Add port and ip for links	2013-10-02 12:38:41 -07:00
Michael Crosby	20c962696f	Initial commit to add links and inject env	2013-10-02 12:38:41 -07:00
Michael Crosby	234587e0ef	Refactor internal port mappings	2013-10-02 12:38:41 -07:00
Michael Crosby	78adacde93	Add IP to APIPort struct	2013-10-02 12:38:41 -07:00
Michael Crosby	2e6329a904	Add -expose flag to expose ports without publishing	2013-10-02 12:38:40 -07:00
Michael Crosby	3e6d3ad1e4	Add warning and build error for public image ports	2013-10-02 12:38:40 -07:00
Michael Crosby	1b3baab4a8	Add destination to iptables conf	2013-10-02 12:38:40 -07:00
Michael Crosby	c69549e016	Refactor internal port mappings	2013-10-02 12:38:40 -07:00
Michael Crosby	760648e33e	Add flag to set the default ip ports are bound to	2013-10-02 12:36:56 -07:00
Michael Crosby	36b1be2acf	Move proxy into sub package	2013-10-02 12:36:56 -07:00
Michael Crosby	e1be306389	Add DaemonConfig Use a config type for accessing data Add bridgeiface name to config Add option to disable iptables	2013-10-02 12:36:56 -07:00
Michael Crosby	2a76af221f	Move iptables into sub package	2013-10-02 12:36:56 -07:00
				`@@ -1 +0,0 @@`
				`Asbjorn Enge <asbjorn@hanafjedle.net> (@asbjornenge)`
				`@@ -1 +0,0 @@`
				`au BufNewFile,BufRead Dockerfile set filetype=dockerfile`