rcon fixes
minecraft-build-minecraft / Docker prune (vm-docker-build2) (push) Successful in 3s
minecraft-build-testing / Docker prune (vm-docker-build2) (push) Successful in 3s
minecraft-build-minecraft / poll-debian-base-and-detect-changes (push) Successful in 22s
minecraft-build-testing / poll-debian-base-and-detect-changes (push) Successful in 22s
minecraft-build-minecraft / Build and Push minecraft (push) Successful in 26s
minecraft-build-testing / Build and Push testing (push) Successful in 25s
minecraft-build-minecraft / generate-changelogs (push) Successful in 8s
minecraft-build-testing / generate-changelogs (push) Successful in 8s
minecraft-build-minecraft / generate-build-info (push) Successful in 10s
minecraft-build-testing / generate-build-info (push) Successful in 11s
minecraft-build-minecraft / Docker prune (vm-docker-build2) (push) Successful in 3s
minecraft-build-testing / Docker prune (vm-docker-build2) (push) Successful in 3s
minecraft-build-minecraft / poll-debian-base-and-detect-changes (push) Successful in 22s
minecraft-build-testing / poll-debian-base-and-detect-changes (push) Successful in 22s
minecraft-build-minecraft / Build and Push minecraft (push) Successful in 26s
minecraft-build-testing / Build and Push testing (push) Successful in 25s
minecraft-build-minecraft / generate-changelogs (push) Successful in 8s
minecraft-build-testing / generate-changelogs (push) Successful in 8s
minecraft-build-minecraft / generate-build-info (push) Successful in 10s
minecraft-build-testing / generate-build-info (push) Successful in 11s
This commit is contained in:
@@ -2,10 +2,9 @@ FROM gitea.fithwum.tech/fithwum/debian-base:trixie
|
|||||||
LABEL maintainer="fithwum"
|
LABEL maintainer="fithwum"
|
||||||
|
|
||||||
# Environment Variables.
|
# Environment Variables.
|
||||||
|
# Minecarft settings.
|
||||||
ENV ACCEPT_EULA=""
|
ENV ACCEPT_EULA=""
|
||||||
ENV GAME_PORT=""
|
ENV GAME_PORT=""
|
||||||
|
|
||||||
# Minecarft versions.
|
|
||||||
ENV MC_TYPE=""
|
ENV MC_TYPE=""
|
||||||
ENV MC_VERSION=""
|
ENV MC_VERSION=""
|
||||||
ENV QUILT_VERSION=""
|
ENV QUILT_VERSION=""
|
||||||
@@ -14,9 +13,13 @@ ENV NEOFORGED_VERSION=""
|
|||||||
ENV FABRIC_VERSION=""
|
ENV FABRIC_VERSION=""
|
||||||
ENV FABRIC_INSTALLER_VERSION=""
|
ENV FABRIC_INSTALLER_VERSION=""
|
||||||
|
|
||||||
|
# RCON settings.
|
||||||
|
ENV ENABLE_RCON=
|
||||||
|
ENV RCON_PORT=
|
||||||
|
ENV RCON_PASSWORD=
|
||||||
|
|
||||||
# Java settings.
|
# Java settings.
|
||||||
ENV JAVA_VERSION=""
|
ENV JAVA_VERSION=""
|
||||||
|
|
||||||
ENV XMX_SIZE=""
|
ENV XMX_SIZE=""
|
||||||
ENV XMS_SIZE=""
|
ENV XMS_SIZE=""
|
||||||
ENV XMN_SIZE=""
|
ENV XMN_SIZE=""
|
||||||
@@ -26,7 +29,7 @@ ARG INSTALL_SCRIPT=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/maste
|
|||||||
|
|
||||||
# Install Java & Dependencies.
|
# Install Java & Dependencies.
|
||||||
RUN apt-get -y update \
|
RUN apt-get -y update \
|
||||||
&& apt-get install -y --no-install-recommends bzip2 lsb-release jq screen \
|
&& apt-get install -y --no-install-recommends bzip2 lsb-release jq \
|
||||||
&& apt-get -y --fix-broken install \
|
&& apt-get -y --fix-broken install \
|
||||||
&& apt-get -y autoclean \
|
&& apt-get -y autoclean \
|
||||||
&& apt-get -y autoremove \
|
&& apt-get -y autoremove \
|
||||||
|
|||||||
@@ -336,6 +336,27 @@ else
|
|||||||
sleep infinity
|
sleep infinity
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# if [ -f /usr/local/bin/rcon-cli.jar ]; then
|
||||||
|
# echo "INFO ! rcon-cli.jar found ... moving on."
|
||||||
|
# else
|
||||||
|
# echo "INFO ! rcon-cli.jar missing ... downloading now."
|
||||||
|
# wget --no-cache --show-progress --progress=bar:force:noscroll https://github.com/LCLPYT/RconCli/releases/latest/download/rcon-cli.jar -O /usr/local/bin/rcon-cli.jar
|
||||||
|
# fi
|
||||||
|
|
||||||
|
# if [ -f connect.sh ]; then
|
||||||
|
# echo "INFO ! connect.sh found ... moving on."
|
||||||
|
# else
|
||||||
|
# cat > connect.sh <<- "EOF"
|
||||||
|
# #!/bin/bash
|
||||||
|
# # Copyright (c) 2026 fithwum
|
||||||
|
# # All rights reserved
|
||||||
|
|
||||||
|
# java -jar /usr/local/bin/rcon-cli.jar --host 127.0.0.1 --port "$RCON_PORT" --password "$RCON_PASSWORD" \
|
||||||
|
# "list"
|
||||||
|
# EOF
|
||||||
|
# chmod +x connect.sh
|
||||||
|
# fi
|
||||||
|
|
||||||
# Set permissions.
|
# Set permissions.
|
||||||
chown 99:100 -R $MC_DIR
|
chown 99:100 -R $MC_DIR
|
||||||
chmod 776 -R $MC_DIR
|
chmod 776 -R $MC_DIR
|
||||||
|
|||||||
+1
-1
@@ -29,7 +29,7 @@ ARG INSTALL_SCRIPT=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/maste
|
|||||||
|
|
||||||
# Install Java & Dependencies.
|
# Install Java & Dependencies.
|
||||||
RUN apt-get -y update \
|
RUN apt-get -y update \
|
||||||
&& apt-get install -y --no-install-recommends bzip2 lsb-release jq rcon \
|
&& apt-get install -y --no-install-recommends bzip2 lsb-release jq \
|
||||||
&& apt-get -y --fix-broken install \
|
&& apt-get -y --fix-broken install \
|
||||||
&& apt-get -y autoclean \
|
&& apt-get -y autoclean \
|
||||||
&& apt-get -y autoremove \
|
&& apt-get -y autoremove \
|
||||||
|
|||||||
+11
-13
@@ -16,7 +16,6 @@ EULA_FILE=$MC_DIR/eula.txt
|
|||||||
EULA_MARKER=$MC_DIR/.eula_accepted
|
EULA_MARKER=$MC_DIR/.eula_accepted
|
||||||
|
|
||||||
SERVER_PROPERTIES=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/testing/server.properties
|
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')
|
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_SERVER_FILE=$(curl -s $VERSION_CHECK | jq --raw-output '.downloads.server.url')
|
||||||
@@ -380,27 +379,27 @@ else
|
|||||||
sleep infinity
|
sleep infinity
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [ -f /usr/local/bin/rcon-cli.jar ]; then
|
||||||
|
echo "INFO ! rcon-cli.jar found ... moving on."
|
||||||
|
else
|
||||||
|
echo "INFO ! rcon-cli.jar missing ... downloading now."
|
||||||
|
wget --no-cache --show-progress --progress=bar:force:noscroll https://github.com/LCLPYT/RconCli/releases/latest/download/rcon-cli.jar -O /usr/local/bin/rcon-cli.jar
|
||||||
|
fi
|
||||||
|
|
||||||
if [ -f connect.sh ]; then
|
if [ -f connect.sh ]; then
|
||||||
echo "INFO ! connect.sh found ... moving on."
|
echo "INFO ! connect.sh found ... moving on."
|
||||||
else
|
else
|
||||||
tee connect.sh <<-EOF
|
cat > connect.sh <<- "EOF"
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
# Copyright (c) 2026 fithwum
|
# Copyright (c) 2026 fithwum
|
||||||
# All rights reserved
|
# All rights reserved
|
||||||
|
|
||||||
exec rcon -H 127.0.0.1 -P "$RCON_PORT" -p "$RCON_PASSWORD"
|
java -jar /usr/local/bin/rcon-cli.jar --host 127.0.0.1 --port "$RCON_PORT" --password "$RCON_PASSWORD" \
|
||||||
|
"list"
|
||||||
EOF
|
EOF
|
||||||
chmod +x connect.sh
|
chmod +x connect.sh
|
||||||
fi
|
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 $MC_DIR/start.sh
|
|
||||||
# fi
|
|
||||||
|
|
||||||
# Set permissions.
|
# Set permissions.
|
||||||
chown 99:100 -R $MC_DIR
|
chown 99:100 -R $MC_DIR
|
||||||
chmod 776 -R $MC_DIR
|
chmod 776 -R $MC_DIR
|
||||||
@@ -411,7 +410,6 @@ sleep 1
|
|||||||
echo " "
|
echo " "
|
||||||
echo "INFO ! Starting Minecraft Server $MC_TYPE-$MC_VERSION"
|
echo "INFO ! Starting Minecraft Server $MC_TYPE-$MC_VERSION"
|
||||||
cd $MC_DIR
|
cd $MC_DIR
|
||||||
# exec ./start.sh
|
|
||||||
exec ./run-$MC_TYPE-$MC_VERSION.sh
|
exec ./run-$MC_TYPE-$MC_VERSION.sh
|
||||||
|
|
||||||
exit
|
exit
|
||||||
Reference in New Issue
Block a user