kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

post-merge repairs

Browse source
This commit is contained in:
shin- 2013-03-11 07:39:06 -07:00
parent 2441edf1a3
commit 5d6199b925
4 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
client/client.go
View file

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

1
container.go
View file

@ -2,7 +2,6 @@ package docker
import ( import (
"./fs" "./fs"
"bytes"
"encoding/json" "encoding/json"
"errors" "errors"
"github.com/kr/pty" "github.com/kr/pty"

2
docker/docker.go
View file

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

6
server/server.go
View file

@ -434,7 +434,7 @@ func (srv *Server) CmdPull(stdin io.ReadCloser, stdout io.Writer, args ...string
} }
} }
fmt.Fprintf(stdout, "Unpacking to %s\n", name) fmt.Fprintf(stdout, "Unpacking to %s\n", name)
img, err := srv.images.Create(resp.Body, nil, name, "") img, err := srv.images.Create(archive, nil, name, "")
if err != nil { if err != nil {
return err return err
} }
@ -614,7 +614,7 @@ func (srv *Server) CmdCommit(stdin io.ReadCloser, stdout io.Writer, args ...stri
} }
if container := srv.containers.Get(containerName); container != nil { if container := srv.containers.Get(containerName); container != nil {
// FIXME: freeze the container before copying it to avoid data corruption? // FIXME: freeze the container before copying it to avoid data corruption?
rwTar, err := docker.Tar(container.Mountpoint.Rw) rwTar, err := fs.Tar(container.Mountpoint.Rw, fs.Uncompressed)
if err != nil { if err != nil {
return err return err
} }
@ -651,7 +651,7 @@ func (srv *Server) CmdTar(stdin io.ReadCloser, stdout io.Writer, args ...string)
if err := container.Mountpoint.EnsureMounted(); err != nil { if err := container.Mountpoint.EnsureMounted(); err != nil {
return err return err
} }
data, err := docker.Tar(container.Mountpoint.Root) data, err := fs.Tar(container.Mountpoint.Root, fs.Uncompressed)
if err != nil { if err != nil {
return err return err
} }