beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Folded graph/ back into main package

Browse source
This commit is contained in:
Solomon Hykes 2013-03-21 17:47:23 -07:00
parent 44faa07b6c
commit ef711962d5
14 changed files with 37 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
graph/archive.go → archive.go
View file

@ -1,4 +1,4 @@
package graph
package docker
import (
"errors"

2
graph/archive_test.go → archive_test.go
View file

@ -1,4 +1,4 @@
package graph
package docker
import (
"io/ioutil"

2
graph/changes.go → changes.go
View file

@ -1,4 +1,4 @@
package graph
package docker
import (
"fmt"

2
commands.go
View file

@ -803,7 +803,7 @@ func NewServer() (*Server, error) {
// if err != nil {
// return nil, err
// }
runtime, err := New()
runtime, err := NewRuntime()
if err != nil {
return nil, err
}

22
container.go
View file

@ -4,7 +4,6 @@ import (
"encoding/json"
"errors"
"fmt"
"github.com/dotcloud/docker/graph"
"github.com/kr/pty"
"io"
"io/ioutil"
@ -63,11 +62,6 @@ type NetworkSettings struct {
PortMapping map[string]string
}
func GenerateId() string {
return graph.GenerateId() // Re-use the same code to generate container and image IDs
// (this might change when image Ids become content-based)
}
func (container *Container) Cmd() *exec.Cmd {
return container.cmd
}
@ -376,15 +370,15 @@ func (container *Container) Wait() int {
return container.State.ExitCode
}
func (container *Container) ExportRw() (graph.Archive, error) {
return graph.Tar(container.rwPath(), graph.Uncompressed)
func (container *Container) ExportRw() (Archive, error) {
return Tar(container.rwPath(), Uncompressed)
}
func (container *Container) Export() (graph.Archive, error) {
func (container *Container) Export() (Archive, error) {
if err := container.EnsureMounted(); err != nil {
return nil, err
}
return graph.Tar(container.RootfsPath(), graph.Uncompressed)
return Tar(container.RootfsPath(), Uncompressed)
}
func (container *Container) WaitTimeout(timeout time.Duration) error {
@ -420,7 +414,7 @@ func (container *Container) Mount() error {
return image.Mount(container.RootfsPath(), container.rwPath())
}
func (container *Container) Changes() ([]graph.Change, error) {
func (container *Container) Changes() ([]Change, error) {
image, err := container.GetImage()
if err != nil {
return nil, err
@ -428,7 +422,7 @@ func (container *Container) Changes() ([]graph.Change, error) {
return image.Changes(container.rwPath())
}
func (container *Container) GetImage() (*graph.Image, error) {
func (container *Container) GetImage() (*Image, error) {
if container.runtime == nil {
return nil, fmt.Errorf("Can't get image of unregistered container")
}
@ -436,11 +430,11 @@ func (container *Container) GetImage() (*graph.Image, error) {
}
func (container *Container) Mounted() (bool, error) {
return graph.Mounted(container.RootfsPath())
return Mounted(container.RootfsPath())
}
func (container *Container) Unmount() error {
return graph.Unmount(container.RootfsPath())
return Unmount(container.RootfsPath())
}
func (container *Container) logPath(name string) string {

8
graph/graph.go → graph.go
View file

@ -1,4 +1,4 @@
package graph
package docker
import (
"fmt"
@ -13,7 +13,7 @@ type Graph struct {
Root string
}
func New(root string) (*Graph, error) {
func NewGraph(root string) (*Graph, error) {
abspath, err := filepath.Abs(root)
if err != nil {
return nil, err
@ -84,7 +84,7 @@ func (graph *Graph) Register(layerData Archive, img *Image) error {
}
func (graph *Graph) Mktemp(id string) (string, error) {
tmp, err := New(path.Join(graph.Root, ":tmp:"))
tmp, err := NewGraph(path.Join(graph.Root, ":tmp:"))
if err != nil {
return "", fmt.Errorf("Couldn't create temp: %s", err)
}
@ -95,7 +95,7 @@ func (graph *Graph) Mktemp(id string) (string, error) {
}
func (graph *Graph) Garbage() (*Graph, error) {
return New(path.Join(graph.Root, ":garbage:"))
return NewGraph(path.Join(graph.Root, ":garbage:"))
}
func (graph *Graph) Delete(id string) error {

6
graph/graph_test.go → graph_test.go
View file

@ -1,4 +1,4 @@
package graph
package docker
import (
"archive/tar"
@ -28,7 +28,7 @@ func TestInit(t *testing.T) {
// FIXME: Do more extensive tests (ex: create multiple, delete, recreate;
// create multiple, check the amount of images and paths, etc..)
func TestCreate(t *testing.T) {
func TestGraphCreate(t *testing.T) {
graph := tempGraph(t)
defer os.RemoveAll(graph.Root)
archive, err := fakeTar()
@ -177,7 +177,7 @@ func tempGraph(t *testing.T) *Graph {
if err != nil {
t.Fatal(err)
}
graph, err := New(tmp)
graph, err := NewGraph(tmp)
if err != nil {
t.Fatal(err)
}

2
graph/image.go → image.go
View file

@ -1,4 +1,4 @@
package graph
package docker
import (
"bytes"

2
graph/mount.go → mount.go
View file

@ -1,4 +1,4 @@
package graph
package docker
import (
"fmt"

2
graph/mount_darwin.go → mount_darwin.go
View file

@ -1,4 +1,4 @@
package graph
package docker
import "errors"

2
graph/mount_linux.go → mount_linux.go
View file

@ -1,4 +1,4 @@
package graph
package docker
import "syscall"

15
runtime.go
View file

@ -3,7 +3,6 @@ package docker
import (
"container/list"
"fmt"
"github.com/dotcloud/docker/graph"
"io"
"io/ioutil"
"log"
@ -19,8 +18,8 @@ type Runtime struct {
repository string
containers *list.List
networkManager *NetworkManager
graph *graph.Graph
repositories *graph.TagStore
graph *Graph
repositories *TagStore
}
var sysInitPath string
@ -191,22 +190,22 @@ func (runtime *Runtime) restore() error {
return nil
}
func New() (*Runtime, error) {
return NewFromDirectory("/var/lib/docker")
func NewRuntime() (*Runtime, error) {
return NewRuntimeFromDirectory("/var/lib/docker")
}
func NewFromDirectory(root string) (*Runtime, error) {
func NewRuntimeFromDirectory(root string) (*Runtime, error) {
runtime_repo := path.Join(root, "containers")
if err := os.MkdirAll(runtime_repo, 0700); err != nil && !os.IsExist(err) {
return nil, err
}
g, err := graph.New(path.Join(root, "graph"))
g, err := NewGraph(path.Join(root, "graph"))
if err != nil {
return nil, err
}
repositories, err := graph.NewTagStore(path.Join(root, "repositories"), g)
repositories, err := NewTagStore(path.Join(root, "repositories"), g)
if err != nil {
return nil, fmt.Errorf("Couldn't create Tag store: %s", err)
}

13
runtime_test.go
View file

@ -1,7 +1,6 @@
package docker
import (
"github.com/dotcloud/docker/graph"
"io"
"io/ioutil"
"os"
@ -57,7 +56,7 @@ func init() {
unitTestStoreBase = root
// Make it our Store root
runtime, err := NewFromDirectory(root)
runtime, err := NewRuntimeFromDirectory(root)
if err != nil {
panic(err)
}
@ -84,7 +83,7 @@ func newTestRuntime() (*Runtime, error) {
return nil, err
}
runtime, err := NewFromDirectory(root)
runtime, err := NewRuntimeFromDirectory(root)
if err != nil {
return nil, err
}
@ -92,7 +91,7 @@ func newTestRuntime() (*Runtime, error) {
return runtime, nil
}
func GetTestImage(runtime *Runtime) *graph.Image {
func GetTestImage(runtime *Runtime) *Image {
imgs, err := runtime.graph.All()
if err != nil {
panic(err)
@ -102,7 +101,7 @@ func GetTestImage(runtime *Runtime) *graph.Image {
return imgs[0]
}
func TestCreate(t *testing.T) {
func TestRuntimeCreate(t *testing.T) {
runtime, err := newTestRuntime()
if err != nil {
t.Fatal(err)
@ -269,7 +268,7 @@ func TestRestore(t *testing.T) {
t.Fatal(err)
}
runtime1, err := NewFromDirectory(root)
runtime1, err := NewRuntimeFromDirectory(root)
if err != nil {
t.Fatal(err)
}
@ -294,7 +293,7 @@ func TestRestore(t *testing.T) {
// Here are are simulating a docker restart - that is, reloading all containers
// from scratch
runtime2, err := NewFromDirectory(root)
runtime2, err := NewRuntimeFromDirectory(root)
if err != nil {
t.Fatal(err)
}

2
graph/tags.go → tags.go
View file

@ -1,4 +1,4 @@
package graph
package docker
import (
"encoding/json"