amorfo77/docker-minecraft-server
1
0
Fork 0
mirror of https://github.com/itzg/docker-minecraft-server.git synced 2026-04-16 10:38:52 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into java8

Browse Source 
# Conflicts:
#	README.md
#	start-configuration
This commit is contained in:
Geoff Bourne
2021-01-30 18:55:19 -06:00
parent b8806629ec 5700f36a6f
commit 7814ca21b5
4 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/main.yml vendored
View File

@@ -4,7 +4,7 @@ on:
push:
branches:
- master
- forge
- java8
- openj9
- openj9-11
- openj9-nightly
@@ -15,7 +15,7 @@ on:
- test/*
tags:
- "[0-9]+.[0-9]+.[0-9]+"
- "[0-9]+.[0-9]+.[0-9]+-forge"
- "[0-9]+.[0-9]+.[0-9]+-java8"
- "[0-9]+.[0-9]+.[0-9]+-openj9"
- "[0-9]+.[0-9]+.[0-9]+-openj9-11"
- "[0-9]+.[0-9]+.[0-9]+-openj9-nightly"

3
Dockerfile
View File

@@ -77,9 +77,6 @@ ENV UID=1000 GID=1000 \
ENABLE_AUTOPAUSE=false AUTOPAUSE_TIMEOUT_EST=3600 AUTOPAUSE_TIMEOUT_KN=120 AUTOPAUSE_TIMEOUT_INIT=600 \
AUTOPAUSE_PERIOD=10 AUTOPAUSE_KNOCK_INTERFACE=eth0
# preset the server type
ENV TYPE=FORGE
COPY start* /
COPY health.sh /
ADD files/autopause /autopause

4
README.md
View File

@@ -162,8 +162,8 @@ To use a different version of Java, please use a docker tag to run your Minecraf
| Tag name | Description | Linux |
| -------------- | ------------------------------------------- | ------------ |
| latest | **Default**. Uses AdoptOpenJDK version 11 | Alpine Linux |
| forge | Uses Java 8 for mod compatibility | Alpine Linux |
| latest | **Default**. Uses Java version 8 | Alpine Linux |
| java8 | Uses Java 8 for Forge mod compatibility | Alpine Linux |
| adopt15 | Uses Java version 15 from AdoptOpenJDK | Alpine Linux |
| adopt14 | Uses Java version 14 from AdoptOpenJDK | Alpine Linux |
| adopt13 | Uses Java version 13 from AdoptOpenJDK | Alpine Linux |

2
start-configuration
View File

@@ -96,7 +96,7 @@ case "${TYPE^^}" in
FORGE)
log "**********************************************************************"
log "WARNING: Use the image tag itzg/minecraft-server:forge"
log "WARNING: The image tag itzg/minecraft-server:java8 is recommended"
log " since some mods require Java 8"
log "**********************************************************************"
exec ${SCRIPTS:-/}start-deployForge "$@"