Merge branch 'fs' of github.com:dotcloud/docker into fs

client/client.go

@@ -1,8 +1,8 @@
 package client
 
 import (
-	"../future"
-	"../rcli"
+	"github.com/dotcloud/docker/future"
+	"github.com/dotcloud/docker/rcli"
 	"io"
 	"io/ioutil"
 	"log"

container.go

@@ -1,9 +1,9 @@
 package docker
 
 import (
-	"./fs"
 	"encoding/json"
 	"errors"
+	"github.com/dotcloud/docker/fs"
 	"github.com/kr/pty"
 	"io"
 	"io/ioutil"
@@ -129,6 +129,8 @@ func loadContainer(store *fs.Store, containerPath string, netManager *NetworkMan
 	)
 	if err != nil {
 		return nil, err
+	} else if mountpoint == nil {
+		return nil, errors.New("Couldn't load container: unregistered mountpoint.")
 	}
 	container := &Container{
 		stdout:          newWriteBroadcaster(),

docker.go

@@ -1,7 +1,7 @@
 package docker
 
 import (
-	"./fs"
+	"github.com/dotcloud/docker/fs"
 	"container/list"
 	"fmt"
 	"io/ioutil"

docker/docker.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	"../client"
+	"github.com/dotcloud/docker/client"
 	"flag"
 	"log"
 	"os"

dockerd/dockerd.go

@@ -1,8 +1,8 @@
 package main
 
 import (
-	".."
-	"../server"
+	"github.com/dotcloud/docker"
+	"github.com/dotcloud/docker/server"
 	"flag"
 	"log"
 )

fs/layers.go

@@ -1,7 +1,7 @@
 package fs
 
 import (
-	"../future"
+	"github.com/dotcloud/docker/future"
 	"errors"
 	"fmt"
 	"io"

fs/store_test.go

@@ -1,7 +1,7 @@
 package fs
 
 import (
-	"../fake"
+	"github.com/dotcloud/docker/fake"
 	"errors"
 	"fmt"
 	"io/ioutil"

server/server.go

@@ -1,15 +1,15 @@
 package server
 
 import (
-	".."
-	"../fs"
-	"../future"
-	"../rcli"
 	"bufio"
 	"bytes"
 	"encoding/json"
 	"errors"
 	"fmt"
+	"github.com/dotcloud/docker"
+	"github.com/dotcloud/docker/fs"
+	"github.com/dotcloud/docker/future"
+	"github.com/dotcloud/docker/rcli"
 	"io"
 	"net/http"
 	"net/url"
@@ -42,8 +42,7 @@ func (srv *Server) Help() string {
 	for _, cmd := range [][]interface{}{
 		{"run", "Run a command in a container"},
 		{"ps", "Display a list of containers"},
-		{"pull", "Download a tarball and create a container from it"},
-		{"put", "Upload a tarball and create a container from it"},
+		{"import", "Create a new filesystem image from the contents of a tarball"},
 		{"port", "Lookup the public-facing port which is NAT-ed to PRIVATE_PORT"},
 		{"rm", "Remove containers"},
 		{"kill", "Kill a running container"},
@@ -409,15 +408,20 @@ func (srv *Server) CmdKill(stdin io.ReadCloser, stdout io.Writer, args ...string
 	return nil
 }
 
-func (srv *Server) CmdPull(stdin io.ReadCloser, stdout io.Writer, args ...string) error {
-	cmd := rcli.Subcmd(stdout, "pull", "[OPTIONS] NAME", "Download a new image from a remote location")
+func (srv *Server) CmdImport(stdin io.ReadCloser, stdout io.Writer, args ...string) error {
+	cmd := rcli.Subcmd(stdout, "import", "[OPTIONS] NAME", "Create a new filesystem image from the contents of a tarball")
+	fl_stdin := cmd.Bool("stdin", false, "Read tarball from stdin")
 	if err := cmd.Parse(args); err != nil {
 		return nil
 	}
+	var archive io.Reader
 	name := cmd.Arg(0)
 	if name == "" {
 		return errors.New("Not enough arguments")
 	}
+	if *fl_stdin {
+		archive = stdin
+	} else {
 		u, err := url.Parse(name)
 		if err != nil {
 			return err
@@ -433,7 +437,7 @@ func (srv *Server) CmdPull(stdin io.ReadCloser, stdout io.Writer, args ...string
 		fmt.Fprintf(stdout, "Downloading from %s\n", u.String())
 		// Download with curl (pretty progress bar)
 		// If curl is not available, fallback to http.Get()
-	archive, err := future.Curl(u.String(), stdout)
+		archive, err = future.Curl(u.String(), stdout)
 		if err != nil {
 			if resp, err := http.Get(u.String()); err != nil {
 				return err
@@ -441,6 +445,7 @@ func (srv *Server) CmdPull(stdin io.ReadCloser, stdout io.Writer, args ...string
 				archive = resp.Body
 			}
 		}
+	}
 	fmt.Fprintf(stdout, "Unpacking to %s\n", name)
 	img, err := srv.images.Create(archive, nil, name, "")
 	if err != nil {
@@ -450,23 +455,6 @@ func (srv *Server) CmdPull(stdin io.ReadCloser, stdout io.Writer, args ...string
 	return nil
 }
 
-func (srv *Server) CmdPut(stdin io.ReadCloser, stdout io.Writer, args ...string) error {
-	cmd := rcli.Subcmd(stdout, "put", "[OPTIONS] NAME", "Import a new image from a local archive.")
-	if err := cmd.Parse(args); err != nil {
-		return nil
-	}
-	name := cmd.Arg(0)
-	if name == "" {
-		return errors.New("Not enough arguments")
-	}
-	img, err := srv.images.Create(stdin, nil, name, "")
-	if err != nil {
-		return err
-	}
-	fmt.Fprintln(stdout, img.Id)
-	return nil
-}
-
 func (srv *Server) CmdImages(stdin io.ReadCloser, stdout io.Writer, args ...string) error {
 	cmd := rcli.Subcmd(stdout, "images", "[OPTIONS] [NAME]", "List images")
 	limit := cmd.Int("l", 0, "Only show the N most recent versions of each image")