Skip to content

Commit 9263068

Browse files
committed
fix: java version
1 parent dffc89c commit 9263068

1 file changed

Lines changed: 9 additions & 5 deletions

File tree

scripts/automation/mxbuild.Dockerfile

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,14 @@ FROM mcr.microsoft.com/dotnet/runtime:8.0
22
ARG MENDIX_VERSION
33

44
RUN \
5-
echo "Installing Java..." && \
5+
echo "Installing Java 21..." && \
66
apt-get -qq update && \
77
apt-get -qq install -y wget libgdiplus && \
8-
wget -q https://download.java.net/java/GA/jdk11/9/GPL/openjdk-11.0.2_linux-x64_bin.tar.gz -O /tmp/openjdk.tar.gz && \
9-
mkdir /usr/lib/jvm && \
8+
wget -q https://download.oracle.com/java/21/latest/jdk-21_linux-x64_bin.tar.gz -O /tmp/openjdk.tar.gz && \
9+
mkdir -p /usr/lib/jvm && \
1010
tar xfz /tmp/openjdk.tar.gz --directory /usr/lib/jvm && \
11+
ls /usr/lib/jvm && \
12+
mv /usr/lib/jvm/jdk-21* /usr/lib/jvm/java-21-openjdk && \
1113
rm /tmp/openjdk.tar.gz
1214
RUN \
1315
echo "Downloading mxbuild ${MENDIX_VERSION}..." && \
@@ -20,9 +22,11 @@ RUN \
2022
apt-get clean
2123
RUN \
2224
echo "#!/bin/bash -x" >/bin/mxbuild && \
23-
echo "dotnet /tmp/mxbuild/modeler/mxbuild.dll --java-home=/usr/lib/jvm/jdk-11.0.2 --java-exe-path=/usr/lib/jvm/jdk-11.0.2/bin/java \$@" >>/bin/mxbuild && \
25+
echo "dotnet /tmp/mxbuild/modeler/mxbuild.dll --java-home=/usr/lib/jvm/java-21-openjdk --java-exe-path=/usr/lib/jvm/java-21-openjdk/bin/java \$@" >>/bin/mxbuild && \
2426
chmod +x /bin/mxbuild
2527
RUN \
2628
echo "#!/bin/bash -x" >/bin/mx && \
2729
echo "dotnet /tmp/mxbuild/modeler/mx.dll \$@" >>/bin/mx && \
28-
chmod +x /bin/mx
30+
chmod +x /bin/mx
31+
32+
ENV M2EE_TOOLS_JAR=/tmp/mxbuild/modeler/tools/m2ee-tools.jar

0 commit comments

Comments
 (0)