Skip to content

[8.17] Standardize on docker image arch classifier (#130643) #131756

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
merged 1 commit into from
Aug 1, 2025
+6 −4
Merged

[8.17] Standardize on docker image arch classifier (#130643) #131756

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 5 additions & 3 deletions build-tools/src/main/java/org/elasticsearch/gradle/Architecture.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion distribution/docker/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -565,7 +565,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)
}
Expand Down