mirror of
https://github.com/itzg/docker-minecraft-server.git
synced 2026-11-22 06:34:21 +00:00
Merged latest from master
This commit is contained in:
commit
b8806629ec
4 files changed
+11
-4
No files matched your search
@@ -4,6 +4,7 @@ on:
|
|||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- master
|
- master
|
||||||
|
- forge
|
||||||
- openj9
|
- openj9
|
||||||
- openj9-11
|
- openj9-11
|
||||||
- openj9-nightly
|
- openj9-nightly
|
||||||
@@ -14,6 +15,7 @@ on:
|
|||||||
- test/*
|
- test/*
|
||||||
tags:
|
tags:
|
||||||
- "[0-9]+.[0-9]+.[0-9]+"
|
- "[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"
|
||||||
- "[0-9]+.[0-9]+.[0-9]+-openj9-11"
|
- "[0-9]+.[0-9]+.[0-9]+-openj9-11"
|
||||||
- "[0-9]+.[0-9]+.[0-9]+-openj9-nightly"
|
- "[0-9]+.[0-9]+.[0-9]+-openj9-nightly"
|
||||||
|
|||||||
@@ -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
|
## 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 |
|
| 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 |
|
| adopt15 | Uses Java version 15 from AdoptOpenJDK | Alpine Linux |
|
||||||
| adopt14 | Uses Java version 14 from AdoptOpenJDK | Alpine Linux |
|
| adopt14 | Uses Java version 14 from AdoptOpenJDK | Alpine Linux |
|
||||||
| adopt13 | Uses Java version 13 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 | Uses Eclipse OpenJ9 JVM | Alpine Linux |
|
||||||
| openj9-11 | Uses Eclipse OpenJ9 JVM for Java 11 | Alpine Linux |
|
| openj9-11 | Uses Eclipse OpenJ9 JVM for Java 11 | Alpine Linux |
|
||||||
| openj9-nightly | Uses Eclipse OpenJ9 JVM testing builds | 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 |
|
| multiarch-latest | Uses Java version 15 latest update | Debian Linux |
|
||||||
|
|
||||||
For example, to use a Java version 13:
|
For example, to use a Java version 13:
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
#set -x
|
#set -x
|
||||||
# Use this variable to indicate a list of branches that docker hub is watching
|
# 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 {
|
function TrapExit {
|
||||||
echo "Checking out back in master"
|
echo "Checking out back in master"
|
||||||
|
|||||||
@@ -95,6 +95,10 @@ case "${TYPE^^}" in
|
|||||||
;;
|
;;
|
||||||
|
|
||||||
FORGE)
|
FORGE)
|
||||||
|
log "**********************************************************************"
|
||||||
|
log "WARNING: Use the image tag itzg/minecraft-server:forge"
|
||||||
|
log " since some mods require Java 8"
|
||||||
|
log "**********************************************************************"
|
||||||
exec ${SCRIPTS:-/}start-deployForge "$@"
|
exec ${SCRIPTS:-/}start-deployForge "$@"
|
||||||
;;
|
;;
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user