Minor fixes (#115)

Author: brunoborges

docker/test-only/distroless/Dockerfile.testapp

@@ -1,9 +1,9 @@
 ARG IMGTOTEST=mcr.microsoft.com/openjdk/jdk:8-mariner
 
-FROM mcr.microsoft.com/openjdk/jdk:8-mariner as builder
+FROM mcr.microsoft.com/openjdk/jdk:8-mariner AS builder
 ADD SampleApp.java /SampleApp.java
 RUN javac -source 1.8 -target 1.8 SampleApp.java && jar cfe /app.jar SampleApp SampleApp.class
 
-FROM ${IMGTOTEST} as runner
+FROM ${IMGTOTEST} 
 COPY --from=builder /app.jar /app.jar
 CMD ["-jar", "/app.jar"]

docker/test-only/distroless/Dockerfile.testappnonroot

@@ -1,10 +1,10 @@
 ARG IMGTOTEST=mcr.microsoft.com/openjdk/jdk:8-mariner
 
-FROM mcr.microsoft.com/openjdk/jdk:8-mariner as builder
+FROM mcr.microsoft.com/openjdk/jdk:8-mariner AS builder
 ADD NonRootUser.java /NonRootUser.java
 RUN javac -source 1.8 -target 1.8 NonRootUser.java && jar cfe /app.jar NonRootUser NonRootUser.class
 
-FROM ${IMGTOTEST} as runner
+FROM ${IMGTOTEST} 
 USER app
 COPY --from=builder /app.jar /app.jar
 CMD ["-ea", "-jar", "/app.jar"]

docker/test-only/regular/Dockerfile.testapp

@@ -1,9 +1,9 @@
 ARG IMGTOTEST=mcr.microsoft.com/openjdk/jdk:8-mariner
 
-FROM mcr.microsoft.com/openjdk/jdk:8-mariner as builder
+FROM mcr.microsoft.com/openjdk/jdk:8-mariner AS builder
 ADD SampleApp.java /SampleApp.java
 RUN javac -source 1.8 -target 1.8 SampleApp.java && jar cfe /app.jar SampleApp SampleApp.class
 
-FROM ${IMGTOTEST} as runner
+FROM ${IMGTOTEST}
 COPY --from=builder /app.jar /app.jar
 CMD ["java", "-jar", "/app.jar"]

docker/test-only/regular/Dockerfile.testappnonroot

@@ -1,10 +1,10 @@
 ARG IMGTOTEST=mcr.microsoft.com/openjdk/jdk:8-mariner
 
-FROM mcr.microsoft.com/openjdk/jdk:8-mariner as builder
+FROM mcr.microsoft.com/openjdk/jdk:8-mariner AS builder
 ADD NonRootUser.java /NonRootUser.java
 RUN javac -source 1.8 -target 1.8 NonRootUser.java && jar cfe /app.jar NonRootUser NonRootUser.class
 
-FROM ${IMGTOTEST} as runner
+FROM ${IMGTOTEST}
 USER app
 COPY --from=builder /app.jar /app.jar
 CMD ["java", "-ea", "-jar", "/app.jar"]

scripts/build-all-images.sh

@@ -7,7 +7,7 @@ declare -a jdkversions=( ["11"]="11.0.20.1" ["17"]="17.0.8.1" ["21"]="21" ["8"]=
 basemcr="mcr.microsoft.com/openjdk/jdk"
 
 # Get current directory
-basepath="$(dirname "$0")/docker"
+basepath=$(dirname "$(dirname "$0")")/docker/
 
 # Build all distros and versions of OpenJDK
 for d in $(ls -d $basepath/*); do