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

 package client

 import (

-	"github.com/dotcloud/docker/rcli"

 	"github.com/dotcloud/docker/future"

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

 	"io"

 	"io/ioutil"

 	"log"

@@ -112,7 +112,7 @@ func InteractiveMode(scripts ...string) error {

 		return err

 	}

 	io.WriteString(rcfile, "enable -n help\n")

-	os.Setenv("PATH", tmp + ":" + os.Getenv("PATH"))

+	os.Setenv("PATH", tmp+":"+os.Getenv("PATH"))

 	os.Setenv("PS1", "\\h docker> ")

 	shell := exec.Command("/bin/bash", append([]string{"--rcfile", rcfile.Name()}, scripts...)...)

 	shell.Stdin = os.Stdin

@@ -15,7 +15,6 @@ type Termios struct {

 	Ospeed uintptr

 }

-

 const (

 	// Input flags

 	inpck  = 0x010

@@ -35,113 +34,110 @@ const (

 )

 const (

-        HUPCL                             = 0x4000 

-        ICANON                            = 0x100 

-        ICRNL                             = 0x100 

-        IEXTEN                            = 0x400

-        BRKINT                            = 0x2 

-        CFLUSH                            = 0xf 

-        CLOCAL                            = 0x8000 

-        CREAD                             = 0x800 

-        CS5                               = 0x0 

-        CS6                               = 0x100 

-        CS7                               = 0x200 

-        CS8                               = 0x300 

-        CSIZE                             = 0x300 

-        CSTART                            = 0x11 

-        CSTATUS                           = 0x14 

-        CSTOP                             = 0x13 

-        CSTOPB                            = 0x400 

-        CSUSP                             = 0x1a 

-        IGNBRK                            = 0x1 

-        IGNCR                             = 0x80 

-        IGNPAR                            = 0x4 

-        IMAXBEL                           = 0x2000 

-        INLCR                             = 0x40 

-        INPCK                             = 0x10 

-        ISIG                              = 0x80 

-        ISTRIP                            = 0x20 

-        IUTF8                             = 0x4000 

-        IXANY                             = 0x800 

-        IXOFF                             = 0x400 

-        IXON                              = 0x200 

-        NOFLSH                            = 0x80000000 

-        OCRNL                             = 0x10 

-        OFDEL                             = 0x20000 

-        OFILL                             = 0x80 

-        ONLCR                             = 0x2 

-        ONLRET                            = 0x40 

-        ONOCR                             = 0x20 

-        ONOEOT                            = 0x8 

-        OPOST                             = 0x1 

-RENB                            = 0x1000 

-        PARMRK                            = 0x8 

-        PARODD                            = 0x2000 

-

-        TOSTOP                            = 0x400000 

-        VDISCARD                          = 0xf 

-        VDSUSP                            = 0xb 

-        VEOF                              = 0x0 

-        VEOL                              = 0x1 

-        VEOL2                             = 0x2 

-        VERASE                            = 0x3 

-        VINTR                             = 0x8 

-        VKILL                             = 0x5 

-        VLNEXT                            = 0xe 

-        VMIN                              = 0x10 

-        VQUIT                             = 0x9 

-        VREPRINT                          = 0x6 

-        VSTART                            = 0xc 

-        VSTATUS                           = 0x12 

-        VSTOP                             = 0xd 

-        VSUSP                             = 0xa 

-        VT0                               = 0x0 

-        VT1                               = 0x10000 

-        VTDLY                             = 0x10000 

-        VTIME                             = 0x11 

-	ECHO				  = 0x00000008

-

-        PENDIN                            = 0x20000000 

+	HUPCL   = 0x4000

+	ICANON  = 0x100

+	ICRNL   = 0x100

+	IEXTEN  = 0x400

+	BRKINT  = 0x2

+	CFLUSH  = 0xf

+	CLOCAL  = 0x8000

+	CREAD   = 0x800

+	CS5     = 0x0

+	CS6     = 0x100

+	CS7     = 0x200

+	CS8     = 0x300

+	CSIZE   = 0x300

+	CSTART  = 0x11

+	CSTATUS = 0x14

+	CSTOP   = 0x13

+	CSTOPB  = 0x400

+	CSUSP   = 0x1a

+	IGNBRK  = 0x1

+	IGNCR   = 0x80

+	IGNPAR  = 0x4

+	IMAXBEL = 0x2000

+	INLCR   = 0x40

+	INPCK   = 0x10

+	ISIG    = 0x80

+	ISTRIP  = 0x20

+	IUTF8   = 0x4000

+	IXANY   = 0x800

+	IXOFF   = 0x400

+	IXON    = 0x200

+	NOFLSH  = 0x80000000

+	OCRNL   = 0x10

+	OFDEL   = 0x20000

+	OFILL   = 0x80

+	ONLCR   = 0x2

+	ONLRET  = 0x40

+	ONOCR   = 0x20

+	ONOEOT  = 0x8

+	OPOST   = 0x1

+	RENB    = 0x1000

+	PARMRK  = 0x8

+	PARODD  = 0x2000

+

+	TOSTOP   = 0x400000

+	VDISCARD = 0xf

+	VDSUSP   = 0xb

+	VEOF     = 0x0

+	VEOL     = 0x1

+	VEOL2    = 0x2

+	VERASE   = 0x3

+	VINTR    = 0x8

+	VKILL    = 0x5

+	VLNEXT   = 0xe

+	VMIN     = 0x10

+	VQUIT    = 0x9

+	VREPRINT = 0x6

+	VSTART   = 0xc

+	VSTATUS  = 0x12

+	VSTOP    = 0xd

+	VSUSP    = 0xa

+	VT0      = 0x0

+	VT1      = 0x10000

+	VTDLY    = 0x10000

+	VTIME    = 0x11

+	ECHO     = 0x00000008

+

+	PENDIN = 0x20000000

 )

 type State struct {

-       termios Termios

+	termios Termios

 }

 // IsTerminal returns true if the given file descriptor is a terminal.

 func IsTerminal(fd int) bool {

-        var termios Termios

-        _, _, err := syscall.Syscall6(syscall.SYS_IOCTL, uintptr(fd), uintptr(getTermios), uintptr(unsafe.Pointer(&termios)), 0, 0, 0)

-        return err == 0

+	var termios Termios

+	_, _, err := syscall.Syscall6(syscall.SYS_IOCTL, uintptr(fd), uintptr(getTermios), uintptr(unsafe.Pointer(&termios)), 0, 0, 0)

+	return err == 0

 }

 // MakeRaw put the terminal connected to the given file descriptor into raw

 // mode and returns the previous state of the terminal so that it can be

 // restored.

 func MakeRaw(fd int) (*State, error) {

-        var oldState State

-        if _, _, err := syscall.Syscall6(syscall.SYS_IOCTL, uintptr(fd), uintptr(getTermios), uintptr(unsafe.Pointer(&oldState.termios)), 0, 0, 0); err != 0 {

-                return nil, err

-        }

-

-        newState := oldState.termios

-        newState.Iflag &^= ISTRIP | INLCR | IGNCR | IXON | IXOFF

-        newState.Iflag |= ICRNL

-        newState.Oflag |= ONLCR

-        newState.Lflag &^= ECHO | ICANON | ISIG

-        if _, _, err := syscall.Syscall6(syscall.SYS_IOCTL, uintptr(fd), uintptr(setTermios), uintptr(unsafe.Pointer(&newState)), 0, 0, 0); err != 0 {

-                return nil, err

-        }

-

-        return &oldState, nil

+	var oldState State

+	if _, _, err := syscall.Syscall6(syscall.SYS_IOCTL, uintptr(fd), uintptr(getTermios), uintptr(unsafe.Pointer(&oldState.termios)), 0, 0, 0); err != 0 {

+		return nil, err

+	}

+

+	newState := oldState.termios

+	newState.Iflag &^= ISTRIP | INLCR | IGNCR | IXON | IXOFF

+	newState.Iflag |= ICRNL

+	newState.Oflag |= ONLCR

+	newState.Lflag &^= ECHO | ICANON | ISIG

+	if _, _, err := syscall.Syscall6(syscall.SYS_IOCTL, uintptr(fd), uintptr(setTermios), uintptr(unsafe.Pointer(&newState)), 0, 0, 0); err != 0 {

+		return nil, err

+	}

+

+	return &oldState, nil

 }

-

 // Restore restores the terminal connected to the given file descriptor to a

 // previous state.

 func Restore(fd int, state *State) error {

-        _, _, err := syscall.Syscall6(syscall.SYS_IOCTL, uintptr(fd), uintptr(setTermios), uintptr(unsafe.Pointer(&state.termios)), 0, 0, 0)

-        return err

+	_, _, err := syscall.Syscall6(syscall.SYS_IOCTL, uintptr(fd), uintptr(setTermios), uintptr(unsafe.Pointer(&state.termios)), 0, 0, 0)

+	return err

 }

-

-

@@ -1,6 +1,7 @@

 package docker

 import (

+	"./fs"

 	"bytes"

 	"encoding/json"

 	"errors"

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

 	"strings"

 	"syscall"

 	"time"

-	"./fs"

 )

 var sysInitPath string

@@ -35,7 +35,7 @@ type Container struct {

 	Config     *Config

 	Mountpoint *fs.Mountpoint

 	State      *State

-	Image	   string

+	Image      string

 	SysInitPath   string

 	lxcConfigPath string

@@ -69,7 +69,7 @@ func createContainer(id string, root string, command string, args []string, imag

 		Path:       command,

 		Args:       args,

 		Config:     config,

-		Image:		image.Id,

+		Image:      image.Id,

 		Mountpoint: mountpoint,

 		State:      newState(),

@@ -1,6 +1,7 @@

 package docker

 import (

+	"./fs"

 	"container/list"

 	"fmt"

 	"io/ioutil"

@@ -8,14 +9,13 @@ import (

 	"os"

 	"path"

 	"sort"

-	"./fs"

 )

 type Docker struct {

-	root       	string

-	repository 	string

-	containers 	*list.List

-	Store		*fs.Store

+	root       string

+	repository string

+	containers *list.List

+	Store      *fs.Store

 }

 func (docker *Docker) List() []*Container {

@@ -117,7 +117,7 @@ func NewFromDirectory(root string) (*Docker, error) {

 		root:       root,

 		repository: path.Join(root, "containers"),

 		containers: list.New(),

-		Store:		store,

+		Store:      store,

 	}

 	if err := os.MkdirAll(docker.repository, 0700); err != nil && !os.IsExist(err) {

@@ -2,10 +2,10 @@ package main

 import (

 	"flag"

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

 	"log"

 	"os"

 	"path"

-	"github.com/dotcloud/docker/client"

 )

 func main() {

@@ -27,4 +27,3 @@ func main() {

 		}

 	}

 }

-

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

 package docker

 import (

+	"./fs"

+	"io"

 	"io/ioutil"

 	"log"

 	"os"

 	"testing"

-	"io"

-	"./fs"

 )

 const testLayerPath string = "/var/lib/docker/docker-ut.tar"

-func layerArchive(tarfile string)  (io.Reader, error) {

+func layerArchive(tarfile string) (io.Reader, error) {

 	// FIXME: need to close f somewhere

 	f, err := os.Open(tarfile)

 	if err != nil {

@@ -57,7 +57,7 @@ func newTestDocker() (*Docker, error) {

 	return docker, nil

 }

-func GetTestImage(docker *Docker) (*fs.Image) {

+func GetTestImage(docker *Docker) *fs.Image {

 	imgs, err := docker.Store.Images()

 	if err != nil {

 		panic(err)

@@ -1,9 +1,9 @@

 package main

 import (

-	"flag"

 	".."

 	"../server"

+	"flag"

 	"log"

 )

@@ -1,20 +1,19 @@

 package fake

 import (

+	"archive/tar"

 	"bytes"

-	"math/rand"

+	"github.com/kr/pty"

 	"io"

-	"archive/tar"

+	"math/rand"

 	"os/exec"

-	"github.com/kr/pty"

 )

-

 func FakeTar() (io.Reader, error) {

 	content := []byte("Hello world!\n")

 	buf := new(bytes.Buffer)

 	tw := tar.NewWriter(buf)

-	for _, name := range []string {"/etc/postgres/postgres.conf", "/etc/passwd", "/var/log/postgres/postgres.conf"} {

+	for _, name := range []string{"/etc/postgres/postgres.conf", "/etc/passwd", "/var/log/postgres/postgres.conf"} {

 		hdr := new(tar.Header)

 		hdr.Size = int64(len(content))

 		hdr.Name = name

@@ -27,7 +26,6 @@ func FakeTar() (io.Reader, error) {

 	return buf, nil

 }

-

 func WriteFakeTar(dst io.Writer) error {

 	if data, err := FakeTar(); err != nil {

 		return err

@@ -37,7 +35,6 @@ func WriteFakeTar(dst io.Writer) error {

 	return nil

 }

-

 func RandomBytesChanged() uint {

 	return uint(rand.Int31n(24 * 1024 * 1024))

 }

@@ -54,7 +51,6 @@ func ContainerRunning() bool {

 	return false

 }

-

 func StartCommand(cmd *exec.Cmd, interactive bool) (io.WriteCloser, io.ReadCloser, error) {

 	if interactive {

 		term, err := pty.Start(cmd)

@@ -76,5 +72,3 @@ func StartCommand(cmd *exec.Cmd, interactive bool) (io.WriteCloser, io.ReadClose

 	}

 	return stdin, stdout, nil

 }

-

-

@@ -1,129 +1,129 @@

 package fs

 import (

-    "fmt"

-    "path/filepath"

-    "os"

-    "strings"

+	"fmt"

+	"os"

+	"path/filepath"

+	"strings"

 )

 type ChangeType int

 const (

-    ChangeModify = iota

-    ChangeAdd

-    ChangeDelete

+	ChangeModify = iota

+	ChangeAdd

+	ChangeDelete

 )

 type Change struct {

-    Path string

-    Kind ChangeType

+	Path string

+	Kind ChangeType

 }

 func (change *Change) String() string {

-    var kind string

-    switch change.Kind {

-    case ChangeModify:

-        kind = "C"

-    case ChangeAdd:

-        kind = "A"

-    case ChangeDelete:

-        kind = "D"

-    }

-    return fmt.Sprintf("%s %s", kind, change.Path)

+	var kind string

+	switch change.Kind {

+	case ChangeModify:

+		kind = "C"

+	case ChangeAdd:

+		kind = "A"

+	case ChangeDelete:

+		kind = "D"

+	}

+	return fmt.Sprintf("%s %s", kind, change.Path)

 }

 func (store *Store) Changes(mp *Mountpoint) ([]Change, error) {

-    var changes []Change

-    image, err := store.Get(mp.Image)

-    if err != nil {

-        return nil, err

-    }

-    layers, err := image.layers()

-    if err != nil {

-        return nil, err

-    }

-

-    err = filepath.Walk(mp.Rw, func(path string, f os.FileInfo, err error) error {

-        if err != nil {

-            return err

-        }

-

-        // Rebase path

-        path, err = filepath.Rel(mp.Rw, path)

-        if err != nil {

-            return err

-        }

-        path = filepath.Join("/", path)

-

-        // Skip root

-        if path == "/" {

-            return nil

-        }

-

-        // Skip AUFS metadata

-        if matched, err := filepath.Match("/.wh..wh.*", path); err != nil || matched {

-            return err

-        }

-

-        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 := strings.TrimLeft(file, ".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 {

-        return nil, err

-    }

-    return changes, nil

+	var changes []Change

+	image, err := store.Get(mp.Image)

+	if err != nil {

+		return nil, err

+	}

+	layers, err := image.layers()

+	if err != nil {

+		return nil, err

+	}

+

+	err = filepath.Walk(mp.Rw, func(path string, f os.FileInfo, err error) error {

+		if err != nil {

+			return err

+		}

+

+		// Rebase path

+		path, err = filepath.Rel(mp.Rw, path)

+		if err != nil {

+			return err

+		}

+		path = filepath.Join("/", path)

+

+		// Skip root

+		if path == "/" {

+			return nil

+		}

+

+		// Skip AUFS metadata

+		if matched, err := filepath.Match("/.wh..wh.*", path); err != nil || matched {

+			return err

+		}

+

+		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 := strings.TrimLeft(file, ".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 {

+		return nil, err

+	}

+	return changes, nil

 }

 // Reset removes all changes to the filesystem, reverting it to its initial state.

 func (mp *Mountpoint) Reset() error {

-    if err := os.RemoveAll(mp.Rw); err != nil {

-        return err

-    }

-    // We removed the RW directory itself along with its content: let's re-create an empty one.

-    if err := mp.createFolders(); err != nil {

-        return err

-    }

-    return nil

+	if err := os.RemoveAll(mp.Rw); err != nil {

+		return err

+	}

+	// We removed the RW directory itself along with its content: let's re-create an empty one.

+	if err := mp.createFolders(); err != nil {

+		return err

+	}

+	return nil

 }

 // Open opens the named file for reading.

@@ -141,4 +141,4 @@ func (mp *Mountpoint) Reset() error {

 //         return nil, err

 //     }

 //     return ioutil.ReadDir(filepath.Join(fs.RootFS, dirname))

-// }

\ No newline at end of file

+// }

@@ -1,25 +1,25 @@

 package fs

 import (

+	"../future"

 	"errors"

-	"path"

-	"path/filepath"

+	"fmt"

 	"io"

 	"io/ioutil"

 	"os"

 	"os/exec"

-	"fmt"

-	"../future"

+	"path"

+	"path/filepath"

 )

 type LayerStore struct {

-	Root	string

+	Root string

 }

 type Compression uint32

 const (

-	Uncompressed	Compression = iota

+	Uncompressed Compression = iota

 	Bzip2

 	Gzip

 )

@@ -80,10 +80,9 @@ func (store *LayerStore) Init() error {

 	return os.Mkdir(store.Root, 0700)

 }

-

 func (store *LayerStore) Mktemp() (string, error) {

 	tmpName := future.RandomId()

-	tmpPath := path.Join(store.Root, "tmp-" + tmpName)

+	tmpPath := path.Join(store.Root, "tmp-"+tmpName)

 	if err := os.Mkdir(tmpPath, 0700); err != nil {

 		return "", err

 	}

@@ -94,7 +93,6 @@ func (store *LayerStore) layerPath(id string) string {

 	return path.Join(store.Root, id)

 }

-

 func (store *LayerStore) AddLayer(id string, archive Archive, stderr io.Writer, compression Compression) (string, error) {

 	if _, err := os.Stat(store.layerPath(id)); err == nil {

 		return "", errors.New("Layer already exists: " + id)

@@ -1,14 +1,12 @@

 package fs

 import (

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

 	"io/ioutil"

-	"testing"

 	"os"

-	"github.com/dotcloud/docker/fake"

+	"testing"

 )

-

-

 func TestLayersInit(t *testing.T) {

 	store := tempStore(t)

 	defer os.RemoveAll(store.Root)

@@ -54,7 +52,6 @@ func TestAddLayerDuplicate(t *testing.T) {

 	}

 }

-

 /*

  * HELPER FUNCTIONS

  */

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

 import "syscall"

-

 func mount(source string, target string, fstype string, flags uintptr, data string) (err error) {

 	return syscall.Mount(source, target, fstype, flags, data)

 }

@@ -10,9 +10,9 @@ import (

 	"io"

 	"os"

 	"path"

+	"path/filepath"

 	"syscall"

 	"time"

-	"path/filepath"

 )

 type Store struct {

@@ -168,7 +168,6 @@ type Image struct {

 	store   *Store `db:"-"`

 }

-

 func (image *Image) Copy(pth string) (*Image, error) {

 	if err := image.store.orm.Insert(&Path{Path: pth, Image: image.Id}); err != nil {

 		return nil, err

@@ -198,7 +197,7 @@ func (image *Image) Mountpoint(root, rw string) (*Mountpoint, error) {

 func (image *Image) layers() ([]string, error) {

 	var list []string

-	var err  error

+	var err error

 	currentImg := image

 	for currentImg != nil {

 		if layer := image.store.layers.Get(image.Id); layer != "" {

@@ -1,9 +1,9 @@

 package fs

 import (

+	"../fake"

 	"errors"

 	"fmt"

-	"../fake"

 	"io/ioutil"

 	"os"

 	"testing"

@@ -1,12 +1,12 @@

 package future

 import (

+	"bytes"

 	"crypto/sha256"

-	"io"

 	"fmt"

-	"time"

-	"bytes"

+	"io"

 	"math/rand"

+	"time"

 )

 func Seed() {

@@ -30,18 +30,18 @@ func HumanDuration(d time.Duration) string {

 		return "About a minute"

 	} else if minutes < 60 {

 		return fmt.Sprintf("%d minutes", minutes)

-	} else if hours := int(d.Hours()); hours  == 1{

+	} else if hours := int(d.Hours()); hours == 1 {

 		return "About an hour"

 	} else if hours < 48 {

 		return fmt.Sprintf("%d hours", hours)

-	} else if hours < 24 * 7 * 2 {

-		return fmt.Sprintf("%d days", hours / 24)

-	} else if hours < 24 * 30 * 3 {

-		return fmt.Sprintf("%d weeks", hours / 24 / 7)

-	} else if hours < 24 * 365 * 2 {

-		return fmt.Sprintf("%d months", hours / 24 / 30)

+	} else if hours < 24*7*2 {

+		return fmt.Sprintf("%d days", hours/24)

+	} else if hours < 24*30*3 {

+		return fmt.Sprintf("%d weeks", hours/24/7)

+	} else if hours < 24*365*2 {

+		return fmt.Sprintf("%d months", hours/24/30)

 	}

-	return fmt.Sprintf("%d years", d.Hours() / 24 / 365)

+	return fmt.Sprintf("%d years", d.Hours()/24/365)

 }

 func randomBytes() io.Reader {

@@ -60,4 +60,3 @@ func Go(f func() error) chan error {

 	}()

 	return ch

 }

-

@@ -1,27 +1,25 @@

 package image

 import (

+	"encoding/json"

+	"errors"

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

 	"io"

 	"io/ioutil"

-	"encoding/json"

-	"time"

+	"os"

 	"path"

 	"path/filepath"

-	"errors"

 	"sort"

-	"os"

-	"github.com/dotcloud/docker/future"

 	"strings"

+	"time"

 )

-

 type Store struct {

 	*Index

-	Root	string

-	Layers	*LayerStore

+	Root   string

+	Layers *LayerStore

 }

-

 func New(root string) (*Store, error) {

 	abspath, err := filepath.Abs(root)

 	if err != nil {

@@ -38,8 +36,8 @@ func New(root string) (*Store, error) {

 		return nil, err

 	}

 	return &Store{

-		Root: abspath,

-		Index: NewIndex(path.Join(root, "index.json")),

+		Root:   abspath,