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

Merge branch 'master' into multiarch

Browse Source
This commit is contained in:
Geoff Bourne
2021-02-06 15:21:53 -06:00
parent f06e9f5ede e7937206af
commit 0300854c46
4 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/build-multiarch.yml
+2
View File
@@ -4,10 +4,12 @@ on:
branches: branches:
- multiarch - multiarch
- multiarch-latest - multiarch-latest
- java15
- test/multiarch/* - test/multiarch/*
tags: tags:
- "[0-9]+.[0-9]+.[0-9]+-multiarch" - "[0-9]+.[0-9]+.[0-9]+-multiarch"
- "[0-9]+.[0-9]+.[0-9]+-multiarch-latest" - "[0-9]+.[0-9]+.[0-9]+-multiarch-latest"
- "[0-9]+.[0-9]+.[0-9]+-java15"
jobs: jobs:
docker-buildx: docker-buildx:
.github/workflows/main.yml
-7
View File
@@ -7,11 +7,7 @@ on:
- java8 - java8
- openj9 - openj9
- openj9-11 - openj9-11
- openj9-nightly
- adopt11 - adopt11
- adopt13
- adopt14
- adopt15
- test/* - test/*
tags: tags:
- "[0-9]+.[0-9]+.[0-9]+" - "[0-9]+.[0-9]+.[0-9]+"
@@ -20,9 +16,6 @@ on:
- "[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"
- "[0-9]+.[0-9]+.[0-9]+-adopt11" - "[0-9]+.[0-9]+.[0-9]+-adopt11"
- "[0-9]+.[0-9]+.[0-9]+-adopt13"
- "[0-9]+.[0-9]+.[0-9]+-adopt14"
- "[0-9]+.[0-9]+.[0-9]+-adopt15"
jobs: jobs:
test: test:
README.md
+21 -16
View File
@@ -160,25 +160,30 @@ the server jar remain in the `/data` directory. It is safe to remove those._
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.
| Tag name | Description | Linux | | Tag name | Java version | Linux | JVM Type | Architecture |
| -------------- | ------------------------------------------- | ------------ | | -------------- | -------------|--------|----------|-------------------|
| latest | **Default**. Uses Java version 8 | Alpine Linux | | latest | 8 | Alpine | Hotspot | amd64 |
| java8 | Uses Java 8 for Forge mod compatibility | Alpine Linux | | java8 | 8 | Alpine | Hotspot | amd64 |
| adopt15 | Uses Java version 15 from AdoptOpenJDK | Alpine Linux | | java15 | 15 | Debian | Hotspot | amd64,arm64,armv7 |
| adopt14 | Uses Java version 14 from AdoptOpenJDK | Alpine Linux | | adopt11 | 11 | Alpine | Hotspot | amd64 |
| adopt13 | Uses Java version 13 from AdoptOpenJDK | Alpine Linux | | openj9 | 8 | Alpine | OpenJ9 | amd64 |
| adopt11 | Uses Java version 11 from AdoptOpenJDK | Alpine Linux | | openj9-11 | 11 | Alpine | OpenJ9 | amd64 |
| openj9 | Uses Eclipse OpenJ9 JVM | Alpine Linux | | multiarch | 8 | Debian | Hotspot | amd64,arm64,armv7 |
| openj9-11 | Uses Eclipse OpenJ9 JVM for Java 11 | Alpine Linux | | multiarch-latest | 15+ | Debian | Hotspot | amd64,arm64,armv7 |
| openj9-nightly | Uses Eclipse OpenJ9 JVM testing builds | Alpine Linux |
| multiarch | Uses Java version 8 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 Java version 15 on any supported architecture:
docker run --name mc itzg/minecraft-server:adopt13 docker run --name mc itzg/minecraft-server:java15
Keep in mind that some versions of Minecraft server can't work on the newest versions of Java. Also, FORGE doesn't support openj9 JVM implementation. > Keep in mind that some versions of Minecraft server can't work on the newest versions of Java. Also, FORGE doesn't support openj9 JVM implementation.
### Deprecated Image Tags
The following image tags have been deprecated and are no longer receiving updates:
- adopt13
- adopt14
- adopt15
- openj9-nightly
## Healthcheck ## Healthcheck
docker-versions-create.sh
+1 -1
View File
@@ -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=('openj9' 'openj9-11' 'adopt11' 'java15' 'multiarch' 'multiarch-latest')
function TrapExit { function TrapExit {
echo "Checking out back in master" echo "Checking out back in master"