Skip to content

[8.19] Fix Docker build to use --load for single-platform images (#140402) #140439

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
breskeby merged 2 commits into from
Jan 13, 2026
Merged

[8.19] Fix Docker build to use --load for single-platform images (#140402) #140439

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
25754df
Fix Docker build to use --load for single-platform images (#140402)
breskeby Jan 9, 2026
cfefb01
Merge branch '8.19' into backport/8.19/pr-140402
breskeby Jan 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions ...ools-internal/src/main/java/org/elasticsearch/gradle/internal/docker/DockerBuildTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,12 @@ public void execute() {

if (parameters.getPush().getOrElse(false)) {
spec.args("--push");
} else if (!isCrossPlatform) {
// For single-platform builds, add --load to ensure the image is loaded into
// the local Docker daemon as a regular image, not a manifest list.
// This prevents issues with newer Docker versions (23.0+) that may create
// manifest lists even for single-platform builds when BuildKit is enabled.
spec.args("--load");
}
});

Expand Down