Cleanup Ironbank only dockerfile

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/DockerBase.java

@@ -17,7 +17,7 @@ public enum DockerBase {
     DEFAULT("redhat/ubi9-minimal:latest", "", "microdnf", "dockerfiles/default/Dockerfile"),
 
     // The Iron Bank base image is UBI (albeit hardened), but we are required to parameterize the Docker build
-    IRON_BANK("${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}", "-ironbank", "yum", "Dockerfile"),
+    IRON_BANK("${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}", "-ironbank", "yum", "dockerfiles/iron_bank/Dockerfile"),
 
     // Chainguard based wolfi image with latest jdk
     WOLFI(
@@ -28,7 +28,7 @@ public enum DockerBase {
     ),
     // Based on WOLFI above, with more extras. We don't set a base image because
     // we programmatically extend from the wolfi image.
-    CLOUD_ESS(null, "-cloud-ess", "apk", "Dockerfile.ess"),
+    CLOUD_ESS(null, "-cloud-ess", "apk", "dockerfiles/cloud_ess/Dockerfile"),
 
     CLOUD_ESS_FIPS(
         null,
@@ -42,10 +42,6 @@ public enum DockerBase {
     private final String packageManager;
     private final String dockerfile;
 
-    DockerBase(String image, String suffix) {
-        this(image, suffix, "apt-get", "dockerfile");
-    }
-
     DockerBase(String image, String suffix, String packageManager, String dockerfile) {
         this.image = image;
         this.suffix = suffix;

distribution/docker/README.md

@@ -134,7 +134,7 @@ custom behaviour in the
 
 We go to some lengths to try and make the Docker build resilient to transient
 network errors. This is why, when browsing the
-[Dockerfile](src/docker/Dockerfile), you'll see many commands wrapped in looping
+[Dockerfile](src/docker/dockerfiles/cloud_ess/Dockerfile), you'll see many commands wrapped in looping
 logic, so that if e.g. package installation fails, we try again. We also perform
 explicit `docker pull` commands instead of relying on `docker run` to pull an
 image down automatically, so that we can wrap the `pull` part in a retry.

distribution/docker/build.gradle

@@ -363,7 +363,7 @@ void addBuildDockerContextTask(Architecture architecture, DockerBase base, Strin
 
 void addTransformDockerContextTask(Architecture architecture, DockerBase base) {
   def transformTask = tasks.register(taskName("transform", architecture, base, "DockerContext"), Sync) {
-    TaskProvider<Tar> buildContextTask = tasks.named(taskName("build", architecture, base, "DockerContext"))
+      TaskProvider<Tar> buildContextTask = tasks.named(taskName("build", architecture, base, "DockerContext"))
     dependsOn(buildContextTask)
 
     String arch = architecture == Architecture.AARCH64 ? '-aarch64' : ''
@@ -532,7 +532,7 @@ void addBuildCloudDockerImageTasks(Architecture architecture) {
       rename ~/((?:file|metric)beat)-.*\.tar\.gz$/, "\$1-${VersionProperties.elasticsearch}.tar.gz"
 
       String baseSuffix = DockerBase.WOLFI.suffix
-      from(projectDir.resolve("src/docker/Dockerfile.ess")) {
+      from(projectDir.resolve("src/docker/${dockerBase.dockerfile}")) {
         expand(
           [
             base_image : "elasticsearch${baseSuffix}:${architecture.classifier}",
@@ -542,7 +542,6 @@ void addBuildCloudDockerImageTasks(Architecture architecture) {
           ]
         )
         filter SquashNewlinesFilter
-        rename ~/Dockerfile\.ess$/, 'Dockerfile'
       }
     }