Auto-merging via docker-versions-create

# Conflicts:
#	.github/workflows/build-multiarch.yml
#	Dockerfile

.github/workflows/build-multiarch.yml

@@ -2,22 +2,16 @@ name: Build and publish multiarch
 on:
   push:
     branches:
-      - master
-      - "*-multiarch"
-      - "multiarch*"
-      - java8-openj9
-      - java11*
-      - java15*
-      - java16*
+      - multiarch
+      - multiarch-latest
+      - 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]+-java8-openj9"
-      - "[0-9]+.[0-9]+.[0-9]+-java11*"
+      - "[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/**"
@@ -26,8 +20,6 @@ on:
 jobs:
   docker-buildx:
     runs-on: ubuntu-20.04
-    env:
-      CACHE_NAME: java11-openj9
     steps:
       - name: Checkout
         uses: actions/checkout@v2.3.4
@@ -41,7 +33,6 @@ jobs:
           tags: |
             type=ref,event=branch
             type=ref,event=tag
-            type=edge,branch=master
 
       - name: Setup Docker Buildx
         uses: docker/setup-buildx-action@v1
@@ -50,10 +41,9 @@ jobs:
         uses: actions/cache@v2.1.5
         with:
           path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-buildx-${{ env.CACHE_NAME }}-${{ github.sha }}
+          key: ${{ runner.os }}-buildx-${{ steps.meta.outputs.version }}-${{ github.sha }}
           restore-keys: |
-            ${{ runner.os }}-buildx-${{ env.CACHE_NAME }}-
-            ${{ runner.os }}-buildx-
+            ${{ runner.os }}-buildx-${{ steps.meta.outputs.version }}-
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1.1.0
@@ -69,7 +59,7 @@ jobs:
         uses: docker/build-push-action@v2.4.0
         with:
           context: .
-          platforms: linux/amd64
+          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

.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: "docs: Auto update markdown TOC"
+          commit_message: Auto update markdown TOC

.github/workflows/main.yml

@@ -3,12 +3,14 @@ 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"
@@ -29,8 +31,6 @@ jobs:
     needs:
       - test
     runs-on: ubuntu-20.04
-    env:
-      CACHE_NAME: java11-openj9
 
     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-${{ env.CACHE_NAME }}-${{ github.sha }}
+        key: ${{ runner.os }}-buildx-${{ steps.prep.outputs.cache_version }}-${{ github.sha }}
         restore-keys: |
-          ${{ runner.os }}-buildx-${{ env.CACHE_NAME }}-
+          ${{ runner.os }}-buildx-${{ steps.prep.outputs.cache_version }}-
           ${{ runner.os }}-buildx-
 
     - name: Login to DockerHub

Dockerfile

@@ -1,4 +1,4 @@
-FROM adoptopenjdk:11-jre-openj9
+FROM adoptopenjdk:15-jre
 
 LABEL org.opencontainers.image.authors="Geoff Bourne <itzgeoff@gmail.com>"
 
@@ -84,6 +84,5 @@ 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

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: Sat May 22 03:44:26 UTC 2021 -->
+<!-- Added by: runner, at: Thu May 20 01:17:11 UTC 2021 -->
 
 <!--te-->
 
@@ -268,20 +268,22 @@ 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 |
+| latest         | 11           | Alpine | Hotspot  | amd64             |
 | 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 |
-| 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 |
 | multiarch-latest | 15+        | Debian | Hotspot  | amd64,arm64,armv7 |
 
 For example, to use Java version 15 on any supported architecture:
@@ -464,7 +466,7 @@ A [Magma](https://magmafoundation.org/) server, which is a combination of Forge
 
 ### Running a Mohist server
 
-A [Mohist](https://github.com/MohistMC/Mohist) server can be used with
+A [Mohist](https://github.com/Mohist-Community/Mohist) server can be used with
 
     -e TYPE=MOHIST
 
@@ -1334,7 +1336,9 @@ 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, which includes `itzg/minecraft-server:latest`.
+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
 
 > NOTE: you may need to lower the memory allocation, such as `-e MEMORY=750m`
 

docker-versions-create.sh

@@ -4,12 +4,13 @@
 branches_list=(
   'java8'
   'java8-multiarch'
-  'java8-openj9'
-  'java11'
-  'java11-openj9'
+  'openj9'
+  'openj9-11'
+  'adopt11'
   'java15'
+  'java15-openj9'
   'java16'
-  'java16-openj9'
+  'multiarch'
   'multiarch-latest'
   )
 

start-deployMohist

@@ -8,12 +8,12 @@ isDebugging && set -x
 requireVar VANILLA_VERSION
 : ${MOHIST_BUILD:=lastSuccessfulBuild}
 
-mohistJobs=https://ci.codemc.io/job/MohistMC/job/
+mohistJobs=https://ci.codemc.io/job/Mohist-Community/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/MohistMC/ for available versions"
+  log "       check https://ci.codemc.io/job/Mohist-Community/ 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/MohistMC/ for available versions"
+  log "       check https://ci.codemc.io/job/Mohist-Community/ for available versions"
   log "       and set VERSION accordingly"
   exit 1
 fi

start-minecraftFinalSetup

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

tests/docker-compose.test.yml

@@ -10,9 +10,6 @@ services:
     restart: "no"
     build:
       context: ..
-      args:
-        TARGETOS: linux
-        TARGETARCH: amd64
       cache_from:
       - itzg/minecraft-server:latest
     environment: