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

Merge branch 'master' into java16-openj9

Browse Source 
# Conflicts:
#	.github/workflows/build-multiarch.yml
#	Dockerfile
This commit is contained in:
Geoff Bourne
2021-05-21 16:46:51 -05:00
parent 581b514970 cb17180dea
commit 7229c40202
7 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.github/workflows/build-multiarch.yml vendored
View File

@@ -2,16 +2,18 @@ name: Build and publish multiarch
on:
push:
branches:
- master
- multiarch
- multiarch-latest
- java15
- java16
- java16*
- test/multiarch/*
tags:
- "[0-9]+.[0-9]+.[0-9]+"
- "[0-9]+.[0-9]+.[0-9]+-multiarch"
- "[0-9]+.[0-9]+.[0-9]+-multiarch-latest"
- "[0-9]+.[0-9]+.[0-9]+-java15"
- "[0-9]+.[0-9]+.[0-9]+-java16"
- "[0-9]+.[0-9]+.[0-9]+-java16*"
paths-ignore:
- "*.md"
- "docs/**"
@@ -33,6 +35,7 @@ jobs:
tags: |
type=ref,event=branch
type=ref,event=tag
type=edge,branch=master
- name: Setup Docker Buildx
uses: docker/setup-buildx-action@v1

2
.github/workflows/generate-toc.yml vendored
View File

@@ -17,4 +17,4 @@ jobs:
./gh-md-toc --insert --no-backup README.md
- uses: stefanzweifel/git-auto-commit-action@v4.11.0
with:
commit_message: Auto update markdown TOC
commit_message: "docs: Auto update markdown TOC"

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

@@ -3,14 +3,12 @@ name: Build and Publish
on:
push:
branches:
- master
- java8
- openj9
- openj9-11
- adopt11
- test/*
tags:
- "[0-9]+.[0-9]+.[0-9]+"
- "[0-9]+.[0-9]+.[0-9]+-java8"
- "[0-9]+.[0-9]+.[0-9]+-openj9"
- "[0-9]+.[0-9]+.[0-9]+-openj9-11"

1
Dockerfile
View File

@@ -84,5 +84,6 @@ RUN dos2unix /start* && chmod +x /start*
RUN dos2unix /health.sh && chmod +x /health.sh
RUN dos2unix /autopause/* && chmod +x /autopause/*.sh
ENTRYPOINT [ "/start" ]
HEALTHCHECK --start-period=1m CMD /health.sh

6
README.md
View File

@@ -143,7 +143,7 @@ By default, the container will download the latest version of the "vanilla" [Min
* [Enabling Autopause](#enabling-autopause)
* [Running on RaspberryPi](#running-on-raspberrypi)
<!-- Added by: runner, at: Thu May 20 01:17:11 UTC 2021 -->
<!-- Added by: runner, at: Fri May 21 12:45:51 UTC 2021 -->
<!--te-->
@@ -274,12 +274,12 @@ To use a different version of Java, please use a docker tag to run your Minecraf
| Tag name | Java version | Linux | JVM Type | Architecture |
| -------------- | -------------|--------|----------|-------------------|
| latest | 11 | Alpine | Hotspot | amd64 |
| latest | 16 | Debian | Hotspot | amd64,arm64,armv7 |
| java8 | 8 | Alpine | Hotspot | amd64 |
| java8-multiarch | 8 | Debian | Hotspot | amd64,arm64,armv7 |
| java15 | 15 | Debian | Hotspot | amd64,arm64,armv7 |
| java15-openj9 | 15 | Debian | OpenJ9 | amd64,arm64 |
| java16 | 16 | Debian | Hotspot | amd64,arm64,armv7 |
| java16-openj9 | 16 | Debian | OpenJ9 | amd64,arm64,armv7 |
| adopt11 | 11 | Alpine | Hotspot | amd64 |
| openj9 | 8 | Alpine | OpenJ9 | amd64 |
| openj9-11 | 11 | Alpine | OpenJ9 | amd64 |

2
docker-versions-create.sh
View File

@@ -8,8 +8,8 @@ branches_list=(
'openj9-11'
'adopt11'
'java15'
'java15-openj9'
'java16'
'java16-openj9'
'multiarch'
'multiarch-latest'
)

1
start-minecraftFinalSetup
View File

@@ -246,3 +246,4 @@ else
exec mc-server-runner ${bootstrapArgs} ${mcServerRunnerArgs} java "${finalArgs[@]}"
fi
fi