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

Merge pull request #4389 from mitchellh/rawatlas 

don't interpolate atlas variables.
This commit is contained in:
Matthew Hooker 2017-01-12 18:11:17 -08:00 committed by GitHub
parent 3824ea157d d0ef866639
commit 6696bf1da1
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
command/push.go
View File

@ -11,6 +11,7 @@ import (
"github.com/hashicorp/atlas-go/archive" "github.com/hashicorp/atlas-go/archive"
"github.com/hashicorp/atlas-go/v1" "github.com/hashicorp/atlas-go/v1"
"github.com/mitchellh/packer/helper/flag-kv"
"github.com/mitchellh/packer/template" "github.com/mitchellh/packer/template"
) )
@ -189,7 +190,15 @@ func (c *PushCommand) Run(args []string) int {
} }
// Collect the variables from CLI args and any var files // Collect the variables from CLI args and any var files
uploadOpts.Vars = core.Context().UserVariables uploadOpts.Vars = make(map[string]string)
if vs := flags.Lookup("var"); vs != nil {
f := vs.Value.(*kvflag.Flag)
vars := map[string]string(*f)
for k, v := range vars {
uploadOpts.Vars[k] = v
}
}
// Add the upload metadata // Add the upload metadata
metadata := make(map[string]interface{}) metadata := make(map[string]interface{})