diff --git a/linux/jdk/debian/build.gradle b/linux/jdk/debian/build.gradle index b8ec3aabb..91b7ad7d5 100644 --- a/linux/jdk/debian/build.gradle +++ b/linux/jdk/debian/build.gradle @@ -102,44 +102,42 @@ task packageJdkDebian { } } -println "The Value Of ARCH is: $arch" - -if ("$arch" == "armhf") { - project.exec { - workingDir "src/main/packaging" - commandLine "docker", "build", "--no-cache", "--pull", - "--build-arg", "IMAGE=arm32v7/debian:bullseye", - "-t", "adoptium-packages-linux-jdk-debian", - "--build-arg=CONTAINER_REGISTRY=${containerRegistry}", - "-f", "Dockerfile", - getProjectDir().absolutePath + "/src/main/packaging" + println "The Value Of ARCH is: $arch" + + if ("$arch" == "armhf") { + project.exec { + workingDir "src/main/packaging" + commandLine "docker", "build", "--no-cache", "--pull", + "--build-arg", "IMAGE=arm32v7/debian:bullseye", + "-t", "adoptium-packages-linux-jdk-debian", + "--build-arg=CONTAINER_REGISTRY=${containerRegistry}", + "-f", "Dockerfile", + getProjectDir().absolutePath + "/src/main/packaging" + } } - } -if ("$arch" == "riscv64") { - project.exec { - workingDir "src/main/packaging" - commandLine "docker", "build", "--no-cache", "--pull", - "--build-arg", "IMAGE=riscv64/ubuntu:jammy", - "-t", "adoptium-packages-linux-jdk-debian", - "--build-arg=CONTAINER_REGISTRY=${containerRegistry}", - "-f", "Dockerfile", - getProjectDir().absolutePath + "/src/main/packaging" + if ("$arch" == "riscv64") { + project.exec { + workingDir "src/main/packaging" + commandLine "docker", "build", "--no-cache", "--pull", + "--build-arg", "IMAGE=riscv64/ubuntu:jammy", + "-t", "adoptium-packages-linux-jdk-debian", + "--build-arg=CONTAINER_REGISTRY=${containerRegistry}", + "-f", "Dockerfile", + getProjectDir().absolutePath + "/src/main/packaging" } } -if ("$arch" != "armhf" && "$arch" != "riscv64"){ - project.exec { - workingDir "src/main/packaging" - commandLine "docker", "build", "--no-cache", "--pull", - "-t", "adoptium-packages-linux-jdk-debian", - "--build-arg=CONTAINER_REGISTRY=${containerRegistry}", - "-f", "Dockerfile", - getProjectDir().absolutePath + "/src/main/packaging" - } - } - - + if ("$arch" != "armhf" && "$arch" != "riscv64"){ + project.exec { + workingDir "src/main/packaging" + commandLine "docker", "build", "--no-cache", "--pull", + "-t", "adoptium-packages-linux-jdk-debian", + "--build-arg=CONTAINER_REGISTRY=${containerRegistry}", + "-f", "Dockerfile", + getProjectDir().absolutePath + "/src/main/packaging" + } + } project.exec { workingDir getRootDir()