amorfo77/docker-minecraft-server
1
0
Fork 0
mirror of https://github.com/itzg/docker-minecraft-server.git synced 2026-03-04 05:46:24 +00:00
Code Issues Projects Releases Wiki Activity

Merged latest from master

Browse Source
This commit is contained in:
Geoff Bourne
2021-01-30 16:48:11 -06:00
parent 2d07dee4df 4a7f838a0f
commit b8806629ec
4 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

7
README.md
View File

@@ -158,11 +158,12 @@ the server jar remain in the `/data` directory. It is safe to remove those._
## Running Minecraft server on different Java version
To use a different version of Java, please use a docker tag to run your Minecraft server.
To use a different version of Java, please use a docker tag to run your Minecraft server, where the tag is appended to the image such as `itzg/minecraft-server:TAG_NAME`.
| Tag name | Description | Linux |
| -------------- | ------------------------------------------- | ------------ |
| latest | **Default**. Uses Java version 8 | Alpine Linux |
| latest | **Default**. Uses AdoptOpenJDK version 11 | Alpine Linux |
| forge | Uses Java 8 for 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 |
@@ -170,7 +171,7 @@ To use a different version of Java, please use a docker tag to run your Minecraf
| openj9 | Uses Eclipse OpenJ9 JVM | Alpine Linux |
| openj9-11 | Uses Eclipse OpenJ9 JVM for Java 11 | Alpine Linux |
| openj9-nightly | Uses Eclipse OpenJ9 JVM testing builds | Alpine Linux |
| multiarch | Uses Java version 8 latest update | Debian Linux |
| multiarch | Uses Java version 8 | Debian Linux |
| multiarch-latest | Uses Java version 15 latest update | Debian Linux |
For example, to use a Java version 13:

2
docker-versions-create.sh
View File

@@ -1,7 +1,7 @@
#!/bin/bash
#set -x
# Use this variable to indicate a list of branches that docker hub is watching
branches_list=('openj9' 'openj9-11' 'openj9-nightly' 'adopt11' 'adopt13' 'adopt14' 'adopt15' 'multiarch' 'multiarch-latest')
branches_list=('forge' 'openj9' 'openj9-11' 'openj9-nightly' 'adopt11' 'adopt13' 'adopt14' 'adopt15' 'multiarch' 'multiarch-latest')
function TrapExit {
echo "Checking out back in master"

4
start-configuration
View File

@@ -95,6 +95,10 @@ case "${TYPE^^}" in
;;
FORGE)
log "**********************************************************************"
log "WARNING: Use the image tag itzg/minecraft-server:forge"
log " since some mods require Java 8"
log "**********************************************************************"
exec ${SCRIPTS:-/}start-deployForge "$@"
;;