@@ -363,7 +363,7 @@ void addBuildDockerContextTask(Architecture architecture, DockerBase base, Strin
363363
364364void addTransformDockerContextTask (Architecture architecture , DockerBase base ) {
365365 def transformTask = tasks. register(taskName(" transform" , architecture, base, " DockerContext" ), Sync ) {
366- TaskProvider<Tar > buildContextTask = tasks. named(taskName(" build" , architecture, base, " DockerContext" ))
366+ TaskProvider<Tar > buildContextTask = tasks. named(taskName(" build" , architecture, base, " DockerContext" ))
367367 dependsOn(buildContextTask)
368368
369369 String arch = architecture == Architecture . AARCH64 ? ' -aarch64' : ' '
@@ -532,7 +532,7 @@ void addBuildCloudDockerImageTasks(Architecture architecture) {
532532 rename ~/ ((?:file|metric)beat)-.*\. tar\. gz$/ , " \$ 1-${ VersionProperties.elasticsearch} .tar.gz"
533533
534534 String baseSuffix = DockerBase . WOLFI . suffix
535- from(projectDir. resolve(" src/docker/Dockerfile " )) {
535+ from(projectDir. resolve(" src/docker/${ dockerBase.dockerfile } " )) {
536536 expand(
537537 [
538538 base_image : " elasticsearch${ baseSuffix} :${ architecture.classifier} " ,
@@ -542,7 +542,6 @@ void addBuildCloudDockerImageTasks(Architecture architecture) {
542542 ]
543543 )
544544 filter SquashNewlinesFilter
545- rename ~/ Dockerfile\. ess$/ , ' Dockerfile'
546545 }
547546 }
548547
0 commit comments