diff --git a/Dockerfile b/Dockerfile index 88f8e20..0cdefb7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM alpine:latest AS build # Args ARG MINECRAFT_VERSION="1.16.5" -ARG FORGE_VERSION="36.1.13" +ARG FORGE_VERSION="36.2.22" # The actual setup work COPY start-server.sh /minecraft/start-server.sh diff --git a/build.sh b/build.sh index ca1cc9a..e2f1001 100755 --- a/build.sh +++ b/build.sh @@ -10,7 +10,7 @@ declare -a mcversions=( # Forge version dictionary (we only support one version per) declare -A forgeversions=( - ["1.16.5"]="36.1.13" + ["1.16.5"]="36.2.22" ) # Build images diff --git a/start-server.sh b/start-server.sh index 67b75e5..db1244f 100755 --- a/start-server.sh +++ b/start-server.sh @@ -16,7 +16,7 @@ if [ -n "$FORGE_PACK_ZIP" ]; then unzip pack.zip directory="$(find . -type d -iname "mods" -execdir pwd \; | sort -n | head -n 1)" echo "Found modpack directory: $directory" - rsync -av "$directory"/ /minecraft/ + rsync -av --ignore-existing "$directory"/ /minecraft/ popd > /dev/null 2>&1 fi @@ -27,7 +27,7 @@ if [ -n "$CONFIG_REPO" ]; then pushd "$tmpdir" > /dev/null 2>&1 git clone "$CONFIG_REPO" . rm -rf .git - rsync -av ./ /minecraft/ + rsync -av --delete ./ /minecraft/ popd > /dev/null 2>&1 fi