mirror of
https://github.com/itzg/docker-minecraft-server.git
synced 2026-11-22 06:34:21 +00:00
fix(graalvm): update to Oracle Linux 10 to fix file command mimetype issues (#3764)
This commit is contained in:
1 parent
0e3c655d27
commit
a29bb020d9
2 files changed
+15
-10
No files matched your search
@@ -43,12 +43,12 @@ jobs:
|
|||||||
platforms: linux/amd64,linux/arm64
|
platforms: linux/amd64,linux/arm64
|
||||||
mcVersion: latest
|
mcVersion: latest
|
||||||
- variant: java25-graalvm
|
- 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
|
platforms: linux/amd64,linux/arm64
|
||||||
mcVersion: latest
|
mcVersion: latest
|
||||||
# JAVA 21:
|
# JAVA 21:
|
||||||
- variant: java21-graalvm
|
- 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
|
platforms: linux/amd64,linux/arm64
|
||||||
mcVersion: latest
|
mcVersion: latest
|
||||||
- variant: java21
|
- variant: java21
|
||||||
@@ -70,7 +70,7 @@ jobs:
|
|||||||
platforms: linux/amd64,linux/arm/v7,linux/arm64
|
platforms: linux/amd64,linux/arm/v7,linux/arm64
|
||||||
mcVersion: 1.20.4
|
mcVersion: 1.20.4
|
||||||
- variant: java17-graalvm
|
- 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
|
platforms: linux/amd64,linux/arm64
|
||||||
mcVersion: 1.20.4
|
mcVersion: 1.20.4
|
||||||
- variant: java17-alpine
|
- variant: java17-alpine
|
||||||
|
|||||||
@@ -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
|
tee /etc/yum.repos.d/ol${os_major_version}-epel.repo <<EOF
|
||||||
[ol${os_major_version}_developer_EPEL]
|
[ol${os_major_version}_developer_EPEL]
|
||||||
name=Oracle Linux \$releasever EPEL (\$basearch)
|
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
|
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
|
||||||
gpgcheck=1
|
gpgcheck=1
|
||||||
enabled=1
|
enabled=1
|
||||||
@@ -26,6 +26,7 @@ dnf update -y
|
|||||||
|
|
||||||
# Install necessary packages
|
# Install necessary packages
|
||||||
# shellcheck disable=SC2086
|
# shellcheck disable=SC2086
|
||||||
|
# shellcheck disable=SC2046
|
||||||
dnf install -y \
|
dnf install -y \
|
||||||
ImageMagick \
|
ImageMagick \
|
||||||
file \
|
file \
|
||||||
@@ -36,25 +37,29 @@ dnf install -y \
|
|||||||
git \
|
git \
|
||||||
jq \
|
jq \
|
||||||
dos2unix \
|
dos2unix \
|
||||||
mysql \
|
$([ "$os_major_version" -ge 10 ] && echo 'mysql8.4' || echo 'mysql') \
|
||||||
procps-ng \
|
procps-ng \
|
||||||
tzdata \
|
tzdata \
|
||||||
rsync \
|
rsync \
|
||||||
nano \
|
nano \
|
||||||
unzip \
|
unzip \
|
||||||
zstd \
|
zstd \
|
||||||
lbzip2 \
|
$([ "$os_major_version" -ge 10 ] && echo 'bzip2' || echo 'lbzip2') \
|
||||||
libpcap \
|
libpcap \
|
||||||
libwebp \
|
libwebp \
|
||||||
findutils \
|
findutils \
|
||||||
which \
|
which \
|
||||||
glibc-langpack-en \
|
glibc-langpack-en \
|
||||||
|
$([ "$os_major_version" -ge 10 ] && echo 'git-lfs' || echo '') \
|
||||||
|
$([ "$os_major_version" -ge 10 ] && echo 'openssl' || echo '') \
|
||||||
${EXTRA_DNF_PACKAGES}
|
${EXTRA_DNF_PACKAGES}
|
||||||
|
|
||||||
# Install Git LFS
|
# Install Git LFS through third party repository for older OL releases
|
||||||
curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.rpm.sh | sudo bash
|
if [ "$os_major_version" -lt 10 ]; then
|
||||||
dnf update -y
|
curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.rpm.sh | sudo bash
|
||||||
dnf install -y git-lfs
|
dnf update -y
|
||||||
|
dnf install -y git-lfs
|
||||||
|
fi
|
||||||
|
|
||||||
# Clean up DNF when done
|
# Clean up DNF when done
|
||||||
dnf clean all
|
dnf clean all
|
||||||
|
|||||||
Reference in new issue
Block a user