allow user defined output filename
This commit is contained in:
parent
dcd8673817
commit
73eda08540
|
@ -17,6 +17,10 @@ type OutputConfig struct {
|
||||||
// the builder. By default this is output-BUILDNAME where "BUILDNAME" is the
|
// the builder. By default this is output-BUILDNAME where "BUILDNAME" is the
|
||||||
// name of the build.
|
// name of the build.
|
||||||
OutputDir string `mapstructure:"output_directory" required:"false"`
|
OutputDir string `mapstructure:"output_directory" required:"false"`
|
||||||
|
// This is the base name of the file (excluding the file extension) where
|
||||||
|
// the resulting virtual machine will be created. By default this is the
|
||||||
|
// `vm_name`.
|
||||||
|
OutputFilename string `mapstructure:"output_filename" required:"false"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *OutputConfig) Prepare(ctx *interpolate.Context, pc *common.PackerConfig) []error {
|
func (c *OutputConfig) Prepare(ctx *interpolate.Context, pc *common.PackerConfig) []error {
|
||||||
|
|
|
@ -19,6 +19,7 @@ import (
|
||||||
type StepExport struct {
|
type StepExport struct {
|
||||||
Format string
|
Format string
|
||||||
OutputDir string
|
OutputDir string
|
||||||
|
OutputFilename string
|
||||||
ExportOpts []string
|
ExportOpts []string
|
||||||
Bundling VBoxBundleConfig
|
Bundling VBoxBundleConfig
|
||||||
SkipNatMapping bool
|
SkipNatMapping bool
|
||||||
|
@ -37,6 +38,9 @@ func (s *StepExport) Run(ctx context.Context, state multistep.StateBag) multiste
|
||||||
driver := state.Get("driver").(Driver)
|
driver := state.Get("driver").(Driver)
|
||||||
ui := state.Get("ui").(packer.Ui)
|
ui := state.Get("ui").(packer.Ui)
|
||||||
vmName := state.Get("vmName").(string)
|
vmName := state.Get("vmName").(string)
|
||||||
|
if s.OutputFilename == "" {
|
||||||
|
s.OutputFilename = vmName
|
||||||
|
}
|
||||||
|
|
||||||
// Skip export if requested
|
// Skip export if requested
|
||||||
if s.SkipExport {
|
if s.SkipExport {
|
||||||
|
@ -61,7 +65,7 @@ func (s *StepExport) Run(ctx context.Context, state multistep.StateBag) multiste
|
||||||
}
|
}
|
||||||
|
|
||||||
// Export the VM to an OVF
|
// Export the VM to an OVF
|
||||||
outputPath := filepath.Join(s.OutputDir, vmName+"."+s.Format)
|
outputPath := filepath.Join(s.OutputDir, s.OutputFilename+"."+s.Format)
|
||||||
|
|
||||||
command := []string{
|
command := []string{
|
||||||
"export",
|
"export",
|
||||||
|
|
|
@ -396,6 +396,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
|
||||||
&vboxcommon.StepExport{
|
&vboxcommon.StepExport{
|
||||||
Format: b.config.Format,
|
Format: b.config.Format,
|
||||||
OutputDir: b.config.OutputDir,
|
OutputDir: b.config.OutputDir,
|
||||||
|
OutputFilename: b.config.OutputFilename,
|
||||||
ExportOpts: b.config.ExportConfig.ExportOpts,
|
ExportOpts: b.config.ExportConfig.ExportOpts,
|
||||||
Bundling: b.config.VBoxBundleConfig,
|
Bundling: b.config.VBoxBundleConfig,
|
||||||
SkipNatMapping: b.config.SkipNatMapping,
|
SkipNatMapping: b.config.SkipNatMapping,
|
||||||
|
|
|
@ -158,6 +158,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
|
||||||
&vboxcommon.StepExport{
|
&vboxcommon.StepExport{
|
||||||
Format: b.config.Format,
|
Format: b.config.Format,
|
||||||
OutputDir: b.config.OutputDir,
|
OutputDir: b.config.OutputDir,
|
||||||
|
OutputFilename: b.config.OutputFilename,
|
||||||
ExportOpts: b.config.ExportConfig.ExportOpts,
|
ExportOpts: b.config.ExportConfig.ExportOpts,
|
||||||
SkipNatMapping: b.config.SkipNatMapping,
|
SkipNatMapping: b.config.SkipNatMapping,
|
||||||
SkipExport: b.config.SkipExport,
|
SkipExport: b.config.SkipExport,
|
||||||
|
|
|
@ -141,6 +141,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
|
||||||
&vboxcommon.StepExport{
|
&vboxcommon.StepExport{
|
||||||
Format: b.config.Format,
|
Format: b.config.Format,
|
||||||
OutputDir: b.config.OutputDir,
|
OutputDir: b.config.OutputDir,
|
||||||
|
OutputFilename: b.config.OutputFilename,
|
||||||
ExportOpts: b.config.ExportOpts,
|
ExportOpts: b.config.ExportOpts,
|
||||||
SkipNatMapping: b.config.SkipNatMapping,
|
SkipNatMapping: b.config.SkipNatMapping,
|
||||||
SkipExport: b.config.SkipExport,
|
SkipExport: b.config.SkipExport,
|
||||||
|
|
Loading…
Reference in New Issue