Use already pre-installed Java 21 on Ubuntu

Author: NikolaSimsic

.github/scripts/mxbuild.Dockerfile

@@ -2,15 +2,9 @@ FROM mcr.microsoft.com/dotnet/runtime:8.0
 ARG MENDIX_VERSION
 
 RUN \
-    echo "Installing Java 21..." && \
+    echo "Installing required packages..." && \
     apt-get -qq update && \
-    apt-get -qq install -y wget libgdiplus && \
-    wget -q https://download.oracle.com/java/21/latest/jdk-21_linux-x64_bin.tar.gz -O /tmp/openjdk.tar.gz || { echo "Failed to download Java 21"; exit 1; } && \
-    mkdir -p /usr/lib/jvm && \
-    tar xfz /tmp/openjdk.tar.gz --directory /usr/lib/jvm || { echo "Failed to extract Java 21"; exit 1; } && \
-    ls /usr/lib/jvm && \
-    mv /usr/lib/jvm/jdk-21* /usr/lib/jvm/java-21-openjdk && \
-    rm /tmp/openjdk.tar.gz
+    apt-get -qq install -y wget libgdiplus openjdk-21-jdk
 
 RUN \
     echo "Downloading mxbuild ${MENDIX_VERSION}..." && \
@@ -33,4 +27,5 @@ RUN \
     echo "dotnet /tmp/mxbuild/modeler/mx.dll \$@" >>/bin/mx && \
     chmod +x /bin/mx
 
-ENV M2EE_TOOLS_JAR=/tmp/mxbuild/modeler/tools/m2ee-tools.jar
+ENV M2EE_TOOLS_JAR=/tmp/mxbuild/modeler/tools/m2ee-tools.jar
+ENV JAVA_HOME=/usr/lib/jvm/java-21-openjdk

maestro/helpers/compare_screenshots.js

@@ -1,5 +1,5 @@
-/* eslint-disable @typescript-eslint/explicit-function-return-type */
 /* eslint-disable @typescript-eslint/no-var-requires */
+/* eslint-disable @typescript-eslint/explicit-function-return-type */
 /* eslint-disable prettier/prettier */
 const fs = require('fs');
 const path = require('path');