Add findutils, be less verbose for easier log parsing
This commit is contained in:
parent
533ceb2c2e
commit
eca3af7ffb
@ -28,7 +28,7 @@ FROM alpine:latest AS final
|
|||||||
ARG JRE_VERSION
|
ARG JRE_VERSION
|
||||||
|
|
||||||
# Build the thing up
|
# 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
|
WORKDIR /minecraft
|
||||||
COPY --from=build /minecraft .
|
COPY --from=build /minecraft .
|
||||||
CMD [ "bash", "start-server.sh" ]
|
CMD [ "bash", "start-server.sh" ]
|
||||||
|
@ -13,14 +13,15 @@ if [ -n "$FORGE_PACK_ZIP" ]; then
|
|||||||
tmpdir="$(mktemp -d)"
|
tmpdir="$(mktemp -d)"
|
||||||
pushd "$tmpdir" > /dev/null 2>&1
|
pushd "$tmpdir" > /dev/null 2>&1
|
||||||
curl -L "$FORGE_PACK_ZIP" -o pack.zip
|
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)"
|
directory="$(find . -type d -iname "mods" -execdir pwd \; | sort -n | head -n 1)"
|
||||||
if [ -z "$directory" ]; then
|
if [ -z "$directory" ]; then
|
||||||
echo "Unable to find mods directory"
|
echo "Unable to find mods directory"
|
||||||
else
|
else
|
||||||
echo "Found modpack directory: $directory"
|
echo "Found modpack directory: $directory"
|
||||||
fi
|
fi
|
||||||
rsync -av --ignore-existing "$directory"/ /minecraft/
|
rsync -a --ignore-existing "$directory"/ /minecraft/
|
||||||
popd > /dev/null 2>&1
|
popd > /dev/null 2>&1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user