Merge pull request GoogleContainerTools#217 from nkubala/tar_tag

nkubala · web-flow · commit 37c57987436e · 2018-04-05T10:50:38.000-07:00
Don't append latest tag to tar path
diff --git a/pkg/util/image_prep_utils.go b/pkg/util/image_prep_utils.go
@@ -115,7 +115,7 @@ type ConfigSchema struct {
 
 func getImage(p Prepper) (Image, error) {
 	// see if the image name has tag provided, if not add latest as tag
-	if !HasTag(p.GetSource()) {
+	if !IsTar(p.GetSource()) && !HasTag(p.GetSource()) {
 		p.SetSource(p.GetSource() + LatestTag)
 	}
 	output.PrintToStdErr("Retrieving image %s from source %s\n", p.GetSource(), p.Name())

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ type ConfigSchema struct {`
`115`	`115`
`116`	`116`	`func getImage(p Prepper) (Image, error) {`
`117`	`117`	`// see if the image name has tag provided, if not add latest as tag`
`118`		`- if !HasTag(p.GetSource()) {`
	`118`	`+ if !IsTar(p.GetSource()) && !HasTag(p.GetSource()) {`
`119`	`119`	`p.SetSource(p.GetSource() + LatestTag)`
`120`	`120`	`}`
`121`	`121`	`output.PrintToStdErr("Retrieving image %s from source %s\n", p.GetSource(), p.Name())`