Fix JDK vs JRE on Nano Server variants

Author: tianon

11/jdk/windows/nanoserver-1809/Dockerfile

@@ -23,7 +23,7 @@ ENV JAVA_VERSION 11.0.7
 # > While it is true that the OpenJDK Governing Board has not sanctioned those releases, they (or rather we, since I am a member) didn't sanction Oracle's OpenJDK releases either. As far as I am aware, the lead of an OpenJDK project is entitled to release binary builds, and there is clearly a need for them.
 # >
 
-COPY --from=openjdk:11.0.7-windowsservercore-1809 $JAVA_HOME $JAVA_HOME
+COPY --from=openjdk:11.0.7-jdk-windowsservercore-1809 $JAVA_HOME $JAVA_HOME
 
 RUN echo Verifying install ... \
 	&& echo   javac --version && javac --version \

11/jre/windows/nanoserver-1809/Dockerfile

@@ -23,7 +23,7 @@ ENV JAVA_VERSION 11.0.7
 # > While it is true that the OpenJDK Governing Board has not sanctioned those releases, they (or rather we, since I am a member) didn't sanction Oracle's OpenJDK releases either. As far as I am aware, the lead of an OpenJDK project is entitled to release binary builds, and there is clearly a need for them.
 # >
 
-COPY --from=openjdk:11.0.7-windowsservercore-1809 $JAVA_HOME $JAVA_HOME
+COPY --from=openjdk:11.0.7-jre-windowsservercore-1809 $JAVA_HOME $JAVA_HOME
 
 RUN echo Verifying install ... \
 	&& echo   java --version && java --version

8/jdk/windows/nanoserver-1809/Dockerfile

@@ -23,7 +23,7 @@ ENV JAVA_VERSION 8u252
 # > While it is true that the OpenJDK Governing Board has not sanctioned those releases, they (or rather we, since I am a member) didn't sanction Oracle's OpenJDK releases either. As far as I am aware, the lead of an OpenJDK project is entitled to release binary builds, and there is clearly a need for them.
 # >
 
-COPY --from=openjdk:8u252-windowsservercore-1809 $JAVA_HOME $JAVA_HOME
+COPY --from=openjdk:8u252-jdk-windowsservercore-1809 $JAVA_HOME $JAVA_HOME
 
 RUN echo Verifying install ... \
 	&& echo   javac -version && javac -version \

8/jre/windows/nanoserver-1809/Dockerfile

@@ -23,7 +23,7 @@ ENV JAVA_VERSION 8u252
 # > While it is true that the OpenJDK Governing Board has not sanctioned those releases, they (or rather we, since I am a member) didn't sanction Oracle's OpenJDK releases either. As far as I am aware, the lead of an OpenJDK project is entitled to release binary builds, and there is clearly a need for them.
 # >
 
-COPY --from=openjdk:8u252-windowsservercore-1809 $JAVA_HOME $JAVA_HOME
+COPY --from=openjdk:8u252-jre-windowsservercore-1809 $JAVA_HOME $JAVA_HOME
 
 RUN echo Verifying install ... \
 	&& echo   java -version && java -version

update.sh

@@ -173,7 +173,7 @@ for javaVersion in "${versions[@]}"; do
 						windowsVariant="${windowsVersion%%-*}" # "windowsservercore", "nanoserver"
 						windowsVersion="${windowsVersion#$windowsVariant-}" # "1803", "ltsc2016", etc
 						windowsVariant="${windowsVariant#windows}" # "servercore", "nanoserver"
-						serverCoreImage="openjdk:$adoptVersion-windowsservercore-$windowsVersion" # "openjdk:8u212-b04-windowsservercore-1809", etc
+						serverCoreImage="openjdk:$adoptVersion-$javaType-windowsservercore-$windowsVersion" # "openjdk:8u212-b04-jre-windowsservercore-1809", etc
 						sed -r "${sedArgs[@]}" \
 							-e 's!^(ENV JAVA_HOME) .*!\1 C:\\\\openjdk-'"$javaVersion"'!' \
 							-e 's!^(FROM) .*$!\1 mcr.microsoft.com/windows/'"$windowsVariant"':'"$windowsVersion"'!' \