iSharkFly-Docs/Packer-Cn
2
0
Fork 0
mirror of https://github.com/hashicorp/packer.git synced 2026-09-19 06:21:41 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix a problem preventing tag or save from docker-tag artifacts

Browse Source
This commit is contained in:
James G. Kim
2015-06-05 22:01:29 +09:00
parent 793698f8a7
commit 5bd2d4e6e0
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
post-processor/docker-save/post-processor.go
+3 -1
View File
@@ -9,6 +9,7 @@ import (
"github.com/mitchellh/packer/helper/config"
"github.com/mitchellh/packer/packer"
"github.com/mitchellh/packer/post-processor/docker-import"
"github.com/mitchellh/packer/post-processor/docker-tag"
"github.com/mitchellh/packer/template/interpolate"
)
@@ -44,7 +45,8 @@ func (p *PostProcessor) Configure(raws ...interface{}) error {
}
func (p *PostProcessor) PostProcess(ui packer.Ui, artifact packer.Artifact) (packer.Artifact, bool, error) {
if artifact.BuilderId() != dockerimport.BuilderId {
if artifact.BuilderId() != dockerimport.BuilderId &&
artifact.BuilderId() != dockertag.BuilderId {
err := fmt.Errorf(
"Unknown artifact type: %s\nCan only save Docker builder artifacts.",
artifact.BuilderId())
post-processor/docker-tag/post-processor.go
+2 -1
View File
@@ -45,7 +45,8 @@ func (p *PostProcessor) Configure(raws ...interface{}) error {
}
func (p *PostProcessor) PostProcess(ui packer.Ui, artifact packer.Artifact) (packer.Artifact, bool, error) {
if artifact.BuilderId() != dockerimport.BuilderId {
if artifact.BuilderId() != BuilderId &&
artifact.BuilderId() != dockerimport.BuilderId {
err := fmt.Errorf(
"Unknown artifact type: %s\nCan only tag from Docker builder artifacts.",
artifact.BuilderId())