Compare commits
16
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
27442497d4 | ||
|
|
f09eb49200 | ||
|
|
ffceeb225c | ||
|
|
8798c9ce71 | ||
|
|
9154fc0c84 | ||
|
|
6ca0c5c902 | ||
|
|
e411578e9d | ||
|
|
da2be68201 | ||
|
|
f811a01a33 | ||
|
|
76d638166d | ||
|
|
ba3209657b | ||
|
|
b73639e468 | ||
|
|
b75bc1e05d | ||
|
|
0f22d61849 | ||
|
|
bf25910b31 | ||
|
|
b63353df7e |
@@ -1,4 +1,6 @@
|
||||
## 2026-07-20T17:17:39Z
|
||||
## 2026-07-20T17:29:37Z
|
||||
|
||||
- update (fithwum)
|
||||
- Merge build-info updates (fithwum)
|
||||
- Update build-info on 2026-07-20T16:24:37Z [skip ci] (fithwum)
|
||||
- Update build-info on 2026-07-20T17:17:51Z [skip ci] (fithwum)
|
||||
- Merge changelog updates (fithwum)
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
{
|
||||
"version": "minecraft",
|
||||
"commit": "9a24689d2c890803db8b59a3fa5348663b9e8f6c",
|
||||
"build_time": "2026-07-20T16:24:37Z",
|
||||
"commit": "6ca0c5c90210eb88caaf3f896d6c4f6b4bc0ec09",
|
||||
"build_time": "2026-07-20T17:29:50Z",
|
||||
"image_tag": "gitea.fithwum.tech/fithwum/minecraft:minecraft",
|
||||
"digest": "gitea.fithwum.tech/fithwum/minecraft@sha256:fdbfd7f086b2eeaf5c093ed3076f2cacdc3032ea21d23cca2c8d0571d19fea27",
|
||||
"image_size": "302MB",
|
||||
"image_size_bytes": 317419422
|
||||
"image_size_bytes": 317404846
|
||||
}
|
||||
|
||||
+39
-30
@@ -7,6 +7,8 @@ MC_DIR=/mcserver
|
||||
EULA_FILE=$MC_DIR/eula.txt
|
||||
EULA_MARKER=$MC_DIR/.eula_accepted
|
||||
|
||||
SERVER_PROPERTIES=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/minecraft/server.properties
|
||||
|
||||
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')
|
||||
BUKKIT_INSTALLER_FILE=https://cdn.getbukkit.org/craftbukkit/craftbukkit-$MC_VERSION.jar
|
||||
@@ -38,32 +40,32 @@ elif [ $JAVA_VERSION = "openjdk-25-jre" ]; then
|
||||
apt-get update
|
||||
apt-get --no-install-recommends -y install openjdk-25-jre-headless
|
||||
fi
|
||||
elif [ $JAVA_VERSION = "msopenjdk-21" ]; then
|
||||
echo "INFO ! $JAVA_VERSION Selected"
|
||||
if [ dpkg -s msopenjdk-21 &> /dev/null ]
|
||||
then
|
||||
echo "INFO ! $JAVA_VERSION installed ... moving on."
|
||||
else
|
||||
echo " "
|
||||
echo "WARNING ! $JAVA_VERSION not installed ... will install now."
|
||||
wget https://packages.microsoft.com/config/debian/$DEBIAN_VERSION/packages-microsoft-prod.deb -O packages-microsoft-prod.deb
|
||||
dpkg -i packages-microsoft-prod.deb
|
||||
apt-get update && apt-get install -y msopenjdk-21
|
||||
apt-get -y update && apt-get -y --fix-broken install
|
||||
fi
|
||||
elif [ $JAVA_VERSION = "msopenjdk-25" ]; then
|
||||
echo "INFO ! $JAVA_VERSION Selected"
|
||||
if [ dpkg -s msopenjdk-25 &> /dev/null ]
|
||||
then
|
||||
echo "INFO ! $JAVA_VERSION installed ... moving on."
|
||||
else
|
||||
echo " "
|
||||
echo "WARNING ! $JAVA_VERSION not installed ... will install now."
|
||||
wget https://packages.microsoft.com/config/debian/$DEBIAN_VERSION/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
|
||||
# elif [ $JAVA_VERSION = "msopenjdk-21" ]; then
|
||||
# echo "INFO ! $JAVA_VERSION Selected"
|
||||
# if [ dpkg -s msopenjdk-21 &> /dev/null ]
|
||||
# then
|
||||
# echo "INFO ! $JAVA_VERSION installed ... moving on."
|
||||
# else
|
||||
# echo " "
|
||||
# echo "WARNING ! $JAVA_VERSION not installed ... will install now."
|
||||
# wget https://packages.microsoft.com/config/debian/$DEBIAN_VERSION/packages-microsoft-prod.deb -O packages-microsoft-prod.deb
|
||||
# dpkg -i packages-microsoft-prod.deb
|
||||
# apt-get update && apt-get install -y msopenjdk-21
|
||||
# apt-get -y update && apt-get -y --fix-broken install
|
||||
# fi
|
||||
# elif [ $JAVA_VERSION = "msopenjdk-25" ]; then
|
||||
# echo "INFO ! $JAVA_VERSION Selected"
|
||||
# if [ dpkg -s msopenjdk-25 &> /dev/null ]
|
||||
# then
|
||||
# echo "INFO ! $JAVA_VERSION installed ... moving on."
|
||||
# else
|
||||
# echo " "
|
||||
# echo "WARNING ! $JAVA_VERSION not installed ... will install now."
|
||||
# wget https://packages.microsoft.com/config/debian/$DEBIAN_VERSION/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 version must be set first run"
|
||||
sleep infinity
|
||||
@@ -101,7 +103,7 @@ if [ $MC_TYPE = "vanilla" ]; then
|
||||
JAR=./mcserver-*.jar
|
||||
|
||||
while [ true ]; do
|
||||
java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -jar $JAR nogui
|
||||
java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
|
||||
if [ $? -eq 0 ]; then
|
||||
break
|
||||
fi
|
||||
@@ -140,7 +142,7 @@ elif [ $MC_TYPE = "bukkit" ]; then
|
||||
JAR=./craftbukkit-*.jar
|
||||
|
||||
while [ true ]; do
|
||||
java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -jar $JAR nogui
|
||||
java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
|
||||
if [ $? -eq 0 ]; then
|
||||
break
|
||||
fi
|
||||
@@ -179,7 +181,7 @@ elif [ $MC_TYPE = "fabric" ]; then
|
||||
JAR=./fabric-*-*.jar
|
||||
|
||||
while [ true ]; do
|
||||
java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -jar $JAR nogui
|
||||
java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
|
||||
if [ $? -eq 0 ]; then
|
||||
break
|
||||
fi
|
||||
@@ -223,7 +225,7 @@ elif [ $MC_TYPE = "quilt" ]; then
|
||||
JAR=./quilt-server-launch.jar
|
||||
|
||||
while [ true ]; do
|
||||
java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -jar $JAR nogui
|
||||
java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
|
||||
if [ $? -eq 0 ]; then
|
||||
break
|
||||
fi
|
||||
@@ -295,6 +297,13 @@ else
|
||||
sleep infinity
|
||||
fi
|
||||
|
||||
if [ -f $MC_DIR/server.properties ]; then
|
||||
echo "INFO ! server.properties found ... moving on."
|
||||
else
|
||||
echo "WARNING ! server.properties missing ... downloading default file."
|
||||
wget --no-cache --show-progress --progress=bar:force:noscroll $SERVER_PROPERTIES -O $MC_DIR/server.properties
|
||||
fi
|
||||
|
||||
echo "INFO ! Setting game port."
|
||||
if [ -f $MC_DIR/server.properties ]; then
|
||||
sed -i '/server-port='*'/c\server-port='$GAME_PORT'' $MC_DIR/server.properties
|
||||
|
||||
@@ -0,0 +1,44 @@
|
||||
#Minecraft server properties - for more information head over to: https://minecraft.gamepedia.com/Server.properties
|
||||
spawn-protection=16
|
||||
max-tick-time=60000
|
||||
query.port=25565
|
||||
generator-settings=
|
||||
force-gamemode=false
|
||||
allow-nether=true
|
||||
enforce-whitelist=false
|
||||
gamemode=survival
|
||||
broadcast-console-to-ops=true
|
||||
enable-query=false
|
||||
player-idle-timeout=0
|
||||
difficulty=easy
|
||||
broadcast-rcon-to-ops=true
|
||||
spawn-monsters=true
|
||||
op-permission-level=4
|
||||
pvp=true
|
||||
snooper-enabled=false
|
||||
level-type=default
|
||||
hardcore=false
|
||||
enable-command-block=false
|
||||
network-compression-threshold=256
|
||||
max-players=15
|
||||
max-world-size=29999984
|
||||
resource-pack-sha1=
|
||||
rcon.port=25575
|
||||
server-port=25565
|
||||
server-ip=
|
||||
spawn-npcs=true
|
||||
allow-flight=false
|
||||
level-name=world
|
||||
view-distance=10
|
||||
resource-pack=
|
||||
spawn-animals=true
|
||||
white-list=false
|
||||
rcon.password=Dockeradmin
|
||||
generate-structures=true
|
||||
online-mode=true
|
||||
max-build-height=256
|
||||
level-seed=
|
||||
prevent-proxy-connections=false
|
||||
use-native-transport=true
|
||||
motd=A Minecraft Server
|
||||
enable-rcon=false
|
||||
+3
-4
@@ -1,6 +1,5 @@
|
||||
## 2026-07-20T16:24:17Z
|
||||
## 2026-07-20T19:41:50Z
|
||||
|
||||
- updates to run files (fithwum)
|
||||
- Merge build-info updates (fithwum)
|
||||
- Update build-info on 2026-07-20T16:03:47Z [skip ci] (fithwum)
|
||||
- update (fithwum)
|
||||
- add server.properties file (fithwum)
|
||||
- Merge build-info updates (fithwum)
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
{
|
||||
"version": "testing",
|
||||
"commit": "3f9e47bf770f11a6f3c44ae95849bbc63ed78dbe",
|
||||
"build_time": "2026-07-20T16:24:32Z",
|
||||
"commit": "da2be68201de8ab7aa28aaa1399af75f293acf44",
|
||||
"build_time": "2026-07-20T17:29:47Z",
|
||||
"image_tag": "gitea.fithwum.tech/fithwum/minecraft:testing",
|
||||
"digest": "gitea.fithwum.tech/fithwum/minecraft@sha256:4c3f85cdaa6b76d2710b0e0b192b597101a1962f098ee22195ed3a255fba6e5f",
|
||||
"image_size": "302MB",
|
||||
"image_size_bytes": 317419549
|
||||
"image_size_bytes": 317404973
|
||||
}
|
||||
|
||||
+50
-31
@@ -15,6 +15,9 @@ fi
|
||||
EULA_FILE=$MC_DIR/eula.txt
|
||||
EULA_MARKER=$MC_DIR/.eula_accepted
|
||||
|
||||
SERVER_PROPERTIES=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/testing/server.properties
|
||||
START_FILE=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/testing/start.sh
|
||||
|
||||
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')
|
||||
BUKKIT_INSTALLER_FILE=https://cdn.getbukkit.org/craftbukkit/craftbukkit-$MC_VERSION.jar
|
||||
@@ -46,32 +49,32 @@ elif [ $JAVA_VERSION = "openjdk-25-jre" ]; then
|
||||
apt-get update
|
||||
apt-get --no-install-recommends -y install openjdk-25-jre-headless
|
||||
fi
|
||||
elif [ $JAVA_VERSION = "msopenjdk-21" ]; then
|
||||
echo "INFO ! $JAVA_VERSION Selected"
|
||||
if [ dpkg -s msopenjdk-21 &> /dev/null ]
|
||||
then
|
||||
echo "INFO ! $JAVA_VERSION installed ... moving on."
|
||||
else
|
||||
echo " "
|
||||
echo "WARNING ! $JAVA_VERSION not installed ... will install now."
|
||||
wget https://packages.microsoft.com/config/debian/$DEBIAN_VERSION/packages-microsoft-prod.deb -O packages-microsoft-prod.deb
|
||||
dpkg -i packages-microsoft-prod.deb
|
||||
apt-get update && apt-get install -y msopenjdk-21
|
||||
apt-get -y update && apt-get -y --fix-broken install
|
||||
fi
|
||||
elif [ $JAVA_VERSION = "msopenjdk-25" ]; then
|
||||
echo "INFO ! $JAVA_VERSION Selected"
|
||||
if [ dpkg -s msopenjdk-25 &> /dev/null ]
|
||||
then
|
||||
echo "INFO ! $JAVA_VERSION installed ... moving on."
|
||||
else
|
||||
echo " "
|
||||
echo "WARNING ! $JAVA_VERSION not installed ... will install now."
|
||||
wget https://packages.microsoft.com/config/debian/$DEBIAN_VERSION/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
|
||||
# elif [ $JAVA_VERSION = "msopenjdk-21" ]; then
|
||||
# echo "INFO ! $JAVA_VERSION Selected"
|
||||
# if [ dpkg -s msopenjdk-21 &> /dev/null ]
|
||||
# then
|
||||
# echo "INFO ! $JAVA_VERSION installed ... moving on."
|
||||
# else
|
||||
# echo " "
|
||||
# echo "WARNING ! $JAVA_VERSION not installed ... will install now."
|
||||
# wget https://packages.microsoft.com/config/debian/$DEBIAN_VERSION/packages-microsoft-prod.deb -O packages-microsoft-prod.deb
|
||||
# dpkg -i packages-microsoft-prod.deb
|
||||
# apt-get update && apt-get install -y msopenjdk-21
|
||||
# apt-get -y update && apt-get -y --fix-broken install
|
||||
# fi
|
||||
# elif [ $JAVA_VERSION = "msopenjdk-25" ]; then
|
||||
# echo "INFO ! $JAVA_VERSION Selected"
|
||||
# if [ dpkg -s msopenjdk-25 &> /dev/null ]
|
||||
# then
|
||||
# echo "INFO ! $JAVA_VERSION installed ... moving on."
|
||||
# else
|
||||
# echo " "
|
||||
# echo "WARNING ! $JAVA_VERSION not installed ... will install now."
|
||||
# wget https://packages.microsoft.com/config/debian/$DEBIAN_VERSION/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 version must be set first run"
|
||||
sleep infinity
|
||||
@@ -109,7 +112,7 @@ if [ $MC_TYPE = "vanilla" ]; then
|
||||
JAR=./mcserver-*.jar
|
||||
|
||||
while [ true ]; do
|
||||
java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -jar $JAR nogui
|
||||
java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
|
||||
if [ $? -eq 0 ]; then
|
||||
break
|
||||
fi
|
||||
@@ -148,7 +151,7 @@ elif [ $MC_TYPE = "bukkit" ]; then
|
||||
JAR=./craftbukkit-*.jar
|
||||
|
||||
while [ true ]; do
|
||||
java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -jar $JAR nogui
|
||||
java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
|
||||
if [ $? -eq 0 ]; then
|
||||
break
|
||||
fi
|
||||
@@ -187,7 +190,7 @@ elif [ $MC_TYPE = "fabric" ]; then
|
||||
JAR=./fabric-*-*.jar
|
||||
|
||||
while [ true ]; do
|
||||
java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -jar $JAR nogui
|
||||
java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
|
||||
if [ $? -eq 0 ]; then
|
||||
break
|
||||
fi
|
||||
@@ -231,7 +234,7 @@ elif [ $MC_TYPE = "quilt" ]; then
|
||||
JAR=./quilt-server-launch.jar
|
||||
|
||||
while [ true ]; do
|
||||
java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -jar $JAR nogui
|
||||
java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
|
||||
if [ $? -eq 0 ]; then
|
||||
break
|
||||
fi
|
||||
@@ -303,6 +306,13 @@ else
|
||||
sleep infinity
|
||||
fi
|
||||
|
||||
if [ -f $MC_DIR/server.properties ]; then
|
||||
echo "INFO ! server.properties found ... moving on."
|
||||
else
|
||||
echo "WARNING ! server.properties missing ... downloading default file."
|
||||
wget --no-cache --show-progress --progress=bar:force:noscroll $SERVER_PROPERTIES -O $MC_DIR/server.properties
|
||||
fi
|
||||
|
||||
echo "INFO ! Setting game port."
|
||||
if [ -f $MC_DIR/server.properties ]; then
|
||||
sed -i '/server-port='*'/c\server-port='$GAME_PORT'' $MC_DIR/server.properties
|
||||
@@ -335,6 +345,14 @@ else
|
||||
sleep infinity
|
||||
fi
|
||||
|
||||
if [ -f $MC_DIR/start.sh ]; then
|
||||
echo "INFO ! start.sh found ... moving on."
|
||||
else
|
||||
echo "WARNING ! start.sh missing ... downloading default file."
|
||||
wget --no-cache --show-progress --progress=bar:force:noscroll $START_FILE -O $MC_DIR/start.sh
|
||||
chmod +x start.sh
|
||||
fi
|
||||
|
||||
# Set permissions.
|
||||
chown 99:100 -R $MC_DIR
|
||||
chmod 776 -R $MC_DIR
|
||||
@@ -345,6 +363,7 @@ sleep 1
|
||||
echo " "
|
||||
echo "INFO ! Starting Minecraft Server $MC_TYPE-$MC_VERSION"
|
||||
cd $MC_DIR
|
||||
exec ./run-$MC_TYPE-$MC_VERSION.sh
|
||||
exec ./start.sh
|
||||
# exec ./run-$MC_TYPE-$MC_VERSION.sh
|
||||
|
||||
exit
|
||||
@@ -0,0 +1,44 @@
|
||||
#Minecraft server properties - for more information head over to: https://minecraft.gamepedia.com/Server.properties
|
||||
spawn-protection=16
|
||||
max-tick-time=60000
|
||||
query.port=25565
|
||||
generator-settings=
|
||||
force-gamemode=false
|
||||
allow-nether=true
|
||||
enforce-whitelist=false
|
||||
gamemode=survival
|
||||
broadcast-console-to-ops=true
|
||||
enable-query=false
|
||||
player-idle-timeout=0
|
||||
difficulty=easy
|
||||
broadcast-rcon-to-ops=true
|
||||
spawn-monsters=true
|
||||
op-permission-level=4
|
||||
pvp=true
|
||||
snooper-enabled=false
|
||||
level-type=default
|
||||
hardcore=false
|
||||
enable-command-block=false
|
||||
network-compression-threshold=256
|
||||
max-players=15
|
||||
max-world-size=29999984
|
||||
resource-pack-sha1=
|
||||
rcon.port=25575
|
||||
server-port=25565
|
||||
server-ip=
|
||||
spawn-npcs=true
|
||||
allow-flight=false
|
||||
level-name=world
|
||||
view-distance=10
|
||||
resource-pack=
|
||||
spawn-animals=true
|
||||
white-list=false
|
||||
rcon.password=Dockeradmin
|
||||
generate-structures=true
|
||||
online-mode=true
|
||||
max-build-height=256
|
||||
level-seed=
|
||||
prevent-proxy-connections=false
|
||||
use-native-transport=true
|
||||
motd=A Minecraft Server
|
||||
enable-rcon=false
|
||||
@@ -2,8 +2,8 @@
|
||||
# Copyright (c) 2020 fithwum
|
||||
# All rights reserved
|
||||
|
||||
cd /MCserver
|
||||
JAR=./MCserver-*.jar
|
||||
cd /mcserver
|
||||
exec ./run-$MC_TYPE-$MC_VERSION.sh
|
||||
|
||||
# Check if a screen session is already running
|
||||
if screen -list | grep -q "mcserver"; then
|
||||
@@ -11,10 +11,5 @@ if screen -list | grep -q "mcserver"; then
|
||||
else
|
||||
# Start the Minecraft server in a detached screen session
|
||||
echo "INFO ! Starting Minecraft Server in a screen session."
|
||||
screen -mS mcserver bash -c 'while true; do
|
||||
java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -jar $JAR nogui
|
||||
if [ $? -eq 0 ]; then
|
||||
break
|
||||
fi
|
||||
done'
|
||||
screen -mS mcserver bash -c ./run-$MC_TYPE-$MC_VERSION.sh
|
||||
fi
|
||||
Reference in New Issue
Block a user