From 34b2f1c122b88efa257d0359e9ae07636f18929d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mariusz=20J=C3=B3zala?= <377355+jozala@users.noreply.github.com> Date: Tue, 29 Jul 2025 17:12:48 +0200 Subject: [PATCH] =?UTF-8?q?Revert=20"Revert=20"Standardize=20on=20docker?= =?UTF-8?q?=20image=20arch=20classifier=20(#130643)=20(#13175=E2=80=A6"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 286865a32175610f91a5bae2bafaf93db41c3778. --- .../main/java/org/elasticsearch/gradle/Architecture.java | 8 +++++--- distribution/docker/build.gradle | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/build-tools/src/main/java/org/elasticsearch/gradle/Architecture.java b/build-tools/src/main/java/org/elasticsearch/gradle/Architecture.java index c7e6546e66b9a..ae47f934b0dc3 100644 --- a/build-tools/src/main/java/org/elasticsearch/gradle/Architecture.java +++ b/build-tools/src/main/java/org/elasticsearch/gradle/Architecture.java @@ -11,15 +11,17 @@ public enum Architecture { - X64("x86_64", "linux/amd64"), - AARCH64("aarch64", "linux/arm64"); + X64("x86_64", "linux/amd64", "amd64"), + AARCH64("aarch64", "linux/arm64", "arm64"); public final String classifier; public final String dockerPlatform; + public final String dockerClassifier; - Architecture(String classifier, String dockerPlatform) { + Architecture(String classifier, String dockerPlatform, String dockerClassifier) { this.classifier = classifier; this.dockerPlatform = dockerPlatform; + this.dockerClassifier = dockerClassifier; } public static Architecture current() { diff --git a/distribution/docker/build.gradle b/distribution/docker/build.gradle index 120015b9480a5..f60555ff7c96c 100644 --- a/distribution/docker/build.gradle +++ b/distribution/docker/build.gradle @@ -643,7 +643,7 @@ subprojects { Project subProject -> it.setCompression(Compression.GZIP) it.getArchiveBaseName().set("elasticsearch${base.suffix}-${VersionProperties.elasticsearch}-docker-image") it.getArchiveVersion().set("") - it.getArchiveClassifier().set(architecture == Architecture.AARCH64 ? 'aarch64' : '') + it.getArchiveClassifier().set(architecture.dockerClassifier) it.getDestinationDirectory().set(new File(project.parent.buildDir, 'distributions')) it.dependsOn(exportTask) }