From b6238ec7f06efa035ed87f13cae2ee42f69f9552 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Tue, 14 Oct 2014 16:04:37 -0700 Subject: [PATCH] Update CHANGELOG --- CHANGELOG.md | 1 + post-processor/docker-push/post-processor.go | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3d2b8b817..413d31229 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ BUG FIXES: * providers/aws: Ignore transient network errors. [GH-1579] * provisioner/ansible: Don't buffer output so output streams in. [GH-1585] * provisioner/shell: Quote environmental variables. [GH-1568] + * post-processors/docker-push: Work with docker-tag artifacts. [GH-1526] ## 0.7.1 (September 10, 2014) diff --git a/post-processor/docker-push/post-processor.go b/post-processor/docker-push/post-processor.go index 5121a60c9..25b41afee 100644 --- a/post-processor/docker-push/post-processor.go +++ b/post-processor/docker-push/post-processor.go @@ -6,7 +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" + "github.com/mitchellh/packer/post-processor/docker-tag" "strings" ) @@ -68,7 +68,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 && artifact.BuilderId() != dockertag.BuilderId { + if artifact.BuilderId() != dockerimport.BuilderId && + artifact.BuilderId() != dockertag.BuilderId { err := fmt.Errorf( "Unknown artifact type: %s\nCan only import from docker-import and docker-tag artifacts.", artifact.BuilderId())