From 20211d4a39faefdb4be80f3f280d7df4f60f8652 Mon Sep 17 00:00:00 2001 From: fluo10 Date: Wed, 20 Sep 2023 08:01:42 +0900 Subject: [PATCH] Add build script and small fix --- Dockerfile | 9 ++++++--- build.sh | 5 +++++ env | 3 +++ 3 files changed, 14 insertions(+), 3 deletions(-) create mode 100755 build.sh create mode 100644 env diff --git a/Dockerfile b/Dockerfile index e911bf6..cf65c37 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,13 +8,16 @@ ARG GID=1000 ARG UNAME=minecraft ARG DATA_DIR=/data ARG LAUNCHER_DIR=/opt -ARG LAUNCHER_URL=https://meta.fabricmc.net/v2/versions/loader/1.20.1/0.14.22/0.11.2/server/jar -ARG LAUNCHER_NAME=fabric-server-mc.1.20.1-loader.0.14.22-launcher.0.11.2.jar +ARG LOADER_VERSION=0.14.22 +ARG MINECRAFT_VERSION=1.20.1 +ARG LAUNCHER_VERSION=0.11.2 +ARG LAUNCHER_URL=https://meta.fabricmc.net/v2/versions/loader/$MINECRAFT_VERSION/$LOADER_VERSION/$LAUNCHER_VERSION/server/jar +ENV LAUNCHER_NAME=fabric-server-mc.$MINECRAFT_VERSION-loader.$LOADER_VERSION-launcher.$LAUNCHER_VERSION.jar RUN groupadd -g $GID $UNAME; useradd -u $UID -g $UNAME -d $DATA_DIR $UNAME WORKDIR $LAUNCHER_DIR RUN curl -OJ $LAUNCHER_URL WORKDIR $DATA_DIR #RUN java -Xmx2G -jar $LAUNCHER_DIR/$LAUNCHER_NAME --nogui --initSettings; echo eula=true > eula.txt -CMD java -Xmx2G -jar $LAUNCHER_DIR/$LAUNCHER_NAME --nogui +CMD java -jar "/opt/$LAUNCHER_NAME" --nogui diff --git a/build.sh b/build.sh new file mode 100755 index 0000000..ba914cb --- /dev/null +++ b/build.sh @@ -0,0 +1,5 @@ +source ./env +MANIFEST_NAME=gitea.home.fireturtle.net/fluo10/fabricmc:mc.$MINECRAFT_VERSION-loader.$LOADER_VERSION-launcher.$LAUNCHER_VERSION +podman buildx build --platform linux/amd64,linux/arm64 --manifest $MANIFEST_NAME --format docker --build-arg-file=./env . +# podman manifest push $MANIFEST_NAME + diff --git a/env b/env new file mode 100644 index 0000000..a643345 --- /dev/null +++ b/env @@ -0,0 +1,3 @@ +LOADER_VERSION=0.14.22 +MINECRAFT_VERSION=1.20.1 +LAUNCHER_VERSION=0.11.2