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

post-processor/vagrant: include files

This commit is contained in:
Mitchell Hashimoto 2013-12-19 09:28:19 -08:00
parent eaf76618cb
commit fb5d1708c5
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -17,6 +17,8 @@ FEATURES:
[GH-715] [GH-715]
* "description" field in templates: write a human-readable description * "description" field in templates: write a human-readable description
of what a template does. This will be shown in `packer inspect`. of what a template does. This will be shown in `packer inspect`.
* Vagrant post-processor now accepts a list of files to include in the
box.
IMPROVEMENTS: IMPROVEMENTS:

21
post-processor/vagrant/virtualbox.go
View File

@ -18,9 +18,10 @@ import (
type VBoxBoxConfig struct { type VBoxBoxConfig struct {
common.PackerConfig `mapstructure:",squash"` common.PackerConfig `mapstructure:",squash"`
OutputPath string `mapstructure:"output"` Include []string `mapstructure:"include"`
VagrantfileTemplate string `mapstructure:"vagrantfile_template"` OutputPath string `mapstructure:"output"`
CompressionLevel int `mapstructure:"compression_level"` VagrantfileTemplate string `mapstructure:"vagrantfile_template"`
CompressionLevel int `mapstructure:"compression_level"`
tpl *packer.ConfigTemplate tpl *packer.ConfigTemplate
} }
@ -101,6 +102,16 @@ func (p *VBoxBoxPostProcessor) PostProcess(ui packer.Ui, artifact packer.Artifac
} }
defer os.RemoveAll(dir) defer os.RemoveAll(dir)
// Copy all of the includes files into the temporary directory
for _, src := range p.config.Include {
ui.Message(fmt.Sprintf("Copying from include: %s", src))
dst := filepath.Join(dir, filepath.Base(src))
if err := CopyContents(dst, src); err != nil {
err = fmt.Errorf("Error copying include file: %s\n\n%s", src, err)
return nil, false, err
}
}
// Copy all of the original contents into the temporary directory // Copy all of the original contents into the temporary directory
for _, path := range artifact.Files() { for _, path := range artifact.Files() {
@ -112,7 +123,7 @@ func (p *VBoxBoxPostProcessor) PostProcess(ui packer.Ui, artifact packer.Artifac
return nil, false, err return nil, false, err
} }
} else { } else {
ui.Message(fmt.Sprintf("Copying: %s", path)) ui.Message(fmt.Sprintf("Copying from artifact: %s", path))
dstPath := filepath.Join(dir, filepath.Base(path)) dstPath := filepath.Join(dir, filepath.Base(path))
if err := CopyContents(dstPath, path); err != nil { if err := CopyContents(dstPath, path); err != nil {
return nil, false, err return nil, false, err
@ -136,6 +147,8 @@ func (p *VBoxBoxPostProcessor) PostProcess(ui packer.Ui, artifact packer.Artifac
vagrantfileContents := defaultVBoxVagrantfile vagrantfileContents := defaultVBoxVagrantfile
if p.config.VagrantfileTemplate != "" { if p.config.VagrantfileTemplate != "" {
ui.Message(fmt.Sprintf(
"Using Vagrantfile template: %s", p.config.VagrantfileTemplate))
f, err := os.Open(p.config.VagrantfileTemplate) f, err := os.Open(p.config.VagrantfileTemplate)
if err != nil { if err != nil {
return nil, false, err return nil, false, err