Cleanup intermediate images #1716
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
niloc132
previously approved these changes
Dec 17, 2021
| static TaskProvider<? extends DockerBuildImage> registerDockerTwoPhaseImage(Project project, String baseName, String intermediate, Action<? super DockerBuildImage> action) { | ||
| // Explicitly target and tag the intermediate task; otherwise, docker will leave it unnamed, and we won't be | ||
| // able to clean it up. | ||
| def intermediateTask = registerDockerImage(project, "buildDocker-${baseName}-${intermediate}") { DockerBuildImage buildImage -> |
There was a problem hiding this comment.
unless you have a strong objection, don't mix camel and dash word joining? we're inconsistent in other places, but it does make telling another def what something is irritating (without having to spell it out word by word, qualifying how to join each).
There was a problem hiding this comment.
I see buildDocker as an "identifier" right now; and I don't want to go to build-docker-{x}-{y} to break that pattern. I have similar reservations about trying to go full camel-case (uppercasing the user inputs). But I agree we are inconsistent...
niloc132
approved these changes
Dec 17, 2021
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
For our "two-phase" images (to compress the copy layer logic into a single layer), docker leaves behind unnamed images that we are unable to cleanup. For example, see the
<none>from a clean build:This patch adds generic logic to better handle two-phase images by ensuring we specifically target the intermediate layer and apply a name to it, so we can successfully clean it up later if necessary. This patch also removes two-phase building logic from places where it's not necessary (images that aren't necessary to publish).
After this patch, a clean build looks something like: