salt/docker-minecraft
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Salt 2022-01-02 10:59:00 -06:00
commit b4fc6a2654
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -3,7 +3,7 @@ FROM alpine:latest AS build
# Args # Args
ARG MINECRAFT_VERSION="1.16.5" ARG MINECRAFT_VERSION="1.16.5"
ARG FORGE_VERSION="36.1.13" ARG FORGE_VERSION="36.2.22"
# The actual setup work # The actual setup work
COPY start-server.sh /minecraft/start-server.sh COPY start-server.sh /minecraft/start-server.sh

2
build.sh
View File

@ -10,7 +10,7 @@ declare -a mcversions=(
# Forge version dictionary (we only support one version per) # Forge version dictionary (we only support one version per)
declare -A forgeversions=( declare -A forgeversions=(
["1.16.5"]="36.1.13" ["1.16.5"]="36.2.22"
) )
# Build images # Build images

4
start-server.sh
View File

@ -16,7 +16,7 @@ if [ -n "$FORGE_PACK_ZIP" ]; then
unzip pack.zip unzip pack.zip
directory="$(find . -type d -iname "mods" -execdir pwd \; | sort -n | head -n 1)" directory="$(find . -type d -iname "mods" -execdir pwd \; | sort -n | head -n 1)"
echo "Found modpack directory: $directory" echo "Found modpack directory: $directory"
rsync -av "$directory"/ /minecraft/ rsync -av --ignore-existing "$directory"/ /minecraft/
popd > /dev/null 2>&1 popd > /dev/null 2>&1
fi fi
@ -27,7 +27,7 @@ if [ -n "$CONFIG_REPO" ]; then
pushd "$tmpdir" > /dev/null 2>&1 pushd "$tmpdir" > /dev/null 2>&1
git clone "$CONFIG_REPO" . git clone "$CONFIG_REPO" .
rm -rf .git rm -rf .git
rsync -av ./ /minecraft/ rsync -av --delete ./ /minecraft/
popd > /dev/null 2>&1 popd > /dev/null 2>&1
fi fi