upstream/packer
1
0
Fork 0
mirror of https://github.com/hashicorp/packer.git synced 2026-04-15 22:20:33 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fixed cmd order for docker driver. Added config to post proc.

Browse source
This commit is contained in:
Ladar Levison 2018-12-17 22:59:41 -06:00
parent 10095678c8
commit 6ac5971288
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
builder/docker/driver_docker.go
View file

@ -99,13 +99,6 @@ func (d *DockerDriver) Export(id string, dst io.Writer) error {
func (d *DockerDriver) Import(path string, changes []string, repo string) (string, error) {
var stdout, stderr bytes.Buffer
cmd.Stdout = &stdout
cmd.Stderr = &stderr
stdin, err := cmd.StdinPipe()
if err != nil {
return "", err
}
args := []string{"import"}
@ -115,7 +108,15 @@ func (d *DockerDriver) Import(path string, changes []string, repo string) (strin
args = append(args, "-")
args = append(args, repo)
cmd := exec.Command("docker", args...)
cmd.Stdout = &stdout
cmd.Stderr = &stderr
stdin, err := cmd.StdinPipe()
if err != nil {
return "", err
}
// There should be only one artifact of the Docker builder
file, err := os.Open(path)
@ -124,7 +125,7 @@ func (d *DockerDriver) Import(path string, changes []string, repo string) (strin
}
defer file.Close()
log.Printf("Importing container with args: %v", args)
log.Printf("Importing tarball with args: %v", args)
if err := cmd.Start(); err != nil {
return "", err

3
post-processor/docker-import/post-processor.go
View file

@ -18,6 +18,7 @@ type Config struct {
Repository string `mapstructure:"repository"`
Tag string `mapstructure:"tag"`
Changes []string
ctx interpolate.Context
}
@ -62,7 +63,7 @@ func (p *PostProcessor) PostProcess(ui packer.Ui, artifact packer.Artifact) (pac
ui.Message("Importing image: " + artifact.Id())
ui.Message("Repository: " + importRepo)
id, err := driver.Import(artifact.Files()[0], importRepo)
id, err := driver.Import(artifact.Files()[0], p.config.Changes, importRepo)
if err != nil {
return nil, false, err
}