iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[lxd] rework local tar command to avoid chdir

This commit is contained in:
Chris Lundquist 2017-01-27 21:06:18 +00:00 committed by Megan Marsh
parent acae8fc2f9
commit 29bbe10c1c
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
builder/lxd/communicator.go
View File

@ -70,13 +70,15 @@ func (c *Communicator) UploadDir(dst string, src string, exclude []string) error
// NOTE:lxc file push doesn't yet support directory uploads.
// As a work around, we tar up the folder, upload it as a file, then extract it
os.Chdir(src)
tar, err := c.CmdWrapper("tar -czf - .")
// Don't use 'z' flag as compressing may take longer and the transfer is likely local.
// If this isn't the case, it is possible for the user to crompress in another step then transfer.
// It wouldn't be possibe to disable compression, without exposing this option.
tar, err := c.CmdWrapper(fmt.Sprintf("tar -cf - -C %s .", src))
if err != nil {
return err
}
cp, err := c.CmdWrapper(fmt.Sprintf("lxc exec %s -- tar -xzf - -C %s ", c.ContainerName, dst))
cp, err := c.CmdWrapper(fmt.Sprintf("lxc exec %s -- tar -xf - -C %s", c.ContainerName, dst))
if err != nil {
return err
}