docs: Auto update markdown TOC

docs: replaced openj9-11 with java11-openj9
docs: added java8-openj9 in place of openj9 image tag
2026-02-17 15:13:55 +00:00 · 2021-05-22 03:44:27 +00:00 · 2021-05-21 22:40:29 -05:00 · 2021-05-21 22:34:45 -05:00 · 2021-05-22 03:28:50 +00:00 · 2021-05-21 22:28:32 -05:00
9 changed files with 47 additions and 37 deletions
--- a/.github/workflows/build-multiarch.yml
+++ b/.github/workflows/build-multiarch.yml
@@ -2,16 +2,22 @@ name: Build and publish multiarch
 on:
  push:
    branches:
-      - multiarch
-      - multiarch-latest
-      - java15
-      - java16
+      - master
+      - "*-multiarch"
+      - "multiarch*"
+      - java8-openj9
+      - java11*
+      - java15*
+      - 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]+-java8-openj9"
+      - "[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 +26,8 @@ on:
 jobs:
  docker-buildx:
    runs-on: ubuntu-20.04
+    env:
+      CACHE_NAME: master
    steps:
      - name: Checkout
        uses: actions/checkout@v2.3.4
@@ -33,6 +41,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 +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
@@ -59,7 +69,7 @@ jobs:
        uses: docker/build-push-action@v2.4.0
        with:
          context: .
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64,linux/arm/v7,linux/arm64
          push: ${{ github.event_name != 'pull_request' }}
          tags: ${{ steps.meta.outputs.tags }}
          # ensure latest base image is used
--- a/.github/workflows/generate-toc.yml
+++ b/.github/workflows/generate-toc.yml
@@ -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"
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -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: master

    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
--- a/3
+++ b/3
@@ -1,4 +1,4 @@
-FROM adoptopenjdk:15-openj9
+FROM adoptopenjdk:16-jre

 LABEL org.opencontainers.image.authors="Geoff Bourne <itzgeoff@gmail.com>"

@@ -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
--- 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)

-<!-- Added by: runner, at: Thu May 20 01:17:11 UTC 2021 -->
+<!-- Added by: runner, at: Sat May 22 03:44:26 UTC 2021 -->

 <!--te-->

@@ -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         | 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 |
+| 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 |
-| java15-openj9  | 15           | Debian | OpenJ9   | amd64,arm64       |
 | java16         | 16           | Debian | Hotspot  | 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`

--- 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'
-  'java15-openj9'
  'java16'
-  'multiarch'
+  'java16-openj9'
  'multiarch-latest'
  )

--- a/6
+++ b/6
@@ -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
--- a/1
+++ b/1
@@ -246,3 +246,4 @@ else
    exec mc-server-runner ${bootstrapArgs} ${mcServerRunnerArgs} java "${finalArgs[@]}"
  fi
 fi
+
--- 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:
Author	SHA1	Message	Date
itzg	373921777a	docs: Auto update markdown TOC	2021-05-22 03:44:27 +00:00
Geoff Bourne	2f489b04ae	docs: replaced openj9-11 with java11-openj9	2021-05-21 22:40:29 -05:00
Geoff Bourne	a2c393ccc5	docs: added java8-openj9 in place of openj9 image tag	2021-05-21 22:34:45 -05:00
itzg	73a11c91d2	docs: Auto update markdown TOC	2021-05-22 03:28:50 +00:00
Geoff Bourne	8673f919fd	docs: adjusted image version mentioned for RaspberryPi	2021-05-21 22:28:32 -05:00
Geoff Bourne	1e32161652	ci: fixed pr test builds for buildkit	2021-05-21 22:24:31 -05:00
itzg	38eb769c1b	docs: Auto update markdown TOC	2021-05-22 03:12:47 +00:00
Geoff Bourne	5e372ed9f4	docs: added java11 tag to README	2021-05-21 22:12:29 -05:00
Geoff Bourne	e027a81317	ci: add java11 to build/merge	2021-05-21 22:05:59 -05:00
itzg	0a51713bd7	docs: Auto update markdown TOC	2021-05-22 03:05:38 +00:00
FW	d5cde03db1	Update Mohist URLs (#887 )	2021-05-21 22:05:22 -05:00
Geoff Bourne	449f2bfa09	ci: adjusted multiarch build for java8-multiarch	2021-05-21 17:28:25 -05:00
Geoff Bourne	c9815e2ccb	ci: use CACHE_NAME in main.yml	2021-05-21 17:20:35 -05:00
itzg	9bd6bc64b0	docs: Auto update markdown TOC	2021-05-21 22:01:17 +00:00
Geoff Bourne	a5fe016854	docs: added edge tag to image versions section	2021-05-21 17:00:58 -05:00
itzg	93cd299c77	docs: Auto update markdown TOC	2021-05-21 21:59:13 +00:00
Geoff Bourne	e8f8d8b4d4	ci: introduced CACHE_NAME	2021-05-21 16:58:52 -05:00
Geoff Bourne	b806ea6871	docs: adoptopenjdk:16-openj9 is only available on amd64 #885	2021-05-21 16:53:22 -05:00
Geoff Bourne	cb17180dea	ci: updated build action for java16-openj9 #885	2021-05-21 16:45:33 -05:00
Geoff Bourne	78ec4ba2a7	ci: multiarch build reference master branch	2021-05-21 07:59:04 -05:00
Geoff Bourne	317104de30	ci: fixed multiarch 'master' branch trigger	2021-05-21 07:46:58 -05:00
itzg	63412975c3	docs: Auto update markdown TOC	2021-05-21 12:45:51 +00:00
Geoff Bourne	9c87f8749d	docs: updated README for latest=16	2021-05-21 07:40:46 -05:00
Geoff Bourne	5fc36516f4	ci: switch 'latest/master' build to multiarch	2021-05-21 07:39:59 -05:00
Geoff Bourne	c608c8a57e	Merge branch 'master' into java16	2021-05-21 07:31:12 -05:00
Geoff Bourne	853a9884d7	ci: force apk update	2021-05-21 06:57:19 -05:00
Geoff Bourne	ecafaf4ea1	ci: force rebuild of latest	2021-05-21 06:51:17 -05:00
Geoff Bourne	eb490e92c3	ci: force rebuild of latest	2021-05-21 06:50:04 -05:00
Geoff Bourne	98c7e43927	ci: prefixed TOC commit message	2021-05-19 20:47:48 -05:00
Geoff Bourne	d8786d4785	Auto-merging via docker-versions-create	2021-05-19 20:31:17 -05:00
Geoff Bourne	8a34aa5c45	Auto-merging via docker-versions-create	2021-05-15 12:43:57 -05:00
Geoff Bourne	bb210ff59e	Merge branch 'multiarch' into java16 # Conflicts: # .github/workflows/build-multiarch.yml # Dockerfile	2021-05-14 18:04:56 -05:00
Geoff Bourne	2c8d1a9255	Merge branch 'master' into java16	2021-05-12 11:33:39 -05:00
Geoff Bourne	a8c11c0cdb	Add java16 branch/image-tag #864	2021-05-12 11:32:40 -05:00
Geoff Bourne	78d9d888db	Auto-merging via docker-versions-create	2021-05-06 20:16:34 -05:00
Geoff Bourne	2a67344b93	Auto-merging via docker-versions-create	2021-04-30 14:29:57 -05:00
Geoff Bourne	5a47bb11ba	Auto-merging via docker-versions-create	2021-04-30 11:13:53 -05:00
Geoff Bourne	bb8c7756c7	Auto-merging via docker-versions-create	2021-04-28 16:54:26 -05:00
Geoff Bourne	0c860ade12	Auto-merging via docker-versions-create	2021-04-26 08:22:56 -05:00
Geoff Bourne	a99f7a494b	Auto-merging via docker-versions-create	2021-04-24 13:44:29 -05:00
Geoff Bourne	3e9308d315	Auto-merging via docker-versions-create	2021-04-23 21:05:23 -05:00
Geoff Bourne	b731eaaffb	Auto-merging via docker-versions-create	2021-04-18 13:32:03 -05:00
Geoff Bourne	cbf9577a24	Auto-merging via docker-versions-create	2021-04-11 10:11:28 -05:00
Geoff Bourne	9ccfca5061	Merged latest from master	2021-04-08 19:24:14 -05:00
Geoff Bourne	9690832247	Auto-merging via docker-versions-create	2021-04-01 16:39:46 -05:00
Geoff Bourne	60a68963a8	Added git #819	2021-04-01 16:28:50 -05:00