diff --git a/.github/workflows/build-multiarch.yml b/.github/workflows/build-multiarch.yml index 135b74e4..7582baef 100644 --- a/.github/workflows/build-multiarch.yml +++ b/.github/workflows/build-multiarch.yml @@ -3,15 +3,19 @@ on: push: branches: - master - - multiarch - - multiarch-latest - - java15 + - "*-multiarch" + - "multiarch*" + - java8-openj9 + - java11* + - java15* - 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]+-multiarch*" + - "[0-9]+.[0-9]+.[0-9]+-*multiarch" + - "[0-9]+.[0-9]+.[0-9]+-java8-openj9" + - "[0-9]+.[0-9]+.[0-9]+-java11*" - "[0-9]+.[0-9]+.[0-9]+-java15" - "[0-9]+.[0-9]+.[0-9]+-java16*" paths-ignore: @@ -22,6 +26,8 @@ on: jobs: docker-buildx: runs-on: ubuntu-20.04 + env: + CACHE_NAME: master steps: - name: Checkout uses: actions/checkout@v2.3.4 @@ -44,9 +50,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 diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d402dcdc..00bc22bb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -29,6 +29,8 @@ jobs: needs: - test runs-on: ubuntu-20.04 + env: + CACHE_NAME: master steps: - uses: actions/checkout@v2.3.4 @@ -60,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 diff --git a/README.md b/README.md index 04bfa0b1..84bf2a6a 100644 --- a/README.md +++ b/README.md @@ -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) - + @@ -268,22 +268,20 @@ the server jar remain in the `/data` directory. It is safe to remove those._ ## Running Minecraft server on different Java version -> **NOTE** [as of snapshot 21W19A](https://www.minecraft.net/en-us/article/minecraft-snapshot-21w19a), Java 16 is now required. Please use `itzg/minecraft-server:java16` for that version and newer. Consideration of changing the `latest` will be made after 1.17 releases. - To use a different version of Java, please use a docker tag to run your Minecraft server. | Tag name | Java version | Linux | JVM Type | Architecture | | -------------- | -------------|--------|----------|-------------------| | 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 | +| java8-openj9 | 8 | Debian | OpenJ9 | amd64 | +| java11 | 11 | Debian | Hotspot | amd64,arm64,armv7 | +| java11-openj9 | 11 | Debian | OpenJ9 | amd64 | | java15 | 15 | Debian | Hotspot | amd64,arm64,armv7 | | 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 | -| multiarch | 11 | Debian | Hotspot | amd64,arm64,armv7 | +| java16-openj9 | 16 | Debian | OpenJ9 | amd64 | | multiarch-latest | 15+ | Debian | Hotspot | amd64,arm64,armv7 | For example, to use Java version 15 on any supported architecture: @@ -466,7 +464,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 @@ -1336,9 +1334,7 @@ The following environment variables define the behaviour of auto-pausing: ## Running on RaspberryPi -To run this image on a RaspberryPi 3 B+, 4, or newer, use any of the image tags [list in the Java version section](#running-minecraft-server-on-different-java-version) that specify `armv7` for the architecture, such as - - itzg/minecraft-server:multiarch +To run this image on a RaspberryPi 3 B+, 4, or newer, use any of the image tags [list in the Java version section](#running-minecraft-server-on-different-java-version) that specify `armv7` for the architecture, which includes `itzg/minecraft-server:latest`. > NOTE: you may need to lower the memory allocation, such as `-e MEMORY=750m` diff --git a/docker-versions-create.sh b/docker-versions-create.sh index b006f6aa..81a7bdcd 100755 --- a/docker-versions-create.sh +++ b/docker-versions-create.sh @@ -4,13 +4,12 @@ branches_list=( 'java8' 'java8-multiarch' - 'openj9' - 'openj9-11' - 'adopt11' + 'java8-openj9' + 'java11' + 'java11-openj9' 'java15' 'java16' 'java16-openj9' - 'multiarch' 'multiarch-latest' ) diff --git a/start-deployMohist b/start-deployMohist index 0cc96484..21267eb8 100644 --- a/start-deployMohist +++ b/start-deployMohist @@ -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 diff --git a/tests/docker-compose.test.yml b/tests/docker-compose.test.yml index ed96ba50..bc6fc775 100644 --- a/tests/docker-compose.test.yml +++ b/tests/docker-compose.test.yml @@ -10,6 +10,9 @@ services: restart: "no" build: context: .. + args: + TARGETOS: linux + TARGETARCH: amd64 cache_from: - itzg/minecraft-server:latest environment: