@@ -102,44 +102,42 @@ task packageJdkDebian {
102102 }
103103 }
104104
105- println " The Value Of ARCH is: $arch "
106-
107- if (" $arch " == " armhf" ) {
108- project. exec {
109- workingDir " src/main/packaging"
110- commandLine " docker" , " build" , " --no-cache" , " --pull" ,
111- " --build-arg" , " IMAGE=arm32v7/debian:bullseye" ,
112- " -t" , " adoptium-packages-linux-jdk-debian" ,
113- " --build-arg=CONTAINER_REGISTRY=${ containerRegistry} " ,
114- " -f" , " Dockerfile" ,
115- getProjectDir(). absolutePath + " /src/main/packaging"
105+ println " The Value Of ARCH is: $arch "
106+
107+ if (" $arch " == " armhf" ) {
108+ project. exec {
109+ workingDir " src/main/packaging"
110+ commandLine " docker" , " build" , " --no-cache" , " --pull" ,
111+ " --build-arg" , " IMAGE=arm32v7/debian:bullseye" ,
112+ " -t" , " adoptium-packages-linux-jdk-debian" ,
113+ " --build-arg=CONTAINER_REGISTRY=${ containerRegistry} " ,
114+ " -f" , " Dockerfile" ,
115+ getProjectDir(). absolutePath + " /src/main/packaging"
116+ }
116117 }
117- }
118118
119- if (" $arch " == " riscv64" ) {
120- project. exec {
121- workingDir " src/main/packaging"
122- commandLine " docker" , " build" , " --no-cache" , " --pull" ,
123- " --build-arg" , " IMAGE=riscv64/ubuntu:jammy" ,
124- " -t" , " adoptium-packages-linux-jdk-debian" ,
125- " --build-arg=CONTAINER_REGISTRY=${ containerRegistry} " ,
126- " -f" , " Dockerfile" ,
127- getProjectDir(). absolutePath + " /src/main/packaging"
119+ if (" $arch " == " riscv64" ) {
120+ project. exec {
121+ workingDir " src/main/packaging"
122+ commandLine " docker" , " build" , " --no-cache" , " --pull" ,
123+ " --build-arg" , " IMAGE=riscv64/ubuntu:jammy" ,
124+ " -t" , " adoptium-packages-linux-jdk-debian" ,
125+ " --build-arg=CONTAINER_REGISTRY=${ containerRegistry} " ,
126+ " -f" , " Dockerfile" ,
127+ getProjectDir(). absolutePath + " /src/main/packaging"
128128 }
129129 }
130130
131- if (" $arch " != " armhf" && " $arch " != " riscv64" ){
132- project. exec {
133- workingDir " src/main/packaging"
134- commandLine " docker" , " build" , " --no-cache" , " --pull" ,
135- " -t" , " adoptium-packages-linux-jdk-debian" ,
136- " --build-arg=CONTAINER_REGISTRY=${ containerRegistry} " ,
137- " -f" , " Dockerfile" ,
138- getProjectDir(). absolutePath + " /src/main/packaging"
139- }
140- }
141-
142-
131+ if (" $arch " != " armhf" && " $arch " != " riscv64" ){
132+ project. exec {
133+ workingDir " src/main/packaging"
134+ commandLine " docker" , " build" , " --no-cache" , " --pull" ,
135+ " -t" , " adoptium-packages-linux-jdk-debian" ,
136+ " --build-arg=CONTAINER_REGISTRY=${ containerRegistry} " ,
137+ " -f" , " Dockerfile" ,
138+ getProjectDir(). absolutePath + " /src/main/packaging"
139+ }
140+ }
143141
144142 project. exec {
145143 workingDir getRootDir()
0 commit comments