|
|
@ -23,6 +23,7 @@ import (
|
|
|
|
"io"
|
|
|
|
"io"
|
|
|
|
"io/ioutil"
|
|
|
|
"io/ioutil"
|
|
|
|
"log"
|
|
|
|
"log"
|
|
|
|
|
|
|
|
"os"
|
|
|
|
"os/exec"
|
|
|
|
"os/exec"
|
|
|
|
"path"
|
|
|
|
"path"
|
|
|
|
"path/filepath"
|
|
|
|
"path/filepath"
|
|
|
@ -281,10 +282,7 @@ func (e *expander) ExpandTemplate(template *common.Template) (string, error) {
|
|
|
|
Args: []string{e.ExpansionBinary, template.Content},
|
|
|
|
Args: []string{e.ExpansionBinary, template.Content},
|
|
|
|
// TODO(vagababov): figure out whether do we even need "PROJECT" and
|
|
|
|
// TODO(vagababov): figure out whether do we even need "PROJECT" and
|
|
|
|
// "DEPLOYMENT_NAME" variables here.
|
|
|
|
// "DEPLOYMENT_NAME" variables here.
|
|
|
|
Env: []string{
|
|
|
|
Env: append(os.Environ(), "PROJECT="+template.Name, "DEPLOYMENT_NAME="+template.Name),
|
|
|
|
"PROJECT=" + template.Name,
|
|
|
|
|
|
|
|
"DEPLOYMENT_NAME=" + template.Name,
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
Stdout: &stdout,
|
|
|
|
Stdout: &stdout,
|
|
|
|
Stderr: &stderr,
|
|
|
|
Stderr: &stderr,
|
|
|
|
}
|
|
|
|
}
|
|
|
|