Added procps to alpine image to resolve autopause compatibility

.github/workflows/build-multiarch.yml

@@ -97,11 +97,6 @@ jobs:
           username: ${{ secrets.DOCKER_USER }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
-      - name: Calculate build files revision
-        id: build-files
-        run: |
-          echo "::set-output name=REV::$(git log -1 --format=%H build)"
-
       - name: Build for test
         uses: docker/build-push-action@v2.9.0
         with:
@@ -114,7 +109,6 @@ jobs:
           push: false
           build-args: |
             BASE_IMAGE=${{ matrix.baseImage }}
-            BUILD_FILES_REV=${{ steps.build-files.outputs.REV }}
           cache-from: type=gha,scope=${{ matrix.variant }}
           # no cache-to to avoid cross-cache update from next build step
 

README.md

@@ -287,16 +287,17 @@ the server jar remain in the `/data` directory. It is safe to remove those._
 
 When using the image `itzg:/minecraft-server` without a tag, the `latest` image tag is implied from the table below. To use a different version of Java, please use an alternate tag to run your Minecraft server container.
 
-| Tag name       | Java version | Linux  | JVM Type | Architecture      |
-| -------------- | -------------|--------|----------|-------------------|
-| latest         | 17           | Debian | Hotspot  | amd64,arm64,armv7 |
-| java8          | 8            | Alpine | Hotspot  | amd64             |
+| Tag name        | Java version | Linux  | JVM Type | Architecture      |
+|-----------------|-------------|--------|----------|-------------------|
+| latest          | 17          | 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             |
-| java17         | 17           | Ubuntu | Hotspot  | amd64,arm64,armv7 |
-| java17-openj9  | 17           | Debian | OpenJ9   | amd64             |
+| java8-openj9    | 8           | Debian | OpenJ9   | amd64             |
+| java11          | 11          | Debian | Hotspot  | amd64,arm64,armv7 |
+| java11-openj9   | 11          | Debian | OpenJ9   | amd64             |
+| java17          | 17          | Ubuntu | Hotspot  | amd64,arm64,armv7 |
+| java17-openj9   | 17          | Debian | OpenJ9   | amd64             |
+| java17-alpine   | 17          | Alpine | Hotspot  | amd64             |
 
 For example, to use Java version 8 on any supported architecture:
 

build/alpine/install-packages.sh

@@ -10,6 +10,7 @@ apk add --no-cache -U \
     su-exec \
     coreutils \
     findutils \
+    procps \
     shadow \
     bash \
     curl iputils \

tests/setuponlytests/test.sh

@@ -5,6 +5,16 @@ IFS=$'\n\t'
 # go to script root directory
 cd "$(dirname "$0")" || exit 1
 
+outputContainerLog() {
+  logs=${1?}
+
+  echo "${folder} test scenario FAILED"
+  echo ":::::::::::: LOGS ::::::::::::::::
+$logs
+::::::::::::::::::::::::::::::::::
+"
+}
+
 # tests that only run the setup files for things like downloads and configuration.
 setupOnlyMinecraftTest(){
   folder=$1
@@ -23,15 +33,12 @@ setupOnlyMinecraftTest(){
   fi
 
   if ! logs=$(docker-compose run mc 2>&1); then
-    echo "${folder} test scenario FAILED"
-    echo ":::::::::::: LOGS ::::::::::::::::
-$logs
-::::::::::::::::::::::::::::::::::
-"
+    outputContainerLog "$logs"
     result=1
   elif [ -f verify.sh ]; then
     if ! docker run --rm --entrypoint bash -v "${PWD}/data":/data -v "${PWD}/verify.sh":/verify "${IMAGE_TO_TEST:-itzg/minecraft-server}" -e /verify; then
       echo "${folder} verify FAILED"
+      outputContainerLog "$logs"
       result=1
     else
       echo "${folder} verify PASS"