Compare commits

..

No commits in common. "2037324375389c60b536589b4f93ce346ce8ec5d" and "e04bf4ef57ef9329ec681f0e62a38c4af7889795" have entirely different histories.

3 changed files with 156 additions and 162 deletions

View File

@ -1,36 +1,32 @@
FROM ubuntu:noble FROM ubuntu:noble
ARG UID=1000
ARG GID=1000
ENV DEBIAN_FRONTEND=noninteractive ENV DEBIAN_FRONTEND=noninteractive
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
# install prerequisites # install prerequisites
RUN apt-get update \ RUN apt update \
&& apt-get install -y --no-install-recommends \ && apt install -y --no-install-recommends \
curl \ curl ca-certificates \
ca-certificates \
jq \ jq \
libxml2-utils \ libxml2-utils \
sudo && \ && apt autoremove \
apt-get autoremove && apt-get clean && \ && apt clean \
rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
# Remove default ubuntu user # Remove default ubuntu user
RUN userdel -r ubuntu && \ RUN userdel -r ubuntu \
useradd --create-home -u 1000 minecraft && \ && useradd --create-home -u 1000 minecraft \
echo 'minecraft ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers && \ && mkdir -p /data \
mkdir -p /data && \ && chown -R 1000:1000 /data
chown -R ${UID}:${GID} /data
RUN su -c "curl -sL https://github.com/Jabba-Team/jabba/raw/main/install.sh | bash && . ~/.jabba/jabba.sh" minecraft USER minecraft
RUN curl -sL https://github.com/Jabba-Team/jabba/raw/main/install.sh | bash \
&& . ~/.jabba/jabba.sh
USER root
COPY ./scripts/init / COPY ./scripts/init /
COPY ./scripts/mc /usr/local/bin COPY ./scripts/mc /usr/local/bin
RUN chmod +x /init && chmod +x /usr/local/bin/mc RUN chmod +x /init && chmod +x /usr/local/bin/mc
USER minecraft
CMD ["/init"] CMD ["/init"]

View File

@ -3,16 +3,14 @@
PUID="${PUID:-1000}" PUID="${PUID:-1000}"
PGID="${PGID:-1000}" PGID="${PGID:-1000}"
setperms() { setperms(){
echo "Setting permissions to UID:${PUID} and GID:${PGID}" echo "Setting permissions to UID:${PUID} and GID:${PGID}"
sudo usermod -u ${PUID} minecraft >/dev/null 2>&1 usermod -u ${PUID} minecraft > /dev/null 2>&1
sudo groupmod -g ${PGID} minecraft >/dev/null 2>&1 groupmod -g ${PGID} minecraft > /dev/null 2>&1
sudo chown -R ${PUID}:${PGID} /data >/dev/null 2>&1 chown -R ${PUID}:${PGID} /data > /dev/null 2>&1
echo "DONE"
sleep 2 sleep 2
} }
setperms setperms
mc su -c "mc" minecraft

View File

@ -1,14 +1,14 @@
#!/bin/env bash #!/bin/env bash
MC_LOADER="${MC_LOADER:-"paper"}" MC_LOADER="${MC_LOADER:="paper"}"
MC_VERSION=${MC_VERSION:-"1.21.4"} MC_VERSION=${MC_VERSION:="1.21.4"}
JAVA_VERSION=${JAVA_VERSION:-"temurin@21"} JAVA_VERSION=${JAVA_VERSION:="temurin@21"}
JAR=${JAR:-"server.jar"} JAR=${JAR:="server.jar"}
MEM=${MEMORY:-2G} MEM=${MEMORY:=2G}
ADD_ARGS=${ADD_ARGS:-""} ADD_ARGS=${ADD_ARGS:=""}
RESTART=${RESTART:-"true"} RESTART=${RESTART:="true"}
crash() { crash() {
sleep 5 sleep 5
@ -22,7 +22,7 @@ setEula() {
fi fi
} }
javaCheck() { javaCheck(){
JAVA_HOME=/data/java/${JAVA_VERSION} JAVA_HOME=/data/java/${JAVA_VERSION}
if [[ -f "$HOME/.jabba/jabba.sh" ]]; then if [[ -f "$HOME/.jabba/jabba.sh" ]]; then
source $HOME/.jabba/jabba.sh source $HOME/.jabba/jabba.sh
@ -62,7 +62,7 @@ getPaper() {
fi fi
} }
getFabric() { getFabric(){
LATEST_BUILD=$(curl -s https://meta.fabricmc.net/v2/versions/loader/${MC_VERSION} | jq -s '.[] .[0] .loader .version' | tr -d '"') LATEST_BUILD=$(curl -s https://meta.fabricmc.net/v2/versions/loader/${MC_VERSION} | jq -s '.[] .[0] .loader .version' | tr -d '"')
LATEST_INSTALLER=$(curl -s https://maven.fabricmc.net/net/fabricmc/fabric-installer/maven-metadata.xml | xmllint --xpath "/metadata/versioning/latest/text()" -) LATEST_INSTALLER=$(curl -s https://maven.fabricmc.net/net/fabricmc/fabric-installer/maven-metadata.xml | xmllint --xpath "/metadata/versioning/latest/text()" -)
DL_URL=https://meta.fabricmc.net/v2/versions/loader/${MC_VERSION}/${LATEST_BUILD}/${LATEST_INSTALLER}/server/jar DL_URL=https://meta.fabricmc.net/v2/versions/loader/${MC_VERSION}/${LATEST_BUILD}/${LATEST_INSTALLER}/server/jar
@ -75,7 +75,7 @@ getFabric() {
} }
getForge() { getForge(){
LATEST_BUILD=$(curl -s https://files.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json | jq -r ".promos[\"${MC_VERSION}-latest\"]") LATEST_BUILD=$(curl -s https://files.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json | jq -r ".promos[\"${MC_VERSION}-latest\"]")
DL_BUILD=${MC_VERSION}-${LATEST_BUILD} DL_BUILD=${MC_VERSION}-${LATEST_BUILD}
DL_URL=https://maven.minecraftforge.net/net/minecraftforge/forge/$DL_BUILD/forge-$DL_BUILD-installer.jar DL_URL=https://maven.minecraftforge.net/net/minecraftforge/forge/$DL_BUILD/forge-$DL_BUILD-installer.jar
@ -98,7 +98,7 @@ getForge() {
fi fi
} }
serverSelect() { serverSelect(){
mkdir -p /data/server mkdir -p /data/server
cd /data/server cd /data/server
if [[ ! -f server.jar ]]; then if [[ ! -f server.jar ]]; then
@ -123,7 +123,7 @@ serverSelect() {
fi fi
} }
buildCommand() { buildCommand(){
JAVA_ARGS="-Xms${MEM} -Xmx${MEM}" JAVA_ARGS="-Xms${MEM} -Xmx${MEM}"
if [[ -z ${ADD_ARGS+x} ]]; then if [[ -z ${ADD_ARGS+x} ]]; then
RUN_STRING="${ADD_ARGS} ${JAVA_ARGS} -jar ${JAR} nogui" RUN_STRING="${ADD_ARGS} ${JAVA_ARGS} -jar ${JAR} nogui"
@ -132,7 +132,7 @@ buildCommand() {
fi fi
} }
runServer() { runServer(){
setEula setEula
while true; do while true; do
if [[ -f $JAR ]]; then if [[ -f $JAR ]]; then