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
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:
@@ -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=""
|
||||||
|
|||||||
+13
-22
@@ -20,9 +20,7 @@ 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
|
if dpkg -s openjdk-$JAVA_VERSION-jre-headless &> /dev/null
|
||||||
echo "INFO ! openjdk selected"
|
|
||||||
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."
|
||||||
else
|
else
|
||||||
@@ -30,27 +28,20 @@ if [ $JAVA_TYPE = "openjdk" ]; then
|
|||||||
echo "WARNING ! openjdk-$JAVA_VERSION-jre-headless not installed ... will install now."
|
echo "WARNING ! openjdk-$JAVA_VERSION-jre-headless not installed ... will install now."
|
||||||
apt-get update
|
apt-get update
|
||||||
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
|
|
||||||
|
|
||||||
elif [ $JAVA_TYPE = "msopenjdk" ]; then
|
|
||||||
echo "INFO ! msopenjdk selected"
|
|
||||||
if dpkg -s msopenjdk-$JAVA_VERSION &> /dev/null
|
|
||||||
then
|
|
||||||
echo "INFO ! msopenjdk-$JAVA_VERSION installed ... moving on."
|
|
||||||
else
|
|
||||||
echo " "
|
|
||||||
echo "WARNING ! msopenjdk-$JAVA_VERSION not installed ... will install now."
|
|
||||||
wget https://packages.microsoft.com/config/debian/$(lsb_release -rs)/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \
|
|
||||||
dpkg -i packages-microsoft-prod.deb \
|
|
||||||
apt-get update && apt-get install -y msopenjdk-25 \
|
|
||||||
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
|
fi
|
||||||
|
|
||||||
|
# if dpkg -s msopenjdk-$JAVA_VERSION &> /dev/null
|
||||||
|
# then
|
||||||
|
# echo "INFO ! msopenjdk-$JAVA_VERSION installed ... moving on."
|
||||||
|
# else
|
||||||
|
# echo " "
|
||||||
|
# echo "WARNING ! msopenjdk-$JAVA_VERSION not installed ... will install now."
|
||||||
|
# wget https://packages.microsoft.com/config/debian/$(lsb_release -rs)/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \
|
||||||
|
# dpkg -i packages-microsoft-prod.deb \
|
||||||
|
# apt-get update && apt-get install -y msopenjdk-25 \
|
||||||
|
# apt-get -y update && apt-get -y --fix-broken install
|
||||||
|
# fi
|
||||||
|
|
||||||
# Main install (Debian).
|
# Main install (Debian).
|
||||||
# Check for server files and download if needed.
|
# Check for server files and download if needed.
|
||||||
if [ $MC_TYPE = "vanilla" ]; then
|
if [ $MC_TYPE = "vanilla" ]; then
|
||||||
|
|||||||
Reference in New Issue
Block a user