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

Update LXD directory upload command (#8416)

This commit is contained in:
Ilhaan Rasheed 2019-12-02 03:01:18 -08:00 committed by Adrien Delorme
parent b4200c3590
commit 2c22b9f721
1 changed files with 2 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
builder/lxd/communicator.go
View File

@ -88,32 +88,15 @@ func (c *Communicator) Upload(dst string, r io.Reader, fi *os.FileInfo) error {
}
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
fileDestination := filepath.Join(c.ContainerName, dst)
// 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 compress in another step then transfer.
// It wouldn't be possible to disable compression, without exposing this option.
tar, err := c.CmdWrapper(fmt.Sprintf("tar -cf - -C %s .", src))
cp, err := c.CmdWrapper(fmt.Sprintf("lxc file push -pr %s %s", src, fileDestination))
if err != nil {
return err
}
cp, err := c.CmdWrapper(fmt.Sprintf("lxc exec %s -- tar -xf - -C %s", c.ContainerName, dst))
if err != nil {
return err
}
tarCmd := ShellCommand(tar)
cpCmd := ShellCommand(cp)
cpCmd.Stdin, _ = tarCmd.StdoutPipe()
log.Printf("Starting tar command: %s", tar)
err = tarCmd.Start()
if err != nil {
return err
}
log.Printf("Running cp command: %s", cp)
err = cpCmd.Run()
if err != nil {
@ -121,12 +104,6 @@ func (c *Communicator) UploadDir(dst string, src string, exclude []string) error
return err
}
err = tarCmd.Wait()
if err != nil {
log.Printf("Error running tar command: %s", err)
return err
}
return nil
}