Merge branch 'openjdk11' of gitlab.com:rehashedsalt/docker-minecraft into openjdk11

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

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

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