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

Merge pull request #9260 from hashicorp/fix_9256 

make package_include match output_vagrantfile parsing and abspath cal…
This commit is contained in:
Megan Marsh 2020-05-29 10:41:26 -07:00 committed by GitHub
parent 8a9833f5b1 03b2c4355e
commit 184dc6cc44
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
builder/vagrant/builder.go
View File

@ -140,6 +140,9 @@ type Config struct {
// package your base box into its own standalone .box file. // package your base box into its own standalone .box file.
SkipPackage bool `mapstructure:"skip_package" required:"false"` SkipPackage bool `mapstructure:"skip_package" required:"false"`
OutputVagrantfile string `mapstructure:"output_vagrantfile"` OutputVagrantfile string `mapstructure:"output_vagrantfile"`
// Equivalent to setting the
// [`--include`](https://www.vagrantup.com/docs/cli/package.html#include-x-y-z) option
// in `vagrant package`; defaults to unset
PackageInclude []string `mapstructure:"package_include"` PackageInclude []string `mapstructure:"package_include"`
ctx interpolate.Context ctx interpolate.Context
@ -192,7 +195,7 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, []string, error) {
} }
if strings.HasSuffix(b.config.SourceBox, ".box") { if strings.HasSuffix(b.config.SourceBox, ".box") {
if _, err := os.Stat(b.config.SourceBox); err != nil { if _, err := os.Stat(b.config.SourceBox); err != nil {
packer.MultiErrorAppend(errs, errs = packer.MultiErrorAppend(errs,
fmt.Errorf("Source box '%s' needs to exist at time of config validation! %v", b.config.SourceBox, err)) fmt.Errorf("Source box '%s' needs to exist at time of config validation! %v", b.config.SourceBox, err))
} }
} }
@ -201,11 +204,22 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, []string, error) {
if b.config.OutputVagrantfile != "" { if b.config.OutputVagrantfile != "" {
b.config.OutputVagrantfile, err = filepath.Abs(b.config.OutputVagrantfile) b.config.OutputVagrantfile, err = filepath.Abs(b.config.OutputVagrantfile)
if err != nil { if err != nil {
packer.MultiErrorAppend(errs, errs = packer.MultiErrorAppend(errs,
fmt.Errorf("unable to determine absolute path for output vagrantfile: %s", err)) fmt.Errorf("unable to determine absolute path for output vagrantfile: %s", err))
} }
} }
if len(b.config.PackageInclude) > 0 {
for i, rawFile := range b.config.PackageInclude {
inclFile, err := filepath.Abs(rawFile)
if err != nil {
errs = packer.MultiErrorAppend(errs,
fmt.Errorf("unable to determine absolute path for file to be included: %s", rawFile))
}
b.config.PackageInclude[i] = inclFile
}
}
if b.config.TeardownMethod == "" { if b.config.TeardownMethod == "" {
// If we're using a box that's already opened on the system, don't // If we're using a box that's already opened on the system, don't
// automatically destroy it. If we open the box ourselves, then go ahead // automatically destroy it. If we open the box ourselves, then go ahead

5
website/pages/partials/builder/vagrant/Config-not-required.mdx
View File

@ -83,4 +83,7 @@
package your base box into its own standalone .box file. package your base box into its own standalone .box file.
- `output_vagrantfile` (string) - Output Vagrantfile - `output_vagrantfile` (string) - Output Vagrantfile
- `package_include` ([]string) - Package Include - `package_include` ([]string) - Equivalent to setting the
[`--include`](https://www.vagrantup.com/docs/cli/package.html#include-x-y-z) option
in `vagrant package`; defaults to unset