Commit b6238ec7 authored by Mitchell Hashimoto's avatar Mitchell Hashimoto

Update CHANGELOG

parent 333506f5
...@@ -14,6 +14,7 @@ BUG FIXES: ...@@ -14,6 +14,7 @@ BUG FIXES:
* providers/aws: Ignore transient network errors. [GH-1579] * providers/aws: Ignore transient network errors. [GH-1579]
* provisioner/ansible: Don't buffer output so output streams in. [GH-1585] * provisioner/ansible: Don't buffer output so output streams in. [GH-1585]
* provisioner/shell: Quote environmental variables. [GH-1568] * provisioner/shell: Quote environmental variables. [GH-1568]
* post-processors/docker-push: Work with docker-tag artifacts. [GH-1526]
## 0.7.1 (September 10, 2014) ## 0.7.1 (September 10, 2014)
......
...@@ -6,7 +6,7 @@ import ( ...@@ -6,7 +6,7 @@ import (
"github.com/mitchellh/packer/common" "github.com/mitchellh/packer/common"
"github.com/mitchellh/packer/packer" "github.com/mitchellh/packer/packer"
"github.com/mitchellh/packer/post-processor/docker-import" "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" "strings"
) )
...@@ -68,7 +68,8 @@ func (p *PostProcessor) Configure(raws ...interface{}) error { ...@@ -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) { 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( err := fmt.Errorf(
"Unknown artifact type: %s\nCan only import from docker-import and docker-tag artifacts.", "Unknown artifact type: %s\nCan only import from docker-import and docker-tag artifacts.",
artifact.BuilderId()) artifact.BuilderId())
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment