From 1ba63348e23b27851c4636f89f0dbdb8fa048498 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mariusz=20J=C3=B3zala?= <377355+jozala@users.noreply.github.com> Date: Fri, 1 Aug 2025 23:45:47 +0200 Subject: [PATCH] Revert "Standardize on docker image arch classifier (#130643) (#131753)" This reverts commit 6a8057afb894163a49f5d6d27d99df71cf8d10fb. --- .../main/java/org/elasticsearch/gradle/Architecture.java | 8 +++----- distribution/docker/build.gradle | 2 +- 2 files changed, 4 insertions(+), 6 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 ae47f934b0dc3..c7e6546e66b9a 100644 --- a/build-tools/src/main/java/org/elasticsearch/gradle/Architecture.java +++ b/build-tools/src/main/java/org/elasticsearch/gradle/Architecture.java @@ -11,17 +11,15 @@ public enum Architecture { - X64("x86_64", "linux/amd64", "amd64"), - AARCH64("aarch64", "linux/arm64", "arm64"); + X64("x86_64", "linux/amd64"), + AARCH64("aarch64", "linux/arm64"); public final String classifier; public final String dockerPlatform; - public final String dockerClassifier; - Architecture(String classifier, String dockerPlatform, String dockerClassifier) { + Architecture(String classifier, String dockerPlatform) { 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 90e0a9383f753..e3f87117ea029 100644 --- a/distribution/docker/build.gradle +++ b/distribution/docker/build.gradle @@ -659,7 +659,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.dockerClassifier) + it.getArchiveClassifier().set(architecture == Architecture.AARCH64 ? 'aarch64' : '') it.getDestinationDirectory().set(new File(project.parent.buildDir, 'distributions')) it.dependsOn(exportTask) }