mirror of
https://github.com/itzg/docker-minecraft-server.git
synced 2026-02-26 02:56:24 +00:00
Merge branch 'master' into java16
This commit is contained in:
2
.github/workflows/generate-toc.yml
vendored
2
.github/workflows/generate-toc.yml
vendored
@@ -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"
|
||||
@@ -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
|
||||
|
||||
@@ -246,3 +246,4 @@ else
|
||||
exec mc-server-runner ${bootstrapArgs} ${mcServerRunnerArgs} java "${finalArgs[@]}"
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
Reference in New Issue
Block a user