Merge pull request #98 from infosiftr/buildkit-history

Update history munging to account for buildkit-isms in published 7 & 8 images

Author: yosifkit

.github/workflows/history.sh

@@ -13,12 +13,19 @@ docker image history --no-trunc --format '{{ .CreatedBy }}' "$@" \
 		# just ignore the default CentOS CMD value (not relevant to our needs)
 		$0 == "CMD [\"/bin/bash\"]" { next }
 
-		# ignore the contents of certain copies (notoriously unreliable hashes because they often contain timestamps)
-		$1 == "COPY" && $4 == "/usr/share/kibana/config/kibana.yml" { gsub(/:[0-9a-f]{64}$/, ":filtered-content-hash", $2) }
-
 		# remove "org.label-schema.build-date" and "org.opencontainers.image.created" (https://github.com/elastic/dockerfiles/pull/101#pullrequestreview-879623350)
 		$1 == "LABEL" { gsub(/ (org[.]label-schema[.]build-date|org[.]opencontainers[.]image[.]created)=[^ ]+( [0-9:+-]+)?/, "") }
 
+		# remove several buildkit-isms
+		/# buildkit$/ {
+			sub(/^RUN[[:space:]]+/, "")
+			sub(/^\/bin\/sh[[:space:]]+-c[[:space:]]+/, "")
+			sub(/[[:space:]]*# buildkit$/, "")
+		}
+		$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) }
+
 		# sane and sanitized, print it!
 		{ print }
 	'