fix java version
Build and Push Minecraft Docker Images on Debian-base update / poll-debian-base-and-detect-changes (push) Successful in 10s
Build and Push Minecraft Docker Images on Debian-base update / Build and Push bukkit (push) Successful in 9s
Build and Push Minecraft Docker Images on Debian-base update / Build and Push fabric (push) Successful in 11s
Build and Push Minecraft Docker Images on Debian-base update / Build and Push forge (push) Successful in 14s
Build and Push Minecraft Docker Images on Debian-base update / Build and Push neoforged (push) Successful in 14s
Build and Push Minecraft Docker Images on Debian-base update / Build and Push quilt (push) Successful in 10s
Build and Push Minecraft Docker Images on Debian-base update / Build and Push vanilla (push) Successful in 11s
Build and Push Minecraft Docker Images on Debian-base update / Build and Push testing (push) Successful in 26s
Build and Push Minecraft Docker Images on Debian-base update / generate-changelogs (push) Successful in 7s
Build and Push Minecraft Docker Images on Debian-base update / generate-build-info (push) Successful in 24s
Build and Push Minecraft Docker Images on Debian-base update / Docker prune (vm-docker-build2) (push) Successful in 3s

This commit is contained in:
2026-07-14 16:51:51 -07:00
parent ea47b19d7f
commit 6d26588839
2 changed files with 13 additions and 23 deletions
-1
View File
@@ -15,7 +15,6 @@ ENV FABRIC_VERSION=""
ENV FABRIC_INSTALLER_VERSION="" ENV FABRIC_INSTALLER_VERSION=""
# Java settings # Java settings
ENV JAVA_TYPE="openjdk"
ENV JAVA_VERSION="" ENV JAVA_VERSION=""
ENV XMX_SIZE="" ENV XMX_SIZE=""
+11 -20
View File
@@ -20,8 +20,6 @@ BUKKIT_INSTALLER_FILE=https://cdn.getbukkit.org/craftbukkit/craftbukkit-$MC_VERS
MC_BUKKIT_RUN_FILE=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/bukkit/run.sh MC_BUKKIT_RUN_FILE=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/bukkit/run.sh
# Install java # Install java
if [ $JAVA_TYPE = "openjdk" ]; then
echo "INFO ! openjdk selected"
if dpkg -s openjdk-$JAVA_VERSION-jre-headless &> /dev/null if dpkg -s openjdk-$JAVA_VERSION-jre-headless &> /dev/null
then then
echo "INFO ! openjdk-$JAVA_VERSION-jre-headless installed ... moving on." echo "INFO ! openjdk-$JAVA_VERSION-jre-headless installed ... moving on."
@@ -32,24 +30,17 @@ if [ $JAVA_TYPE = "openjdk" ]; then
apt-get --no-install-recommends -y install openjdk-$JAVA_VERSION-jre-headless apt-get --no-install-recommends -y install openjdk-$JAVA_VERSION-jre-headless
fi fi
elif [ $JAVA_TYPE = "msopenjdk" ]; then # if dpkg -s msopenjdk-$JAVA_VERSION &> /dev/null
echo "INFO ! msopenjdk selected" # then
if dpkg -s msopenjdk-$JAVA_VERSION &> /dev/null # echo "INFO ! msopenjdk-$JAVA_VERSION installed ... moving on."
then # else
echo "INFO ! msopenjdk-$JAVA_VERSION installed ... moving on." # echo " "
else # echo "WARNING ! msopenjdk-$JAVA_VERSION not installed ... will install now."
echo " " # wget https://packages.microsoft.com/config/debian/$(lsb_release -rs)/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \
echo "WARNING ! msopenjdk-$JAVA_VERSION not installed ... will install now." # dpkg -i packages-microsoft-prod.deb \
wget https://packages.microsoft.com/config/debian/$(lsb_release -rs)/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \ # apt-get update && apt-get install -y msopenjdk-25 \
dpkg -i packages-microsoft-prod.deb \ # apt-get -y update && apt-get -y --fix-broken install
apt-get update && apt-get install -y msopenjdk-25 \ # fi
apt-get -y update && apt-get -y --fix-broken install
fi
else
echo "ERROR ! JAVA_TYPE must be set to on first run"
sleep infinity
fi
# Main install (Debian). # Main install (Debian).
# Check for server files and download if needed. # Check for server files and download if needed.