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

ci: introduced CACHE_NAME

Browse Source
This commit is contained in:
Geoff Bourne
2021-05-21 22:09:49 -05:00
parent 07e9d59f50 e027a81317
commit 25d12d9b2c
8 changed files with 33 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,16 +2,20 @@ name: Build and publish multiarch
on:
push:
branches:
- multiarch
- multiarch-latest
- master
- "*-multiarch"
- "multiarch*"
- java11
- java15
- java16
- java16*
- test/multiarch/*
tags:
- "[0-9]+.[0-9]+.[0-9]+-multiarch"
- "[0-9]+.[0-9]+.[0-9]+-multiarch-latest"
- "[0-9]+.[0-9]+.[0-9]+"
- "[0-9]+.[0-9]+.[0-9]+-multiarch*"
- "[0-9]+.[0-9]+.[0-9]+-*multiarch"
- "[0-9]+.[0-9]+.[0-9]+-java11"
- "[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/**"
@@ -20,6 +24,8 @@ on:
jobs:
docker-buildx:
runs-on: ubuntu-20.04
env:
CACHE_NAME: multiarch-latest
steps:
- name: Checkout
uses: actions/checkout@v2.3.4
@@ -33,6 +39,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
@@ -41,9 +48,10 @@ jobs:
uses: actions/cache@v2.1.5
with:
path: /tmp/.buildx-cache
key: ${{ runner.os }}-buildx-${{ steps.meta.outputs.version }}-${{ github.sha }}
key: ${{ runner.os }}-buildx-${{ env.CACHE_NAME }}-${{ github.sha }}
restore-keys: |
${{ runner.os }}-buildx-${{ steps.meta.outputs.version }}-
${{ runner.os }}-buildx-${{ env.CACHE_NAME }}-
${{ runner.os }}-buildx-
- name: Set up QEMU
uses: docker/setup-qemu-action@v1.1.0

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"

8
.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"
@@ -31,6 +29,8 @@ jobs:
needs:
- test
runs-on: ubuntu-20.04
env:
CACHE_NAME: multiarch-latest
steps:
- uses: actions/checkout@v2.3.4
@@ -62,9 +62,9 @@ jobs:
uses: actions/cache@v2.1.5
with:
path: /tmp/.buildx-cache
key: ${{ runner.os }}-buildx-${{ steps.prep.outputs.cache_version }}-${{ github.sha }}
key: ${{ runner.os }}-buildx-${{ env.CACHE_NAME }}-${{ github.sha }}
restore-keys: |
${{ runner.os }}-buildx-${{ steps.prep.outputs.cache_version }}-
${{ runner.os }}-buildx-${{ env.CACHE_NAME }}-
${{ runner.os }}-buildx-
- name: Login to DockerHub

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

9
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: Sat May 22 03:05:38 UTC 2021 -->
<!--te-->
@@ -274,12 +274,13 @@ 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 |
| edge | 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 |
| adopt11 | 11 | Alpine | Hotspot | amd64 |
| openj9 | 8 | Alpine | OpenJ9 | amd64 |
| openj9-11 | 11 | Alpine | OpenJ9 | amd64 |
@@ -466,7 +467,7 @@ A [Magma](https://magmafoundation.org/) server, which is a combination of Forge
### Running a Mohist server
A [Mohist](https://github.com/Mohist-Community/Mohist) server can be used with
A [Mohist](https://github.com/MohistMC/Mohist) server can be used with
-e TYPE=MOHIST

4
docker-versions-create.sh
View File

@@ -6,10 +6,10 @@ branches_list=(
'java8-multiarch'
'openj9'
'openj9-11'
'adopt11'
'java11'
'java15'
'java15-openj9'
'java16'
'java16-openj9'
'multiarch'
'multiarch-latest'
)

6
start-deployMohist
View File

@@ -8,12 +8,12 @@ isDebugging && set -x
requireVar VANILLA_VERSION
: ${MOHIST_BUILD:=lastSuccessfulBuild}
mohistJobs=https://ci.codemc.io/job/Mohist-Community/job/
mohistJobs=https://ci.codemc.io/job/MohistMC/job/
mohistJob=${mohistJobs}Mohist-${VANILLA_VERSION}/
if ! curl -X HEAD -o /dev/null -fsSL "${mohistJob}"; then
log "ERROR: mohist builds do not exist for ${VANILLA_VERSION}"
log " check https://ci.codemc.io/job/Mohist-Community/ for available versions"
log " check https://ci.codemc.io/job/MohistMC/ for available versions"
log " and set VERSION accordingly"
exit 1
fi
@@ -26,7 +26,7 @@ buildRelPath=$(
baseName=$(basename "${buildRelPath}")
if [[ ${baseName} != *-server.jar* ]]; then
log "ERROR: mohist build for ${VANILLA_VERSION} is not a valid server jar, found ${baseName}"
log " check https://ci.codemc.io/job/Mohist-Community/ for available versions"
log " check https://ci.codemc.io/job/MohistMC/ for available versions"
log " and set VERSION accordingly"
exit 1
fi

1
start-minecraftFinalSetup
View File

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