Merge pull request #4113 from justinsb/better_image_filtering

kptdev-robot[bot] · web-flow · commit 0e2909531247 · 2024-04-26T03:43:15.000Z
docker execution: trim "image up to date" lines
diff --git a/internal/fnruntime/container.go b/internal/fnruntime/container.go
@@ -286,6 +286,7 @@ func isdockerCLIoutput(s string) bool {
 		strings.Contains(s, ": Pull complete") ||
 		strings.Contains(s, "Digest: sha256") ||
 		strings.Contains(s, "Status: Downloaded newer image") ||
+		strings.Contains(s, "Status: Image is up to date for") ||
 		strings.Contains(s, "Unable to find image") {
 		return true
 	}

Original file line number	Diff line number	Diff line change
`@@ -286,6 +286,7 @@ func isdockerCLIoutput(s string) bool {`
`286`	`286`	`strings.Contains(s, ": Pull complete") \|\|`
`287`	`287`	`strings.Contains(s, "Digest: sha256") \|\|`
`288`	`288`	`strings.Contains(s, "Status: Downloaded newer image") \|\|`
	`289`	`+ strings.Contains(s, "Status: Image is up to date for") \|\|`
`289`	`290`	`strings.Contains(s, "Unable to find image") {`
`290`	`291`	`return true`
`291`	`292`	`}`