Repository navigation
Rebuild the evmtool Docker image from the current distribution - #11965
Merged
Merged
Conversation
dockerDistUntar renamed the unpacked distribution to besu-evmtool with File.renameTo, which fails without error when besu-evmtool already exists. Every local distDocker after the first one then built the image from the first distribution unpacked in that build directory. Clear the directory before unpacking, and fail the build if the rename fails. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com>
macfarla
marked this pull request as ready for review
November 18, 2026 04:28
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com>
macfarla
enabled auto-merge (squash)
November 19, 2026 08:26
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
PR description
A local
./gradlew :ethereum:evmtool:distDockerbuilds the image from the first evmtool distribution ever unpacked in the build directory, not from the current code, as long asethereum/evmtool/build/docker-besu-evmtool/is still there from an earlier build.dockerDistUntarunpacks the distribution todocker-besu-evmtool/evmtool-<version>/and renames it tobesu-evmtool/, which the Dockerfile copies into the image.File.renameToreturnsfalserather than throwing when the target directory already exists, and the result was ignored. So after the first build, the rename silently failed, the Dockerfile copied the oldbesu-evmtool/, and the image was tagged with the current version. A versioned folder was also left behind on every build.Found while testing #11964: a checkout last cleaned in June produced an image tagged
26.11-develop-4d41b4dthat containedbesu-ethereum-evmtool-26.6-develop-41fe887.jar, next to about 60 leftoverevmtool-*folders.The root
dockerDistUntarfor the Besu image deletesbuild/docker-besu/besubefore renaming, so it doesn't have this problem. This change:CI builds from a clean checkout, so the published
hyperledger/besu-evmtoolimages are not affected. This only matters for local builds, so there is no changelog entry.Testing
besu-evmtool/lib/STALE-MARKER.jarand a leftoverevmtool-old-leftover/in the staging directory, then ran./gradlew :ethereum:evmtool:distDocker: both were removed, the image containsbesu-ethereum-evmtool-26.11-develop-1f2052c.jaronly, and--versionreports26.11-develop-1f2052c.distDockeragain over the existing staging directory: it succeeds, and the image runs bytecode.🤖 Generated with Claude Code