mirror of
https://github.com/itzg/docker-minecraft-server.git
synced 2026-09-01 19:57:14 +00:00
Upgraded mainline/latest to Java 11
This commit is contained in:
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
FROM openjdk:8u212-jre-alpine
|
FROM adoptopenjdk/openjdk11:alpine-jre
|
||||||
|
|
||||||
LABEL org.opencontainers.image.authors="Geoff Bourne <itzgeoff@gmail.com>"
|
LABEL org.opencontainers.image.authors="Geoff Bourne <itzgeoff@gmail.com>"
|
||||||
|
|
||||||
|
|||||||
@@ -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