Improve buildkit-isms ignoring during build/history check

tianon · tianon · commit 4b8ed1e72b3e · 2023-02-21T15:20:36.000-08:00
diff --git a/.github/workflows/history.sh b/.github/workflows/history.sh
@@ -19,7 +19,7 @@ docker image history --no-trunc --format '{{ .CreatedBy }}' "$@" \
 			sub(/^\/bin\/sh[[:space:]]+-c[[:space:]]+/, "")
 			sub(/[[:space:]]*# buildkit$/, "")
 		}
-		$1 == "EXPOSE" { gsub(/map\[|\/tcp:\{\}\]/, "") }
+		$1 == "EXPOSE" { gsub(/map\[|\/tcp:\{\}|\]/, "") }
 		# buildkit makes COPY expressions hyper-simplified ("COPY --chown=1000:0 --from=foo /foo /bar" becomes just "COPY /foo /bar" vs "COPY --chown=1000:0 dir:xxxx in /bar")
 		$1 == "COPY" { $0 = gensub(/^[[:space:]]*(COPY)[[:space:]]+([^[:space:]]+[[:space:]]+)+([^[:space:]]+)[[:space:]]*$/, "\\1 ... \\3", 1) }
 

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ docker image history --no-trunc --format '{{ .CreatedBy }}' "$@" \`
`19`	`19`	`sub(/^\/bin\/sh[[:space:]]+-c[[:space:]]+/, "")`
`20`	`20`	`sub(/[[:space:]]*# buildkit$/, "")`
`21`	`21`	`}`
`22`		`- $1 == "EXPOSE" { gsub(/map\[\|\/tcp:\{\}\]/, "") }`
	`22`	`+ $1 == "EXPOSE" { gsub(/map\[\|\/tcp:\{\}\|\]/, "") }`
`23`	`23`	`# buildkit makes COPY expressions hyper-simplified ("COPY --chown=1000:0 --from=foo /foo /bar" becomes just "COPY /foo /bar" vs "COPY --chown=1000:0 dir:xxxx in /bar")`
`24`	`24`	`$1 == "COPY" { $0 = gensub(/^[[:space:]](COPY)[[:space:]]+([^[:space:]]+[[:space:]]+)+([^[:space:]]+)[[:space:]]$/, "\\1 ... \\3", 1) }`
`25`	`25`