Add findutils, be less verbose for easier log parsing

This commit is contained in:
Salt 2022-05-26 22:05:42 -05:00
parent 533ceb2c2e
commit eca3af7ffb
2 changed files with 4 additions and 3 deletions

View File

@ -28,7 +28,7 @@ FROM alpine:latest AS final
ARG JRE_VERSION
# Build the thing up
RUN apk add bash curl rsync screen "${JRE_VERSION}"
RUN apk add bash curl findutils rsync screen "${JRE_VERSION}"
WORKDIR /minecraft
COPY --from=build /minecraft .
CMD [ "bash", "start-server.sh" ]

View File

@ -13,14 +13,15 @@ if [ -n "$FORGE_PACK_ZIP" ]; then
tmpdir="$(mktemp -d)"
pushd "$tmpdir" > /dev/null 2>&1
curl -L "$FORGE_PACK_ZIP" -o pack.zip
unzip pack.zip
unzip -q pack.zip
ls -alh
directory="$(find . -type d -iname "mods" -execdir pwd \; | sort -n | head -n 1)"
if [ -z "$directory" ]; then
echo "Unable to find mods directory"
else
echo "Found modpack directory: $directory"
fi
rsync -av --ignore-existing "$directory"/ /minecraft/
rsync -a --ignore-existing "$directory"/ /minecraft/
popd > /dev/null 2>&1
fi