diff --git a/Dockerfile b/Dockerfile index cf65c37..bb02507 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,8 @@ -FROM fedora:38 +FROM debian:bookworm-slim -RUN dnf update -y && dnf install -y java-latest-openjdk +RUN apt update -y && apt upgrade + +RUN apt install -y curl default-jdk EXPOSE 25565 ARG UID=1000 @@ -9,7 +11,7 @@ ARG UNAME=minecraft ARG DATA_DIR=/data ARG LAUNCHER_DIR=/opt ARG LOADER_VERSION=0.14.22 -ARG MINECRAFT_VERSION=1.20.1 +ARG MINECRAFT_VERSION=1.20.2 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 diff --git a/build.sh b/build.sh index ba914cb..3326053 100755 --- a/build.sh +++ b/build.sh @@ -1,5 +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 +podman manifest push --format v2s2 $MANIFEST_NAME diff --git a/env b/env index a643345..c959376 100644 --- a/env +++ b/env @@ -1,3 +1,3 @@ LOADER_VERSION=0.14.22 -MINECRAFT_VERSION=1.20.1 +MINECRAFT_VERSION=1.20.2 LAUNCHER_VERSION=0.11.2