updates and testing
This commit is contained in:
@@ -3,7 +3,8 @@ LABEL maintainer "fithwum"
|
||||
|
||||
# Environment Variables
|
||||
ENV ACCEPT_EULA=""
|
||||
ENV GAME_PORT=""
|
||||
ENV GAME_PORT_TCP=""
|
||||
ENV GAME_PORT_UDP=""
|
||||
ENV MC_VERSION=""
|
||||
ENV FABRIC_VERSION=""
|
||||
ENV INSTALLER_VERSION=""
|
||||
@@ -30,7 +31,7 @@ RUN chmod +x /MCtemp/install_script.sh
|
||||
VOLUME /MCserver
|
||||
|
||||
# 25565 Default.
|
||||
EXPOSE 25565/udp 25565/tcp
|
||||
EXPOSE $GAME_PORT_UDP/udp $GAME_PORT_TCP/tcp
|
||||
|
||||
# Run command
|
||||
CMD [ "/bin/bash", "./MCtemp/install_script.sh" ]
|
||||
34
testing/Dockerfile
Normal file
34
testing/Dockerfile
Normal file
@@ -0,0 +1,34 @@
|
||||
FROM fithwum/debian-base:bullseye
|
||||
LABEL maintainer "fithwum"
|
||||
|
||||
ENV ACCEPT_EULA=""
|
||||
ENV GAME_PORT_TCP=""
|
||||
ENV GAME_PORT_UDP=""
|
||||
ENV MC_VERSION=""
|
||||
|
||||
# URL's for files
|
||||
ARG INSTALL_SCRIPT=https://gitlab.fithwum.tech/fithwum/minecraft/-/raw/master/testing/install_script.sh
|
||||
|
||||
# Install java-17 & Dependencies.
|
||||
RUN apt-get -y update \
|
||||
&& apt-get -y --fix-broken install \
|
||||
&& apt-get install -y software-properties-common screen openjdk-17-jdk jq curl \
|
||||
&& apt-get clean \
|
||||
&& rm -rf /var/lib/apt/lists/* \
|
||||
&& update-ca-certificates -f;
|
||||
|
||||
# Folder creation.
|
||||
RUN mkdir -p /MCserver /MCtemp \
|
||||
&& chmod 777 -R /MCserver /MCtemp \
|
||||
&& chown 99:100 -R /MCserver /MCtemp
|
||||
ADD "${INSTALL_SCRIPT}" /MCtemp
|
||||
RUN chmod +x /MCtemp/install_script.sh
|
||||
|
||||
# Directory where data is stored
|
||||
VOLUME /MCserver
|
||||
|
||||
# 25565 Default.
|
||||
EXPOSE $GAME_PORT_UDP/udp $GAME_PORT_TCP/tcp
|
||||
|
||||
# Run command
|
||||
CMD [ "/bin/bash", "./MCtemp/install_script.sh" ]
|
||||
103
testing/install_script.sh
Normal file
103
testing/install_script.sh
Normal file
@@ -0,0 +1,103 @@
|
||||
#!/bin/bash
|
||||
# Copyright (c) 2022 fithwum
|
||||
# All rights reserved
|
||||
|
||||
# Display setup
|
||||
export DISPLAY=0
|
||||
|
||||
VERSION_CHECK=$(curl -s "https://piston-meta.mojang.com/mc/game/version_manifest_v2.json" | grep -Pom 1 '"url": "\K[^"]*'$MC_VERSION'.json')
|
||||
MC_SERVER_FILE=$(curl -s $VERSION_CHECK | jq --raw-output '.downloads.server.url')
|
||||
MC_RUN_FILE=https://gitlab.fithwum.tech/fithwum/minecraft/-/raw/master/vanilla/run.sh
|
||||
|
||||
rm -fr /MCserver/MCserver_*.jar
|
||||
rm -fr /MCserver/run_*.sh
|
||||
|
||||
# Main install (Debian).
|
||||
# Check for files in /MCserver and download if needed.
|
||||
if [ -e /MCserver/MCserver-$MC_VERSION.jar ]
|
||||
then
|
||||
echo " "
|
||||
echo "INFO ! MCserver-$MC_VERSION.jar found starting now."
|
||||
else
|
||||
echo " "
|
||||
echo "WARNING ! MCserver-$MC_VERSION.jar is out of date/missing ... will download now."
|
||||
echo " "
|
||||
echo "INFO ! Cleaning old files."
|
||||
mkdir /MCserver/old-server-versions/
|
||||
mv /MCserver/MCserver-*.jar /MCserver/old-server-versions/
|
||||
mv /MCserver/run-*.sh /MCserver/old-server-versions/
|
||||
wget --no-cache $MC_SERVER_FILE -O /MCserver/MCserver-$MC_VERSION.jar
|
||||
fi
|
||||
|
||||
sleep 1
|
||||
|
||||
# Looking for run-${MC_VERSION}.sh
|
||||
if [ -e /MCserver/run-$MC_VERSION.sh ]
|
||||
then
|
||||
echo " "
|
||||
echo "INFO ! run-$MC_VERSION.sh found ... will use existing file."
|
||||
else
|
||||
echo " "
|
||||
echo "WARNING ! run.sh is out of date/missing ... will download now."
|
||||
wget --no-cache $MC_RUN_FILE -O /MCserver/run-$MC_VERSION.sh
|
||||
fi
|
||||
|
||||
sleep 1
|
||||
|
||||
# Check for EULA
|
||||
if [ ! -f /MCserver/eula.txt ]; then
|
||||
:
|
||||
else
|
||||
if [ "$ACCEPT_EULA" == "false" ]; then
|
||||
if grep -rq 'eula=true' /MCserver/eula.txt; then
|
||||
sed -i '/eula=true/c\eula=false' /MCserver/eula.txt
|
||||
fi
|
||||
echo " "
|
||||
echo "WARNING ! EULA not accepted, you must accept the EULA"
|
||||
echo " to start the Server, putting server in sleep mode"
|
||||
sleep infinity
|
||||
fi
|
||||
fi
|
||||
|
||||
sleep 1
|
||||
|
||||
if [ ! -f /MCserver/eula.txt ]; then
|
||||
echo " "
|
||||
echo "WARNING ! EULA not found please stand by..."
|
||||
sleep 5
|
||||
fi
|
||||
if [ "$ACCEPT_EULA" == "true" ]; then
|
||||
if grep -rq 'eula=false' /MCserver/eula.txt; then
|
||||
sed -i '/eula=false/c\eula=true' /MCserver/eula.txt
|
||||
echo " "
|
||||
echo "INFO ! EULA accepted, server restarting, please wait..."
|
||||
sleep 1
|
||||
exec /MCserver/run-$MC_VERSION.sh --dataPath=/MCserver
|
||||
exit 0
|
||||
fi
|
||||
elif [ "$ACCEPT_EULA" == "false" ]; then
|
||||
echo " "
|
||||
echo "WARNING ! EULA not accepted, you must accept the EULA"
|
||||
echo " to start the Server, putting server in sleep mode"
|
||||
sleep infinity
|
||||
else
|
||||
echo " "
|
||||
echo "WARNING ! Something went wrong, please check EULA variable"
|
||||
fi
|
||||
|
||||
sleep 1
|
||||
|
||||
# Set permissions.
|
||||
chown 99:100 -R /MCserver
|
||||
chmod 777 -R /MCserver
|
||||
chmod +x /MCserver/run-$MC_VERSION.sh
|
||||
chmod +x /MCserver/MCserver-$MC_VERSION.jar
|
||||
|
||||
sleep 1
|
||||
|
||||
# Run Minecraft server.
|
||||
echo " "
|
||||
echo "INFO ! Starting Minecraft Server $MC_VERSION"
|
||||
exec /MCserver/run-$MC_VERSION.sh --dataPath=/MCserver
|
||||
|
||||
exit
|
||||
13
testing/run.sh
Normal file
13
testing/run.sh
Normal file
@@ -0,0 +1,13 @@
|
||||
#!/bin/bash
|
||||
# Copyright (c) 2022 fithwum
|
||||
# All rights reserved
|
||||
|
||||
cd /MCserver
|
||||
JAR=./MCserver-*.jar
|
||||
|
||||
while [ true ]; do
|
||||
java -Xmx4G -Xms1024M -Xmn1G -jar $JAR nogui
|
||||
if [ $? -eq 0 ]; then
|
||||
break
|
||||
fi
|
||||
done
|
||||
@@ -2,7 +2,8 @@ FROM fithwum/debian-base:bullseye
|
||||
LABEL maintainer "fithwum"
|
||||
|
||||
ENV ACCEPT_EULA=""
|
||||
ENV GAME_PORT=""
|
||||
ENV GAME_PORT_TCP=""
|
||||
ENV GAME_PORT_UDP=""
|
||||
ENV MC_VERSION=""
|
||||
|
||||
# URL's for files
|
||||
@@ -27,7 +28,7 @@ RUN chmod +x /MCtemp/install_script.sh
|
||||
VOLUME /MCserver
|
||||
|
||||
# 25565 Default.
|
||||
EXPOSE 25565/udp 25565/tcp
|
||||
EXPOSE $GAME_PORT_UDP/udp $GAME_PORT_TCP/tcp
|
||||
|
||||
# Run command
|
||||
CMD [ "/bin/bash", "./MCtemp/install_script.sh" ]
|
||||
Reference in New Issue
Block a user