make JAVA_HOME and PATH point to the same JDK in default docker images

Author: stoty

dev-support/docker/Dockerfile

@@ -51,6 +51,7 @@ RUN apt-get -q update \
     && apt-get -q update \
     && apt-get -q install -y --no-install-recommends $(pkg-resolver/resolve.py ubuntu:focal) \
     && apt-get clean \
+    && update-java-alternatives -s java-1.8.0-openjdk-amd64 \
     && rm -rf /var/lib/apt/lists/*
 
 RUN locale-gen en_US.UTF-8

dev-support/docker/Dockerfile_aarch64

@@ -51,6 +51,7 @@ RUN apt-get -q update \
     && apt-get -q update \
     && apt-get -q install -y --no-install-recommends $(pkg-resolver/resolve.py ubuntu:focal::arch64) \
     && apt-get clean \
+    && update-java-alternatives -s java-1.8.0-openjdk-arm64 \
     && rm -rf /var/lib/apt/lists/*
 
 RUN locale-gen en_US.UTF-8

dev-support/docker/pkg-resolver/packages.json

@@ -266,7 +266,7 @@
       "openjdk-17-jdk"
     ],
     "ubuntu:focal::arch64": [
-     "temurin-23-jdk",
+      "temurin-23-jdk",
       "openjdk-8-jdk",
       "openjdk-11-jdk",
       "openjdk-17-jdk"