From da280d2076b52860dbba03e8d229a829b6d8c49e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Gonz=C3=A1lez?= <me@alegon.dev>
Date: Sat, 15 Nov 2025 16:14:45 +0100
Subject: [PATCH] fix(graalvm): update to Oracle Linux 10 to fix file command
 mimetype issues

---
 .github/workflows/build-multiarch.yml |  6 +++---
 build/ol/install-packages.sh          | 19 ++++++++++++-------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build-multiarch.yml b/.github/workflows/build-multiarch.yml
index b6063f8eb12..cbdb8ce8dcb 100644
--- a/.github/workflows/build-multiarch.yml
+++ b/.github/workflows/build-multiarch.yml
@@ -43,12 +43,12 @@ jobs:
             platforms: linux/amd64,linux/arm64
             mcVersion: latest
           - variant: java25-graalvm
-            baseImage: container-registry.oracle.com/graalvm/jdk:25-ol9
+            baseImage: container-registry.oracle.com/graalvm/jdk:25-ol10
             platforms: linux/amd64,linux/arm64
             mcVersion: latest
         # JAVA 21:
           - variant: java21-graalvm
-            baseImage: container-registry.oracle.com/graalvm/jdk:21-ol9
+            baseImage: container-registry.oracle.com/graalvm/jdk:21-ol10
             platforms: linux/amd64,linux/arm64
             mcVersion: latest
           - variant: java21
@@ -70,7 +70,7 @@ jobs:
             platforms: linux/amd64,linux/arm/v7,linux/arm64
             mcVersion: 1.20.4
           - variant: java17-graalvm
-            baseImage: container-registry.oracle.com/graalvm/jdk:17-ol9
+            baseImage: container-registry.oracle.com/graalvm/jdk:17-ol10
             platforms: linux/amd64,linux/arm64
             mcVersion: 1.20.4
           - variant: java17-alpine
diff --git a/build/ol/install-packages.sh b/build/ol/install-packages.sh
index 5e0135ce8b6..23ea9c3653e 100755
--- a/build/ol/install-packages.sh
+++ b/build/ol/install-packages.sh
@@ -15,7 +15,7 @@ dnf config-manager --set-enabled ol${os_major_version}_codeready_builder
 tee /etc/yum.repos.d/ol${os_major_version}-epel.repo <<EOF
 [ol${os_major_version}_developer_EPEL]
 name=Oracle Linux \$releasever EPEL (\$basearch)
-baseurl=https://yum.oracle.com/repo/OracleLinux/OL${os_major_version}/developer/EPEL/\$basearch/
+baseurl=https://yum.oracle.com/repo/OracleLinux/OL${os_major_version}$([ "$os_major_version" -ge 10 ] && echo '/0' || echo '')/developer/EPEL/\$basearch/
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
 gpgcheck=1
 enabled=1
@@ -26,6 +26,7 @@ dnf update -y
 
 # Install necessary packages
 # shellcheck disable=SC2086
+# shellcheck disable=SC2046
 dnf install -y \
   ImageMagick \
   file \
@@ -36,25 +37,29 @@ dnf install -y \
   git \
   jq \
   dos2unix \
-  mysql \
+  $([ "$os_major_version" -ge 10 ] && echo 'mysql8.4' || echo 'mysql') \
   procps-ng \
   tzdata \
   rsync \
   nano \
   unzip \
   zstd \
-  lbzip2 \
+  $([ "$os_major_version" -ge 10 ] && echo 'bzip2' || echo 'lbzip2') \
   libpcap \
   libwebp \
   findutils \
   which \
   glibc-langpack-en \
+  $([ "$os_major_version" -ge 10 ] && echo 'git-lfs' || echo '') \
+  $([ "$os_major_version" -ge 10 ] && echo 'openssl' || echo '') \
   ${EXTRA_DNF_PACKAGES}
 
-# Install Git LFS
-curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.rpm.sh | sudo bash
-dnf update -y
-dnf install -y git-lfs
+# Install Git LFS through third party repository for older OL releases
+if [ "$os_major_version" -lt 10 ]; then
+  curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.rpm.sh | sudo bash
+  dnf update -y
+  dnf install -y git-lfs
+fi
 
 # Clean up DNF when done
 dnf clean all