amorfo77/docker-minecraft-server
1
0
Fork 0
mirror of https://github.com/itzg/docker-minecraft-server.git synced 2026-08-30 02:37:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into java16

Browse Source
This commit is contained in:
Geoff Bourne
2021-05-21 07:31:12 -05:00
parent d8786d4785 853a9884d7
commit c608c8a57e
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/generate-toc.yml
+1 -1
View File
@@ -17,4 +17,4 @@ jobs:
./gh-md-toc --insert --no-backup README.md ./gh-md-toc --insert --no-backup README.md
- uses: stefanzweifel/git-auto-commit-action@v4.11.0 - uses: stefanzweifel/git-auto-commit-action@v4.11.0
with: with:
commit_message: Auto update markdown TOC commit_message: "docs: Auto update markdown TOC"
Dockerfile
+3
View File
@@ -1,5 +1,7 @@
FROM adoptopenjdk:16-jre FROM adoptopenjdk:16-jre
ENV APK_UPDATE=20210521
LABEL org.opencontainers.image.authors="Geoff Bourne <itzgeoff@gmail.com>" LABEL org.opencontainers.image.authors="Geoff Bourne <itzgeoff@gmail.com>"
RUN apt-get update \ RUN apt-get update \
@@ -84,5 +86,6 @@ RUN dos2unix /start* && chmod +x /start*
RUN dos2unix /health.sh && chmod +x /health.sh RUN dos2unix /health.sh && chmod +x /health.sh
RUN dos2unix /autopause/* && chmod +x /autopause/*.sh RUN dos2unix /autopause/* && chmod +x /autopause/*.sh
ENTRYPOINT [ "/start" ] ENTRYPOINT [ "/start" ]
HEALTHCHECK --start-period=1m CMD /health.sh HEALTHCHECK --start-period=1m CMD /health.sh
start-minecraftFinalSetup
+1
View File
@@ -246,3 +246,4 @@ else
exec mc-server-runner ${bootstrapArgs} ${mcServerRunnerArgs} java "${finalArgs[@]}" exec mc-server-runner ${bootstrapArgs} ${mcServerRunnerArgs} java "${finalArgs[@]}"
fi fi
fi fi