vbatts/pkg
1
0
Fork 0
Code Pull requests Releases Activity

Update chroot apply layer to handle decompression outside chroot

Browse source 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

Conflicts:
	pkg/archive/diff.go
	pkg/chrootarchive/archive.go
This commit is contained in:
Michael Crosby 2014-12-08 16:14:56 -05:00 • committed by Tibor Vass
parent abc58c3bfd
commit 79b559bc05
3 changed files with 56 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

25
chrootarchive/archive.go
View file

@ -15,6 +15,15 @@ import (
"github.com/docker/docker/pkg/reexec"
)
var chrootArchiver = &archive.Archiver{Untar}
func chroot(path string) error {
if err := syscall.Chroot(path); err != nil {
return err
}
return syscall.Chdir("/")
}
func untar() {
runtime.LockOSThread()
flag.Parse()
@ -36,11 +45,17 @@ func untar() {
os.Exit(0)
}
var (
chrootArchiver = &archive.Archiver{Untar}
)
func Untar(tarArchive io.Reader, dest string, options *archive.TarOptions) error {
if tarArchive == nil {
return fmt.Errorf("Empty archive")
}
if options == nil {
options = &archive.TarOptions{}
}
if options.Excludes == nil {
options.Excludes = []string{}
}
func Untar(archive io.Reader, dest string, options *archive.TarOptions) error {
var buf bytes.Buffer
enc := json.NewEncoder(&buf)
if err := enc.Encode(options); err != nil {
@ -53,7 +68,7 @@ func Untar(archive io.Reader, dest string, options *archive.TarOptions) error {
}
cmd := reexec.Command("docker-untar", dest, buf.String())
cmd.Stdin = archive
cmd.Stdin = tarArchive
out, err := cmd.CombinedOutput()
if err != nil {
return fmt.Errorf("Untar %s %s", err, out)