File tree Expand file tree Collapse file tree 2 files changed +15
-10
lines changed Expand file tree Collapse file tree 2 files changed +15
-10
lines changed Original file line number Diff line number Diff line change @@ -43,12 +43,12 @@ jobs:
4343 platforms : linux/amd64,linux/arm64
4444 mcVersion : latest
4545 - variant : java25-graalvm
46- baseImage : container-registry.oracle.com/graalvm/jdk:25-ol9
46+ baseImage : container-registry.oracle.com/graalvm/jdk:25-ol10
4747 platforms : linux/amd64,linux/arm64
4848 mcVersion : latest
4949 # JAVA 21:
5050 - variant : java21-graalvm
51- baseImage : container-registry.oracle.com/graalvm/jdk:21-ol9
51+ baseImage : container-registry.oracle.com/graalvm/jdk:21-ol10
5252 platforms : linux/amd64,linux/arm64
5353 mcVersion : latest
5454 - variant : java21
7070 platforms : linux/amd64,linux/arm/v7,linux/arm64
7171 mcVersion : 1.20.4
7272 - variant : java17-graalvm
73- baseImage : container-registry.oracle.com/graalvm/jdk:17-ol9
73+ baseImage : container-registry.oracle.com/graalvm/jdk:17-ol10
7474 platforms : linux/amd64,linux/arm64
7575 mcVersion : 1.20.4
7676 - variant : java17-alpine
Original file line number Diff line number Diff line change @@ -15,7 +15,7 @@ dnf config-manager --set-enabled ol${os_major_version}_codeready_builder
1515tee /etc/yum.repos.d/ol${os_major_version} -epel.repo << EOF
1616[ol${os_major_version} _developer_EPEL]
1717name=Oracle Linux \$ releasever EPEL (\$ basearch)
18- baseurl=https://yum.oracle.com/repo/OracleLinux/OL${os_major_version} /developer/EPEL/\$ basearch/
18+ baseurl=https://yum.oracle.com/repo/OracleLinux/OL${os_major_version} $( [ " $os_major_version " -ge 10 ] && echo ' /0 ' || echo ' ' ) /developer/EPEL/\$ basearch/
1919gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
2020gpgcheck=1
2121enabled=1
@@ -26,6 +26,7 @@ dnf update -y
2626
2727# Install necessary packages
2828# shellcheck disable=SC2086
29+ # shellcheck disable=SC2046
2930dnf install -y \
3031 ImageMagick \
3132 file \
@@ -36,25 +37,29 @@ dnf install -y \
3637 git \
3738 jq \
3839 dos2unix \
39- mysql \
40+ $( [ " $os_major_version " -ge 10 ] && echo ' mysql8.4 ' || echo ' mysql' ) \
4041 procps-ng \
4142 tzdata \
4243 rsync \
4344 nano \
4445 unzip \
4546 zstd \
46- lbzip2 \
47+ $( [ " $os_major_version " -ge 10 ] && echo ' bzip2 ' || echo ' lbzip2' ) \
4748 libpcap \
4849 libwebp \
4950 findutils \
5051 which \
5152 glibc-langpack-en \
53+ $( [ " $os_major_version " -ge 10 ] && echo ' git-lfs' || echo ' ' ) \
54+ $( [ " $os_major_version " -ge 10 ] && echo ' openssl' || echo ' ' ) \
5255 ${EXTRA_DNF_PACKAGES}
5356
54- # Install Git LFS
55- curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.rpm.sh | sudo bash
56- dnf update -y
57- dnf install -y git-lfs
57+ # Install Git LFS through third party repository for older OL releases
58+ if [ " $os_major_version " -lt 10 ]; then
59+ curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.rpm.sh | sudo bash
60+ dnf update -y
61+ dnf install -y git-lfs
62+ fi
5863
5964# Clean up DNF when done
6065dnf clean all
You can’t perform that action at this time.
0 commit comments