Skip to content

Commit

Permalink
Fixed support for newer versions of Mendix 9 and Mendix 10.
Browse files Browse the repository at this point in the history
  • Loading branch information
zlogic committed Aug 11, 2023
1 parent d440f8e commit a91ec76
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
5 changes: 3 additions & 2 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,15 @@ if [ $MX_MAJOR_VERSION -le 7 ]; then
elif [ $MX_MAJOR_VERSION -eq 8 ]; then
JAVA_VERSION=11
DOTNET_VERSION="mono520"
elif [ $MX_MAJOR_VERSION -eq 9 ] && [ $MX_MINOR_VERSION -lt 16 ]; then
elif [ $MX_MAJOR_VERSION -eq 9 ] && [ $MX_MINOR_VERSION -lt 21 ]; then
JAVA_VERSION=11
DOTNET_VERSION="mono520"
elif [ $MX_MAJOR_VERSION -eq 9 ] && [ $MX_MINOR_VERSION -ge 16 ]; then
elif [ $MX_MAJOR_VERSION -eq 9 ] || [ $MX_MAJOR_VERSION -eq 10 ]; then
JAVA_VERSION=11
DOTNET_VERSION="dotnet6"
else
echo "Unsupported Mendix version: ${MX_MAJOR_VERSION}.${MX_MINOR_VERSION}"
exit 1
fi

echo "Using Java $JAVA_VERSION and .NET $DOTNET_VERSION"
Expand Down
4 changes: 2 additions & 2 deletions build/mxbuild.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ RUN if [ $DOTNET_VERSION = "mono520" ]; then \
cp /etc/pki/rpm-gpg/RPM-GPG-KEY-mono-centos8-stable /mnt/rootfs/etc/pki/rpm-gpg/; \
cp /etc/yum.repos.d/mono-centos8-stable.repo /mnt/rootfs/etc/yum.repos.d/; \
elif [ $DOTNET_VERSION = "dotnet6" ]; then \
DOTNET_LIBS="dotnet-runtime-6.0 libgdiplus"; \
DOTNET_LIBS="libgdiplus libicu"; \
rm /etc/yum.repos.d/mono-centos8-stable.repo; \
dnf install --setopt install_weak_deps=false --nodocs --installroot /mnt/rootfs -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm; \
cp /mnt/rootfs/etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 /etc/pki/rpm-gpg/; \
Expand Down Expand Up @@ -63,7 +63,7 @@ RUN ARCH=$(arch) && \
elif [ $DOTNET_VERSION = "dotnet6" ] && [ $ARCH = "aarch64" ]; then \
MXBUILD_DOWNLOAD_PREFIX="arm64-"; \
elif [ $DOTNET_VERSION = "dotnet6" ] && [ $ARCH = "x86_64" ]; then \
MXBUILD_DOWNLOAD_PREFIX="net6-"; \
MXBUILD_DOWNLOAD_PREFIX=""; \
else \
echo "Unsupported .NET $DOTNET_VERSION or architecture $ARCH"; \
fi &&\
Expand Down

0 comments on commit a91ec76

Please sign in to comment.