Rename docker post processor to docker-push.

Implement login to a docker registry, error handling
This commit is contained in:
Matthew McKeen 2014-01-01 22:30:28 -08:00
parent ae8bffcdf9
commit a0e533db41
4 changed files with 29 additions and 10 deletions

View File

@ -43,7 +43,7 @@ const defaultConfig = `
"post-processors": {
"vagrant": "packer-post-processor-vagrant",
"vsphere": "packer-post-processor-vsphere",
"docker": "packer-post-processor-docker"
"docker-push": "packer-post-processor-docker-push"
},
"provisioners": {

View File

@ -2,7 +2,7 @@ package main
import (
"github.com/mitchellh/packer/packer/plugin"
"github.com/mitchellh/packer/post-processor/docker"
"github.com/mitchellh/packer/post-processor/docker-push"
)
func main() {
@ -10,6 +10,6 @@ func main() {
if err != nil {
panic(err)
}
server.RegisterPostProcessor(new(docker.PostProcessor))
server.RegisterPostProcessor(new(dockerpush.PostProcessor))
server.Serve()
}

View File

@ -1,7 +1,6 @@
package docker
package dockerpush
import (
"bytes"
"errors"
"github.com/mitchellh/mapstructure"
"github.com/mitchellh/packer/packer"
@ -38,18 +37,38 @@ func (p *PostProcessor) Configure(raw ...interface{}) error {
return nil
}
func (p *PostProcessor) PostProcess(ui packer.Ui, artifact packer.Artifact) (packer.Artifact, bool, error) {
id := artifact.Id()
ui.Say("Pushing imgage: " + id)
ui.Say("Pushing image: " + id)
// TODO: docker login
if p.config.Email == "" {
cmd := exec.Command("docker", "login",
"-u=\""+p.config.Username+"\"",
"-p=\""+p.config.Password+"\"")
stdout := new(bytes.Buffer)
if err := cmd.Run(); err != nil {
ui.Say("Login to the registry " + p.config.Registry + " failed")
return nil, false, err
}
} else {
cmd := exec.Command("docker",
"login",
"-u=\""+p.config.Username+"\"",
"-p=\""+p.config.Password+"\"",
"-e=\""+p.config.Email+"\"")
if err := cmd.Run(); err != nil {
ui.Say("Login to the registry " + p.config.Registry + " failed")
return nil, false, err
}
}
cmd := exec.Command("docker", "push", id)
cmd.Stdout = stdout
if err := cmd.Run(); err != nil {
ui.Say("Failed to push image: " + id)
return nil, true, err
return nil, false, err
}
return nil, true, nil