From 173237ba45a6cda9d429e51380624b773b9580aa Mon Sep 17 00:00:00 2001 From: Ask Holme <ask@askholme.dk> Date: Wed, 24 Sep 2014 22:22:39 +0200 Subject: [PATCH] make docker-push work with docker-tag artifacts --- post-processor/docker-push/post-processor.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/post-processor/docker-push/post-processor.go b/post-processor/docker-push/post-processor.go index dab7ba83..5121a60c 100644 --- a/post-processor/docker-push/post-processor.go +++ b/post-processor/docker-push/post-processor.go @@ -6,6 +6,7 @@ import ( "github.com/mitchellh/packer/common" "github.com/mitchellh/packer/packer" "github.com/mitchellh/packer/post-processor/docker-import" + "github.com/mitchellh/packer/post-processor/docker-tag" "strings" ) @@ -67,9 +68,9 @@ 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 import from docker-import artifacts.", + "Unknown artifact type: %s\nCan only import from docker-import and docker-tag artifacts.", artifact.BuilderId()) return nil, false, err } -- 2.30.9