Merge branch 'master' into java16

This commit is contained in:
Geoff Bourne
2021-05-21 07:31:12 -05:00
3 changed files with 5 additions and 1 deletions

View File

@@ -17,4 +17,4 @@ jobs:
./gh-md-toc --insert --no-backup README.md
- uses: stefanzweifel/git-auto-commit-action@v4.11.0
with:
commit_message: Auto update markdown TOC
commit_message: "docs: Auto update markdown TOC"

View File

@@ -1,5 +1,7 @@
FROM adoptopenjdk:16-jre
ENV APK_UPDATE=20210521
LABEL org.opencontainers.image.authors="Geoff Bourne <itzgeoff@gmail.com>"
RUN apt-get update \
@@ -84,5 +86,6 @@ RUN dos2unix /start* && chmod +x /start*
RUN dos2unix /health.sh && chmod +x /health.sh
RUN dos2unix /autopause/* && chmod +x /autopause/*.sh
ENTRYPOINT [ "/start" ]
HEALTHCHECK --start-period=1m CMD /health.sh

View File

@@ -246,3 +246,4 @@ else
exec mc-server-runner ${bootstrapArgs} ${mcServerRunnerArgs} java "${finalArgs[@]}"
fi
fi