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

Merge pull request #2718 from vtolstov/artifice 

docker-import: allow artifice artifacts
This commit is contained in:
Chris Bednarski 2015-11-04 17:17:44 -08:00
parent 935fa3a590 82893590db
commit 0660c703ad
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
post-processor/docker-import/post-processor.go
View File

@ -4,10 +4,10 @@ import (
"fmt"
"github.com/mitchellh/packer/builder/docker"
"github.com/mitchellh/packer/builder/qemu"
"github.com/mitchellh/packer/common"
"github.com/mitchellh/packer/helper/config"
"github.com/mitchellh/packer/packer"
"github.com/mitchellh/packer/post-processor/artifice"
"github.com/mitchellh/packer/template/interpolate"
)
@ -44,11 +44,11 @@ func (p *PostProcessor) Configure(raws ...interface{}) error {
func (p *PostProcessor) PostProcess(ui packer.Ui, artifact packer.Artifact) (packer.Artifact, bool, error) {
switch artifact.BuilderId() {
case docker.BuilderId, qemu.BuilderId:
case docker.BuilderId, artifice.BuilderId:
break
default:
err := fmt.Errorf(
"Unknown artifact type: %s\nCan only import from Docker, Qemu builder artifacts.",
"Unknown artifact type: %s\nCan only import from Docker builder and Artifice post-processor artifacts.",
artifact.BuilderId())
return nil, false, err
}