Similar to #25590 and #25736, there are a few more conditions where exceptions can be thrown while the contents of an archive are being uploaded to the builder container. This results in the build-image goal hanging indefinitely when attempting to delete the partially built container.
