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

 	"encoding/json"

 	"fmt"

 	"github.com/dotcloud/docker/auth"

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

 	"github.com/gorilla/mux"

 	"github.com/shin-/cookiejar"

 	"io"

@@ -116,7 +117,7 @@ func getContainersExport(srv *Server, w http.ResponseWriter, r *http.Request, va

 	name := vars["name"]

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

-		Debugf("%s", err.Error())

+		utils.Debugf("%s", err.Error())

 		return err

 	}

 	return nil

@@ -239,7 +240,7 @@ func postCommit(srv *Server, w http.ResponseWriter, r *http.Request, vars map[st

 	}

 	config := &Config{}

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

-		Debugf("%s", err.Error())

+		utils.Debugf("%s", err.Error())

 	}

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

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

@@ -602,20 +603,20 @@ func ListenAndServe(addr string, srv *Server, logging bool) error {

 	for method, routes := range m {

 		for route, fct := range routes {

-			Debugf("Registering %s, %s", method, route)

+			utils.Debugf("Registering %s, %s", method, route)

 			// NOTE: scope issue, make sure the variables are local and won't be changed

 			localRoute := route

 			localMethod := method

 			localFct := fct

 			r.Path(localRoute).Methods(localMethod).HandlerFunc(func(w http.ResponseWriter, r *http.Request) {

-				Debugf("Calling %s %s", localMethod, localRoute)

+				utils.Debugf("Calling %s %s", localMethod, localRoute)

 				if logging {

 					log.Println(r.Method, r.RequestURI)

 				}

 				if strings.Contains(r.Header.Get("User-Agent"), "Docker-Client/") {

 					userAgent := strings.Split(r.Header.Get("User-Agent"), "/")

 					if len(userAgent) == 2 && userAgent[1] != VERSION {

-						Debugf("Warning: client and server don't have the same version (client: %s, server: %s)", userAgent[1], VERSION)

+						utils.Debugf("Warning: client and server don't have the same version (client: %s, server: %s)", userAgent[1], VERSION)

 					}

 				}

 				if err := localFct(srv, w, r, mux.Vars(r)); err != nil {

@@ -811,7 +811,7 @@ func TestPostContainersCreate(t *testing.T) {

 	if _, err := os.Stat(path.Join(container.rwPath(), "test")); err != nil {

 		if os.IsNotExist(err) {

-			Debugf("Err: %s", err)

+			utils.Debugf("Err: %s", err)

 			t.Fatalf("The test file has not been created")

 		}

 		t.Fatal(err)

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

 	"bufio"

 	"encoding/json"

 	"fmt"

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

 	"io"

 	"os"

 	"path"

@@ -161,11 +162,11 @@ func (builder *Builder) clearTmp(containers, images map[string]struct{}) {

 	for c := range containers {

 		tmp := builder.runtime.Get(c)

 		builder.runtime.Destroy(tmp)

-		Debugf("Removing container %s", c)

+		utils.Debugf("Removing container %s", c)

 	}

 	for i := range images {

 		builder.runtime.graph.Delete(i)

-		Debugf("Removing image %s", i)

+		utils.Debugf("Removing image %s", i)

 	}

 }

@@ -286,7 +287,7 @@ func (builder *Builder) Build(dockerfile io.Reader, stdout io.Writer) (*Image, e

 				break

 			}

-			Debugf("Env -----> %v ------ %v\n", config.Env, env)

+			utils.Debugf("Env -----> %v ------ %v\n", config.Env, env)

 			// Create the container and start it

 			c, err := builder.Create(config)

@@ -410,7 +411,7 @@ func (builder *Builder) Build(dockerfile io.Reader, stdout io.Writer) (*Image, e

 			destPath := strings.Trim(tmp[1], " ")

 			fmt.Fprintf(stdout, "COPY %s to %s in %s\n", sourceUrl, destPath, base.ShortId())

-			file, err := Download(sourceUrl, stdout)

+			file, err := utils.Download(sourceUrl, stdout)

 			if err != nil {

 				return nil, err

 			}

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

 	"fmt"

 	"github.com/dotcloud/docker/auth"

 	"github.com/dotcloud/docker/term"

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

 	"io"

 	"io/ioutil"

 	"net"

@@ -188,11 +189,11 @@ func CmdLogin(args ...string) error {

 		return readStringOnRawTerminal(stdin, stdout, false)

 	}

-	oldState, err := SetRawTerminal()

+	oldState, err := term.SetRawTerminal()

 	if err != nil {

 		return err

 	} else {

-		defer RestoreTerminal(oldState)

+		defer term.RestoreTerminal(oldState)

 	}

 	cmd := Subcmd("login", "", "Register or Login to the docker registry server")

@@ -252,7 +253,7 @@ func CmdLogin(args ...string) error {

 		return err

 	}

 	if out2.Status != "" {

-		RestoreTerminal(oldState)

+		term.RestoreTerminal(oldState)

 		fmt.Print(out2.Status)

 	}

 	return nil

@@ -303,7 +304,7 @@ func CmdVersion(args ...string) error {

 	var out ApiVersion

 	err = json.Unmarshal(body, &out)

 	if err != nil {

-		Debugf("Error unmarshal: body: %s, err: %s\n", body, err)

+		utils.Debugf("Error unmarshal: body: %s, err: %s\n", body, err)

 		return err

 	}

 	fmt.Println("Version:", out.Version)

@@ -519,7 +520,7 @@ func CmdHistory(args ...string) error {

 	fmt.Fprintln(w, "ID\tCREATED\tCREATED BY")

 	for _, out := range outs {

-		fmt.Fprintf(w, "%s\t%s ago\t%s\n", out.Id, HumanDuration(time.Now().Sub(time.Unix(out.Created, 0))), out.CreatedBy)

+		fmt.Fprintf(w, "%s\t%s ago\t%s\n", out.Id, utils.HumanDuration(time.Now().Sub(time.Unix(out.Created, 0))), out.CreatedBy)

 	}

 	w.Flush()

 	return nil

@@ -742,14 +743,14 @@ func CmdImages(args ...string) error {

 				if *noTrunc {

 					fmt.Fprintf(w, "%s\t", out.Id)

 				} else {

-					fmt.Fprintf(w, "%s\t", TruncateId(out.Id))

+					fmt.Fprintf(w, "%s\t", utils.TruncateId(out.Id))

 				}

-				fmt.Fprintf(w, "%s ago\n", HumanDuration(time.Now().Sub(time.Unix(out.Created, 0))))

+				fmt.Fprintf(w, "%s ago\n", utils.HumanDuration(time.Now().Sub(time.Unix(out.Created, 0))))

 			} else {

 				if *noTrunc {

 					fmt.Fprintln(w, out.Id)

 				} else {

-					fmt.Fprintln(w, TruncateId(out.Id))

+					fmt.Fprintln(w, utils.TruncateId(out.Id))

 				}

 			}

 		}

@@ -809,15 +810,15 @@ func CmdPs(args ...string) error {

 	for _, out := range outs {

 		if !*quiet {

 			if *noTrunc {

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

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

 			} else {

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

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

 			}

 		} else {

 			if *noTrunc {

 				fmt.Fprintln(w, out.Id)

 			} else {

-				fmt.Fprintln(w, TruncateId(out.Id))

+				fmt.Fprintln(w, utils.TruncateId(out.Id))

 			}

 		}

 	}

@@ -1244,20 +1245,20 @@ func hijack(method, path string, setRawTerminal bool) error {

 	rwc, br := clientconn.Hijack()

 	defer rwc.Close()

-	receiveStdout := Go(func() error {

+	receiveStdout := utils.Go(func() error {

 		_, err := io.Copy(os.Stdout, br)

 		return err

 	})

 	if setRawTerminal && term.IsTerminal(int(os.Stdin.Fd())) && os.Getenv("NORAW") == "" {

-		if oldState, err := SetRawTerminal(); err != nil {

+		if oldState, err := term.SetRawTerminal(); err != nil {

 			return err

 		} else {

-			defer RestoreTerminal(oldState)

+			defer term.RestoreTerminal(oldState)

 		}

 	}

-	sendStdin := Go(func() error {

+	sendStdin := utils.Go(func() error {

 		_, err := io.Copy(rwc, os.Stdin)

 		if err := rwc.(*net.TCPConn).CloseWrite(); err != nil {

 			fmt.Fprintf(os.Stderr, "Couldn't send EOF: %s\n", err)

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

 	"encoding/json"

 	"flag"

 	"fmt"

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

 	"github.com/kr/pty"

 	"io"

 	"io/ioutil"

@@ -39,8 +40,8 @@ type Container struct {

 	ResolvConfPath string

 	cmd       *exec.Cmd

-	stdout    *writeBroadcaster

-	stderr    *writeBroadcaster

+	stdout    *utils.WriteBroadcaster

+	stderr    *utils.WriteBroadcaster

 	stdin     io.ReadCloser

 	stdinPipe io.WriteCloser

 	ptyMaster io.Closer

@@ -251,9 +252,9 @@ func (container *Container) startPty() error {

 	// Copy the PTYs to our broadcasters

 	go func() {

 		defer container.stdout.CloseWriters()

-		Debugf("[startPty] Begin of stdout pipe")

+		utils.Debugf("[startPty] Begin of stdout pipe")

 		io.Copy(container.stdout, ptyMaster)

-		Debugf("[startPty] End of stdout pipe")

+		utils.Debugf("[startPty] End of stdout pipe")

 	}()

 	// stdin

@@ -262,9 +263,9 @@ func (container *Container) startPty() error {

 		container.cmd.SysProcAttr = &syscall.SysProcAttr{Setctty: true, Setsid: true}

 		go func() {

 			defer container.stdin.Close()

-			Debugf("[startPty] Begin of stdin pipe")

+			utils.Debugf("[startPty] Begin of stdin pipe")

 			io.Copy(ptyMaster, container.stdin)

-			Debugf("[startPty] End of stdin pipe")

+			utils.Debugf("[startPty] End of stdin pipe")

 		}()

 	}

 	if err := container.cmd.Start(); err != nil {

@@ -284,9 +285,9 @@ func (container *Container) start() error {

 		}

 		go func() {

 			defer stdin.Close()

-			Debugf("Begin of stdin pipe [start]")

+			utils.Debugf("Begin of stdin pipe [start]")

 			io.Copy(stdin, container.stdin)

-			Debugf("End of stdin pipe [start]")

+			utils.Debugf("End of stdin pipe [start]")

 		}()

 	}

 	return container.cmd.Start()

@@ -303,8 +304,8 @@ func (container *Container) Attach(stdin io.ReadCloser, stdinCloser io.Closer, s

 			errors <- err

 		} else {

 			go func() {

-				Debugf("[start] attach stdin\n")

-				defer Debugf("[end] attach stdin\n")

+				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 cStdout != nil {

 					defer cStdout.Close()

@@ -316,12 +317,12 @@ func (container *Container) Attach(stdin io.ReadCloser, stdinCloser io.Closer, s

 					defer cStdin.Close()

 				}

 				if container.Config.Tty {

-					_, err = CopyEscapable(cStdin, stdin)

+					_, err = utils.CopyEscapable(cStdin, stdin)

 				} else {

 					_, err = io.Copy(cStdin, stdin)

 				}

 				if err != nil {

-					Debugf("[error] attach stdin: %s\n", err)

+					utils.Debugf("[error] attach stdin: %s\n", err)

 				}

 				// Discard error, expecting pipe error

 				errors <- nil

@@ -335,8 +336,8 @@ func (container *Container) Attach(stdin io.ReadCloser, stdinCloser io.Closer, s

 		} else {

 			cStdout = p

 			go func() {

-				Debugf("[start] attach stdout\n")

-				defer Debugf("[end]  attach stdout\n")

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

 					if stdin != nil {

@@ -348,7 +349,7 @@ func (container *Container) Attach(stdin io.ReadCloser, stdinCloser io.Closer, s

 				}

 				_, err := io.Copy(stdout, cStdout)

 				if err != nil {

-					Debugf("[error] attach stdout: %s\n", err)

+					utils.Debugf("[error] attach stdout: %s\n", err)

 				}

 				errors <- err

 			}()

@@ -361,8 +362,8 @@ func (container *Container) Attach(stdin io.ReadCloser, stdinCloser io.Closer, s

 		} else {

 			cStderr = p

 			go func() {

-				Debugf("[start] attach stderr\n")

-				defer Debugf("[end]  attach stderr\n")

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

 					if stdin != nil {

@@ -374,13 +375,13 @@ func (container *Container) Attach(stdin io.ReadCloser, stdinCloser io.Closer, s

 				}

 				_, err := io.Copy(stderr, cStderr)

 				if err != nil {

-					Debugf("[error] attach stderr: %s\n", err)

+					utils.Debugf("[error] attach stderr: %s\n", err)

 				}

 				errors <- err

 			}()

 		}

 	}

-	return Go(func() error {

+	return utils.Go(func() error {

 		if cStdout != nil {

 			defer cStdout.Close()

 		}

@@ -390,14 +391,14 @@ func (container *Container) Attach(stdin io.ReadCloser, stdinCloser io.Closer, s

 		// 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 {

-			Debugf("Waiting for job %d/%d\n", i+1, nJobs)

+			utils.Debugf("Waiting for job %d/%d\n", i+1, nJobs)

 			if err := <-errors; err != nil {

-				Debugf("Job %d returned error %s. Aborting all jobs\n", i+1, err)

+				utils.Debugf("Job %d returned error %s. Aborting all jobs\n", i+1, err)

 				return err

 			}

-			Debugf("Job %d completed successfully\n", i+1)

+			utils.Debugf("Job %d completed successfully\n", i+1)

 		}

-		Debugf("All jobs completed successfully\n")

+		utils.Debugf("All jobs completed successfully\n")

 		return nil

 	})

 }

@@ -555,13 +556,13 @@ func (container *Container) StdinPipe() (io.WriteCloser, error) {

 func (container *Container) StdoutPipe() (io.ReadCloser, error) {

 	reader, writer := io.Pipe()

 	container.stdout.AddWriter(writer)

-	return newBufReader(reader), nil

+	return utils.NewBufReader(reader), nil

 }

 func (container *Container) StderrPipe() (io.ReadCloser, error) {

 	reader, writer := io.Pipe()

 	container.stderr.AddWriter(writer)

-	return newBufReader(reader), nil

+	return utils.NewBufReader(reader), nil

 }

 func (container *Container) allocateNetwork() error {

@@ -609,20 +610,20 @@ func (container *Container) waitLxc() error {

 func (container *Container) monitor() {

 	// Wait for the program to exit

-	Debugf("Waiting for process")

+	utils.Debugf("Waiting for process")

 	// If the command does not exists, try to wait via lxc

 	if container.cmd == nil {

 		if err := container.waitLxc(); err != nil {

-			Debugf("%s: Process: %s", container.Id, err)

+			utils.Debugf("%s: Process: %s", container.Id, err)

 		}

 	} else {

 		if err := container.cmd.Wait(); err != nil {

 			// Discard the error as any signals or non 0 returns will generate an error

-			Debugf("%s: Process: %s", container.Id, err)

+			utils.Debugf("%s: Process: %s", container.Id, err)

 		}

 	}

-	Debugf("Process finished")

+	utils.Debugf("Process finished")

 	var exitCode int = -1

 	if container.cmd != nil {

@@ -633,19 +634,19 @@ func (container *Container) monitor() {

 	container.releaseNetwork()

 	if container.Config.OpenStdin {

 		if err := container.stdin.Close(); err != nil {

-			Debugf("%s: Error close stdin: %s", container.Id, err)

+			utils.Debugf("%s: Error close stdin: %s", container.Id, err)

 		}

 	}

 	if err := container.stdout.CloseWriters(); err != nil {

-		Debugf("%s: Error close stdout: %s", container.Id, err)

+		utils.Debugf("%s: Error close stdout: %s", container.Id, err)

 	}

 	if err := container.stderr.CloseWriters(); err != nil {

-		Debugf("%s: Error close stderr: %s", container.Id, err)

+		utils.Debugf("%s: Error close stderr: %s", container.Id, err)

 	}

 	if container.ptyMaster != nil {

 		if err := container.ptyMaster.Close(); err != nil {

-			Debugf("%s: Error closing Pty master: %s", container.Id, err)

+			utils.Debugf("%s: Error closing Pty master: %s", container.Id, err)

 		}

 	}

@@ -762,7 +763,7 @@ func (container *Container) RwChecksum() (string, error) {

 	if err != nil {

 		return "", err

 	}

-	return HashData(rwData)

+	return utils.HashData(rwData)

 }

 func (container *Container) Export() (Archive, error) {

@@ -833,7 +834,7 @@ func (container *Container) Unmount() error {

 // In case of a collision a lookup with Runtime.Get() will fail, and the caller

 // will need to use a langer prefix, or the full-length container Id.

 func (container *Container) ShortId() string {

-	return TruncateId(container.Id)

+	return utils.TruncateId(container.Id)

 }

 func (container *Container) logPath(name string) string {

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

 	"flag"

 	"fmt"

 	"github.com/dotcloud/docker"

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

 	"io/ioutil"

 	"log"

 	"os"

@@ -17,7 +18,7 @@ var (

 )

 func main() {

-	if docker.SelfPath() == "/sbin/init" {

+	if utils.SelfPath() == "/sbin/init" {

 		// Running in init mode

 		docker.SysInit()

 		return

@@ -2,8 +2,9 @@ package docker

 import (

 	"fmt"

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

 )

-func getKernelVersion() (*KernelVersionInfo, error) {

+func getKernelVersion() (*utils.KernelVersionInfo, error) {

 	return nil, fmt.Errorf("Kernel version detection is not available on darwin")

 }

@@ -2,12 +2,14 @@ package docker

 import (

 	"bytes"

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

 	"strconv"

 	"strings"

 	"syscall"

 )

-func getKernelVersion() (*KernelVersionInfo, error) {

+// FIXME: Move this to utils package

+func getKernelVersion() (*utils.KernelVersionInfo, error) {

 	var (

 		uts                  syscall.Utsname

 		flavor               string

@@ -60,7 +62,7 @@ func getKernelVersion() (*KernelVersionInfo, error) {

 		flavor = ""

 	}

-	return &KernelVersionInfo{

+	return &utils.KernelVersionInfo{

 		Kernel: kernel,

 		Major:  major,

 		Minor:  minor,

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

 import (

 	"encoding/json"

 	"fmt"

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

 	"io"

 	"io/ioutil"

 	"net/http"

@@ -17,7 +18,7 @@ import (

 // A Graph is a store for versioned filesystem images and the relationship between them.

 type Graph struct {

 	Root         string

-	idIndex      *TruncIndex

+	idIndex      *utils.TruncIndex

 	httpClient   *http.Client

 	checksumLock map[string]*sync.Mutex

 	lockSumFile  *sync.Mutex

@@ -37,7 +38,7 @@ func NewGraph(root string) (*Graph, error) {

 	}

 	graph := &Graph{

 		Root:         abspath,

-		idIndex:      NewTruncIndex(),

+		idIndex:      utils.NewTruncIndex(),

 		checksumLock: make(map[string]*sync.Mutex),

 		lockSumFile:  &sync.Mutex{},

 		lockSumMap:   &sync.Mutex{},

@@ -165,7 +166,7 @@ func (graph *Graph) TempLayerArchive(id string, compression Compression, output

 	if err != nil {

 		return nil, err

 	}

-	return NewTempArchive(ProgressReader(ioutil.NopCloser(archive), 0, output, "Buffering to disk %v/%v (%v)"), tmp.Root)

+	return NewTempArchive(utils.ProgressReader(ioutil.NopCloser(archive), 0, output, "Buffering to disk %v/%v (%v)"), tmp.Root)

 }

 // Mktemp creates a temporary sub-directory inside the graph's filesystem.

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

 	"encoding/hex"

 	"encoding/json"

 	"fmt"

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

 	"io"

 	"io/ioutil"

 	"log"

@@ -180,7 +181,7 @@ func (image *Image) Changes(rw string) ([]Change, error) {

 }

 func (image *Image) ShortId() string {

-	return TruncateId(image.Id)

+	return utils.TruncateId(image.Id)

 }

 func ValidateId(id string) error {

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

 	"encoding/binary"

 	"errors"

 	"fmt"

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

 	"io"

 	"log"

 	"net"

@@ -97,7 +98,7 @@ func checkRouteOverlaps(dockerNetwork *net.IPNet) error {

 	if err != nil {

 		return err

 	}

-	Debugf("Routes:\n\n%s", output)

+	utils.Debugf("Routes:\n\n%s", output)

 	for _, line := range strings.Split(output, "\n") {

 		if strings.Trim(line, "\r\n\t ") == "" || strings.Contains(line, "default") {

 			continue

@@ -126,13 +127,13 @@ func CreateBridgeIface(ifaceName string) error {

 			ifaceAddr = addr

 			break

 		} else {

-			Debugf("%s: %s", addr, err)

+			utils.Debugf("%s: %s", addr, err)

 		}

 	}

 	if ifaceAddr == "" {

 		return fmt.Errorf("Could not find a free IP address range for interface '%s'. Please configure its address manually and run 'docker -b %s'", ifaceName, ifaceName)

 	} else {

-		Debugf("Creating bridge %s with network %s", ifaceName, ifaceAddr)

+		utils.Debugf("Creating bridge %s with network %s", ifaceName, ifaceAddr)

 	}

 	if output, err := ip("link", "add", ifaceName, "type", "bridge"); err != nil {

@@ -239,22 +240,22 @@ func (mapper *PortMapper) Map(port int, dest net.TCPAddr) error {

 // proxy listens for socket connections on `listener`, and forwards them unmodified

 // to `proto:address`

 func proxy(listener net.Listener, proto, address string) error {

-	Debugf("proxying to %s:%s", proto, address)

-	defer Debugf("Done proxying to %s:%s", proto, address)

+	utils.Debugf("proxying to %s:%s", proto, address)

+	defer utils.Debugf("Done proxying to %s:%s", proto, address)

 	for {

-		Debugf("Listening on %s", listener)

+		utils.Debugf("Listening on %s", listener)

 		src, err := listener.Accept()

 		if err != nil {

 			return err

 		}

-		Debugf("Connecting to %s:%s", proto, address)

+		utils.Debugf("Connecting to %s:%s", proto, address)

 		dst, err := net.Dial(proto, address)

 		if err != nil {

 			log.Printf("Error connecting to %s:%s: %s", proto, address, err)

 			src.Close()

 			continue

 		}

-		Debugf("Connected to backend, splicing")

+		utils.Debugf("Connected to backend, splicing")

 		splice(src, dst)

 	}

 	return nil

@@ -317,7 +318,7 @@ func (alloc *PortAllocator) runFountain() {

 // FIXME: Release can no longer fail, change its prototype to reflect that.

 func (alloc *PortAllocator) Release(port int) error {

-	Debugf("Releasing %d", port)

+	utils.Debugf("Releasing %d", port)

 	alloc.lock.Lock()

 	delete(alloc.inUse, port)

 	alloc.lock.Unlock()

@@ -325,7 +326,7 @@ func (alloc *PortAllocator) Release(port int) error {

 }

 func (alloc *PortAllocator) Acquire(port int) (int, error) {

-	Debugf("Acquiring %d", port)

+	utils.Debugf("Acquiring %d", port)

 	if port == 0 {

 		// Allocate a port from the fountain

 		for port := range alloc.fountain {

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

 	"encoding/json"

 	"fmt"

 	"github.com/dotcloud/docker/auth"

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

 	"github.com/shin-/cookiejar"

 	"io"

 	"io/ioutil"

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

 func NewImgJson(src []byte) (*Image, error) {

 	ret := &Image{}

-	Debugf("Json string: {%s}\n", src)

+	utils.Debugf("Json string: {%s}\n", src)

 	// FIXME: Is there a cleaner way to "purify" the input json?

 	if err := json.Unmarshal(src, ret); err != nil {

 		return nil, err

@@ -58,7 +59,7 @@ func (graph *Graph) getRemoteHistory(imgId, registry string, token []string) ([]

 		return nil, fmt.Errorf("Error while reading the http response: %s\n", err)

 	}

-	Debugf("Ancestry: %s", jsonString)

+	utils.Debugf("Ancestry: %s", jsonString)

 	history := new([]string)

 	if err := json.Unmarshal(jsonString, history); err != nil {

 		return nil, err

@@ -116,7 +117,7 @@ func (graph *Graph) getImagesInRepository(repository string, authConfig *auth.Au

 	err = json.Unmarshal(jsonData, &imageList)

 	if err != nil {

-		Debugf("Body: %s (%s)\n", res.Body, u)

+		utils.Debugf("Body: %s (%s)\n", res.Body, u)

 		return nil, err

 	}

@@ -166,7 +167,7 @@ func (graph *Graph) getRemoteImage(stdout io.Writer, imgId, registry string, tok

 	if err != nil {

 		return nil, nil, err

 	}

-	return img, ProgressReader(res.Body, int(res.ContentLength), stdout, "Downloading %v/%v (%v)"), nil

+	return img, utils.ProgressReader(res.Body, int(res.ContentLength), stdout, "Downloading %v/%v (%v)"), nil

 }

 func (graph *Graph) getRemoteTags(stdout io.Writer, registries []string, repository string, token []string) (map[string]string, error) {

@@ -185,7 +186,7 @@ func (graph *Graph) getRemoteTags(stdout io.Writer, registries []string, reposit

 		req.Header.Set("Authorization", "Token "+strings.Join(token, ", "))

 		res, err := client.Do(req)

 		defer res.Body.Close()

-		Debugf("Got status code %d from %s", res.StatusCode, endpoint)

+		utils.Debugf("Got status code %d from %s", res.StatusCode, endpoint)

 		if err != nil || (res.StatusCode != 200 && res.StatusCode != 404) {

 			continue

 		} else if res.StatusCode == 404 {

@@ -416,7 +417,7 @@ func (graph *Graph) PushImage(stdout io.Writer, img *Image, registry string, tok

 		return fmt.Errorf("Error while retrieving checksum for %s: %v", img.Id, err)

 	}

 	req.Header.Set("X-Docker-Checksum", checksum)

-	Debugf("Setting checksum for %s: %s", img.ShortId(), checksum)

+	utils.Debugf("Setting checksum for %s: %s", img.ShortId(), checksum)

 	res, err := doWithCookies(client, req)

 	if err != nil {

 		return fmt.Errorf("Failed to upload metadata: %s", err)

@@ -469,8 +470,7 @@ func (graph *Graph) PushImage(stdout io.Writer, img *Image, registry string, tok

 		layerData = &TempArchive{file, st.Size()}

 	}

-	req3, err := http.NewRequest("PUT", registry+"/images/"+img.Id+"/layer",

-		ProgressReader(layerData, int(layerData.Size), stdout, ""))

+	req3, err := http.NewRequest("PUT", registry+"/images/"+img.Id+"/layer", utils.ProgressReader(layerData, int(layerData.Size), stdout, ""))

 	if err != nil {

 		return err

 	}

@@ -502,7 +502,7 @@ func (graph *Graph) pushTag(remote, revision, tag, registry string, token []stri

 	revision = "\"" + revision + "\""

 	registry = "https://" + registry + "/v1"

-	Debugf("Pushing tags for rev [%s] on {%s}\n", revision, registry+"/users/"+remote+"/"+tag)

+	utils.Debugf("Pushing tags for rev [%s] on {%s}\n", revision, registry+"/users/"+remote+"/"+tag)

 	client := graph.getHttpClient()

 	req, err := http.NewRequest("PUT", registry+"/repositories/"+remote+"/tags/"+tag, strings.NewReader(revision))

@@ -624,7 +624,7 @@ func (graph *Graph) PushRepository(stdout io.Writer, remote string, localRepo Re

 		return err

 	}

-	Debugf("json sent: %s\n", imgListJson)

+	utils.Debugf("json sent: %s\n", imgListJson)

 	fmt.Fprintf(stdout, "Sending image list\n")

 	req, err := http.NewRequest("PUT", auth.IndexServerAddress()+"/repositories/"+remote+"/", bytes.NewReader(imgListJson))

@@ -642,7 +642,7 @@ func (graph *Graph) PushRepository(stdout io.Writer, remote string, localRepo Re

 	defer res.Body.Close()

 	for res.StatusCode >= 300 && res.StatusCode < 400 {

-		Debugf("Redirected to %s\n", res.Header.Get("Location"))

+		utils.Debugf("Redirected to %s\n", res.Header.Get("Location"))

 		req, err = http.NewRequest("PUT", res.Header.Get("Location"), bytes.NewReader(imgListJson))

 		if err != nil {

 			return err

@@ -669,7 +669,7 @@ func (graph *Graph) PushRepository(stdout io.Writer, remote string, localRepo Re

 	var token, endpoints []string

 	if res.Header.Get("X-Docker-Token") != "" {

 		token = res.Header["X-Docker-Token"]

-		Debugf("Auth token: %v", token)

+		utils.Debugf("Auth token: %v", token)

 	} else {

 		return fmt.Errorf("Index response didn't contain an access token")

 	}

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

 	"container/list"

 	"fmt"

 	"github.com/dotcloud/docker/auth"

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

 	"io"

 	"io/ioutil"

 	"log"

@@ -27,9 +28,9 @@ type Runtime struct {

 	graph          *Graph

 	repositories   *TagStore

 	authConfig     *auth.AuthConfig

-	idIndex        *TruncIndex

+	idIndex        *utils.TruncIndex

 	capabilities   *Capabilities

-	kernelVersion  *KernelVersionInfo

+	kernelVersion  *utils.KernelVersionInfo

 	autoRestart    bool

 	volumes        *Graph

 }

@@ -37,7 +38,7 @@ type Runtime struct {

 var sysInitPath string

 func init() {

-	sysInitPath = SelfPath()

+	sysInitPath = utils.SelfPath()

 }

 func (runtime *Runtime) List() []*Container {

@@ -113,13 +114,13 @@ func (runtime *Runtime) Register(container *Container) error {

 	container.runtime = runtime

 	// Attach to stdout and stderr

-	container.stderr = newWriteBroadcaster()

-	container.stdout = newWriteBroadcaster()

+	container.stderr = utils.NewWriteBroadcaster()

+	container.stdout = utils.NewWriteBroadcaster()

 	// Attach to stdin

 	if container.Config.OpenStdin {

 		container.stdin, container.stdinPipe = io.Pipe()

 	} else {

-		container.stdinPipe = NopWriteCloser(ioutil.Discard) // Silently drop stdin

+		container.stdinPipe = utils.NopWriteCloser(ioutil.Discard) // Silently drop stdin

 	}

 	// done

 	runtime.containers.PushBack(container)

@@ -137,9 +138,9 @@ func (runtime *Runtime) Register(container *Container) error {

 			return err

 		} else {

 			if !strings.Contains(string(output), "RUNNING") {

-				Debugf("Container %s was supposed to be running be is not.", container.Id)

+				utils.Debugf("Container %s was supposed to be running be is not.", container.Id)

 				if runtime.autoRestart {

-					Debugf("Restarting")

+					utils.Debugf("Restarting")

 					container.State.Ghost = false

 					container.State.setStopped(0)

 					if err := container.Start(); err != nil {

@@ -147,7 +148,7 @@ func (runtime *Runtime) Register(container *Container) error {

 					}

 					nomonitor = true

 				} else {

-					Debugf("Marking as stopped")

+					utils.Debugf("Marking as stopped")

 					container.State.setStopped(-127)

 					if err := container.ToDisk(); err != nil {

 						return err

@@ -168,7 +169,7 @@ func (runtime *Runtime) Register(container *Container) error {

 	return nil

 }

-func (runtime *Runtime) LogToDisk(src *writeBroadcaster, dst string) error {

+func (runtime *Runtime) LogToDisk(src *utils.WriteBroadcaster, dst string) error {

 	log, err := os.OpenFile(dst, os.O_RDWR|os.O_APPEND|os.O_CREATE, 0600)

 	if err != nil {

 		return err

@@ -215,16 +216,16 @@ func (runtime *Runtime) restore() error {

 		id := v.Name()

 		container, err := runtime.Load(id)

 		if err != nil {

-			Debugf("Failed to load container %v: %v", id, err)

+			utils.Debugf("Failed to load container %v: %v", id, err)

 			continue

 		}

-		Debugf("Loaded container %v", container.Id)

+		utils.Debugf("Loaded container %v", container.Id)

 	}

 	return nil

 }

 func (runtime *Runtime) UpdateCapabilities(quiet bool) {

-	if cgroupMemoryMountpoint, err := FindCgroupMountpoint("memory"); err != nil {

+	if cgroupMemoryMountpoint, err := utils.FindCgroupMountpoint("memory"); err != nil {

 		if !quiet {

 			log.Printf("WARNING: %s\n", err)

 		}

@@ -255,7 +256,7 @@ func NewRuntime(autoRestart bool) (*Runtime, error) {

 		log.Printf("WARNING: %s\n", err)

 	} else {

 		runtime.kernelVersion = k

-		if CompareKernelVersion(k, &KernelVersionInfo{Kernel: 3, Major: 8, Minor: 0}) < 0 {

+		if utils.CompareKernelVersion(k, &utils.KernelVersionInfo{Kernel: 3, Major: 8, Minor: 0}) < 0 {

 			log.Printf("WARNING: You are running linux kernel version %s, which might be unstable running docker. Please upgrade your kernel to 3.8.0.", k.String())

 		}

 	}

@@ -302,7 +303,7 @@ func NewRuntimeFromDirectory(root string, autoRestart bool) (*Runtime, error) {

 		graph:          g,

 		repositories:   repositories,

 		authConfig:     authConfig,

-		idIndex:        NewTruncIndex(),

+		idIndex:        utils.NewTruncIndex(),

 		capabilities:   &Capabilities{},

 		autoRestart:    autoRestart,

 		volumes:        volumes,

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

 import (

 	"fmt"

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

 	"io"

 	"log"

 	"net/http"

@@ -54,7 +55,7 @@ func (srv *Server) ImagesSearch(term string) ([]ApiSearch, error) {

 		var out ApiSearch

 		out.Description = repo["description"]

 		if len(out.Description) > 45 {

-			out.Description = Trunc(out.Description, 42) + "..."

+			out.Description = utils.Trunc(out.Description, 42) + "..."

 		}

 		out.Name = repo["name"]

 		outs = append(outs, out)

@@ -68,7 +69,7 @@ func (srv *Server) ImageInsert(name, url, path string, out io.Writer) error {

 		return err

 	}

-	file, err := Download(url, out)

+	file, err := utils.Download(url, out)

 	if err != nil {

 		return err

 	}

@@ -85,7 +86,7 @@ func (srv *Server) ImageInsert(name, url, path string, out io.Writer) error {

 		return err

 	}

-	if err := c.Inject(ProgressReader(file.Body, int(file.ContentLength), out, "Downloading %v/%v (%v)"), path); err != nil {

+	if err := c.Inject(utils.ProgressReader(file.Body, int(file.ContentLength), out, "Downloading %v/%v (%v)"), path); err != nil {

 		return err

 	}

 	// FIXME: Handle custom repo, tag comment, author

@@ -124,7 +125,7 @@ func (srv *Server) ImagesViz(out io.Writer) error {

 	for name, repository := range srv.runtime.repositories.Repositories {

 		for tag, id := range repository {

-			reporefs[TruncateId(id)] = append(reporefs[TruncateId(id)], fmt.Sprintf("%s:%s", name, tag))

+			reporefs[utils.TruncateId(id)] = append(reporefs[utils.TruncateId(id)], fmt.Sprintf("%s:%s", name, tag))

 		}