From b806ea687152251ad7e34ae50e970afde90d1602 Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Fri, 21 May 2021 16:53:22 -0500 Subject: [PATCH 01/18] docs: adoptopenjdk:16-openj9 is only available on amd64 #885 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 04bfa0b1..d084f23b 100644 --- a/README.md +++ b/README.md @@ -279,7 +279,7 @@ To use a different version of Java, please use a docker tag to run your Minecraf | java8-multiarch | 8 | Debian | Hotspot | amd64,arm64,armv7 | | java15 | 15 | Debian | Hotspot | amd64,arm64,armv7 | | java16 | 16 | Debian | Hotspot | amd64,arm64,armv7 | -| java16-openj9 | 16 | Debian | OpenJ9 | 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 | From e8f8d8b4d4caa478b0dcf255aef98143f2b22168 Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Fri, 21 May 2021 16:58:52 -0500 Subject: [PATCH 02/18] ci: introduced CACHE_NAME --- .github/workflows/build-multiarch.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-multiarch.yml b/.github/workflows/build-multiarch.yml index 1e8406d8..128f4199 100644 --- a/.github/workflows/build-multiarch.yml +++ b/.github/workflows/build-multiarch.yml @@ -22,6 +22,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 +46,9 @@ 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 }}- - name: Set up QEMU uses: docker/setup-qemu-action@v1.1.0 From 93cd299c77637d2045a3fd09f014c9d8c0a43321 Mon Sep 17 00:00:00 2001 From: itzg Date: Fri, 21 May 2021 21:59:13 +0000 Subject: [PATCH 03/18] docs: Auto update markdown TOC --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d084f23b..e4212b1e 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) - + From a5fe016854c2792be2eed52a59dd2e3d4fa03aab Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Fri, 21 May 2021 17:00:50 -0500 Subject: [PATCH 04/18] docs: added edge tag to image versions section --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index e4212b1e..e626021b 100644 --- a/README.md +++ b/README.md @@ -275,6 +275,7 @@ 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 | 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 | From 9bd6bc64b04d54d198f0fd9c1d5299cae76483c9 Mon Sep 17 00:00:00 2001 From: itzg Date: Fri, 21 May 2021 22:01:17 +0000 Subject: [PATCH 05/18] docs: Auto update markdown TOC --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e626021b..7ed0a083 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) - + From c9815e2ccb3fab890ea74266834e25032b6f6c40 Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Fri, 21 May 2021 17:04:11 -0500 Subject: [PATCH 06/18] ci: use CACHE_NAME in main.yml --- .github/workflows/build-multiarch.yml | 1 + .github/workflows/main.yml | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-multiarch.yml b/.github/workflows/build-multiarch.yml index 128f4199..56248782 100644 --- a/.github/workflows/build-multiarch.yml +++ b/.github/workflows/build-multiarch.yml @@ -49,6 +49,7 @@ jobs: key: ${{ runner.os }}-buildx-${{ env.CACHE_NAME }}-${{ github.sha }} restore-keys: | ${{ 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 From 449f2bfa09f40180829c0d50fcc4413ff5e7555b Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Fri, 21 May 2021 17:28:25 -0500 Subject: [PATCH 07/18] ci: adjusted multiarch build for java8-multiarch --- .github/workflows/build-multiarch.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-multiarch.yml b/.github/workflows/build-multiarch.yml index 56248782..d15c33c7 100644 --- a/.github/workflows/build-multiarch.yml +++ b/.github/workflows/build-multiarch.yml @@ -3,8 +3,8 @@ on: push: branches: - master - - multiarch - - multiarch-latest + - "*-multiarch" + - "multiarch*" - java15 - java16* - test/multiarch/* From d5cde03db1e4a1ecc5c0da2352c78dc10bc6b566 Mon Sep 17 00:00:00 2001 From: FW <30873659+fwcd@users.noreply.github.com> Date: Sat, 22 May 2021 05:05:22 +0200 Subject: [PATCH 08/18] Update Mohist URLs (#887) --- README.md | 2 +- start-deployMohist | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 7ed0a083..3af38868 100644 --- a/README.md +++ b/README.md @@ -467,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 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 From 0a51713bd78f6e878caead53f6a33ddf337d7caf Mon Sep 17 00:00:00 2001 From: itzg Date: Sat, 22 May 2021 03:05:38 +0000 Subject: [PATCH 09/18] docs: Auto update markdown TOC --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3af38868..59253227 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) - + From e027a813176b16466f717494d545854bd4146929 Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Fri, 21 May 2021 17:32:38 -0500 Subject: [PATCH 10/18] ci: add java11 to build/merge --- .github/workflows/build-multiarch.yml | 6 ++++-- docker-versions-create.sh | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-multiarch.yml b/.github/workflows/build-multiarch.yml index d15c33c7..241ef4bb 100644 --- a/.github/workflows/build-multiarch.yml +++ b/.github/workflows/build-multiarch.yml @@ -5,13 +5,15 @@ on: - master - "*-multiarch" - "multiarch*" + - 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]+-java11" - "[0-9]+.[0-9]+.[0-9]+-java15" - "[0-9]+.[0-9]+.[0-9]+-java16*" paths-ignore: diff --git a/docker-versions-create.sh b/docker-versions-create.sh index b006f6aa..1c6d166a 100755 --- a/docker-versions-create.sh +++ b/docker-versions-create.sh @@ -6,7 +6,7 @@ branches_list=( 'java8-multiarch' 'openj9' 'openj9-11' - 'adopt11' + 'java11' 'java15' 'java16' 'java16-openj9' From 5e372ed9f43aff20f29ae72d88a975947e4e74a6 Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Fri, 21 May 2021 22:12:29 -0500 Subject: [PATCH 11/18] docs: added java11 tag to README --- README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index 59253227..1e19af12 100644 --- a/README.md +++ b/README.md @@ -268,8 +268,6 @@ 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 | @@ -278,10 +276,10 @@ To use a different version of Java, please use a docker tag to run your Minecraf | edge | 16 | Debian | Hotspot | amd64,arm64,armv7 | | java8 | 8 | Alpine | Hotspot | amd64 | | java8-multiarch | 8 | Debian | Hotspot | amd64,arm64,armv7 | +| java11 | 11 | Debian | Hotspot | amd64,arm64,armv7 | | java15 | 15 | Debian | Hotspot | amd64,arm64,armv7 | | 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 | | multiarch | 11 | Debian | Hotspot | amd64,arm64,armv7 | From 38eb769c1b2b835ee4532c5735ef6af979ca9d47 Mon Sep 17 00:00:00 2001 From: itzg Date: Sat, 22 May 2021 03:12:47 +0000 Subject: [PATCH 12/18] docs: Auto update markdown TOC --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1e19af12..7c246672 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) - + From 1e32161652f1549b72553deba55f9a6cbdb62d3e Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Fri, 21 May 2021 22:24:31 -0500 Subject: [PATCH 13/18] ci: fixed pr test builds for buildkit --- tests/docker-compose.test.yml | 3 +++ 1 file changed, 3 insertions(+) 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: From 8673f919fdbe2cab76abe292d15846d014fa0d23 Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Fri, 21 May 2021 22:28:32 -0500 Subject: [PATCH 14/18] docs: adjusted image version mentioned for RaspberryPi --- README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index 7c246672..3e95971d 100644 --- a/README.md +++ b/README.md @@ -1335,9 +1335,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` From 73a11c91d2e7e46882b535b0c8a3c8d2f3178220 Mon Sep 17 00:00:00 2001 From: itzg Date: Sat, 22 May 2021 03:28:50 +0000 Subject: [PATCH 15/18] docs: Auto update markdown TOC --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3e95971d..9052496f 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) - + From a2c393ccc557bcef1ab71cf639c735866319b91e Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Fri, 21 May 2021 22:34:45 -0500 Subject: [PATCH 16/18] docs: added java8-openj9 in place of openj9 image tag --- .github/workflows/build-multiarch.yml | 8 +++++--- README.md | 2 +- docker-versions-create.sh | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-multiarch.yml b/.github/workflows/build-multiarch.yml index 241ef4bb..0d27fec4 100644 --- a/.github/workflows/build-multiarch.yml +++ b/.github/workflows/build-multiarch.yml @@ -5,15 +5,17 @@ on: - master - "*-multiarch" - "multiarch*" - - java11 - - java15 + - 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" - - "[0-9]+.[0-9]+.[0-9]+-java11" + - "[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: diff --git a/README.md b/README.md index 9052496f..46a5457e 100644 --- a/README.md +++ b/README.md @@ -276,11 +276,11 @@ To use a different version of Java, please use a docker tag to run your Minecraf | 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 | | java15 | 15 | Debian | Hotspot | amd64,arm64,armv7 | | java16 | 16 | Debian | Hotspot | amd64,arm64,armv7 | | java16-openj9 | 16 | Debian | OpenJ9 | amd64 | -| openj9 | 8 | Alpine | OpenJ9 | amd64 | | openj9-11 | 11 | Alpine | OpenJ9 | amd64 | | multiarch | 11 | Debian | Hotspot | amd64,arm64,armv7 | | multiarch-latest | 15+ | Debian | Hotspot | amd64,arm64,armv7 | diff --git a/docker-versions-create.sh b/docker-versions-create.sh index 1c6d166a..9e6a2a21 100755 --- a/docker-versions-create.sh +++ b/docker-versions-create.sh @@ -4,7 +4,7 @@ branches_list=( 'java8' 'java8-multiarch' - 'openj9' + 'java8-openj9' 'openj9-11' 'java11' 'java15' From 2f489b04ae1b2bbb21be5ba3f73bf8d9e357e0c5 Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Fri, 21 May 2021 22:40:29 -0500 Subject: [PATCH 17/18] docs: replaced openj9-11 with java11-openj9 --- README.md | 5 ++--- docker-versions-create.sh | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 46a5457e..841d060e 100644 --- a/README.md +++ b/README.md @@ -276,13 +276,12 @@ To use a different version of Java, please use a docker tag to run your Minecraf | 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 | +| 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 | -| openj9-11 | 11 | Alpine | OpenJ9 | amd64 | -| multiarch | 11 | Debian | Hotspot | amd64,arm64,armv7 | | multiarch-latest | 15+ | Debian | Hotspot | amd64,arm64,armv7 | For example, to use Java version 15 on any supported architecture: diff --git a/docker-versions-create.sh b/docker-versions-create.sh index 9e6a2a21..81a7bdcd 100755 --- a/docker-versions-create.sh +++ b/docker-versions-create.sh @@ -5,12 +5,11 @@ branches_list=( 'java8' 'java8-multiarch' 'java8-openj9' - 'openj9-11' 'java11' + 'java11-openj9' 'java15' 'java16' 'java16-openj9' - 'multiarch' 'multiarch-latest' ) From 373921777ab08a893d9b8d0fc15e638ca12d0984 Mon Sep 17 00:00:00 2001 From: itzg Date: Sat, 22 May 2021 03:44:27 +0000 Subject: [PATCH 18/18] docs: Auto update markdown TOC --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 841d060e..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) - +