Auto-merging via docker-versions-create

#1064

.github/workflows/build-multiarch.yml

@@ -65,7 +65,7 @@ jobs:
         uses: docker/build-push-action@v2.7.0
         with:
           context: .
-          platforms: linux/amd64,linux/arm/v7,linux/arm64
+          platforms: linux/amd64
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           # ensure latest base image is used

DEVELOPMENT.md

@@ -93,5 +93,5 @@ The multiarch images are built and published by [a Github action](https://github
 The following git command can be used to provide the bulk of release notes content:
 
 ```shell script
-git log --invert-grep --grep "^ci:" --grep "^misc:" --grep "^docs:" --pretty="* %s" 1.1.0..1.2.0
+git log --invert-grep --grep "^ci:" --grep "^misc:" --grep "^docs:" --pretty="- %s" 1.1.0..1.2.0
 ```

Dockerfile

@@ -1,4 +1,4 @@
-FROM eclipse-temurin:16-jdk
+FROM adoptopenjdk:16-jdk-openj9
 
 LABEL org.opencontainers.image.authors="Geoff Bourne <itzgeoff@gmail.com>"
 

files/autopause/autopause-fcns.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 current_uptime() {
-  awk '{print $1}' /proc/uptime | cut -d . -f 1
+  echo $(awk '{print $1}' /proc/uptime | cut -d . -f 1)
 }
 
 java_running() {
@@ -17,15 +17,15 @@ rcon_client_exists() {
 }
 
 mc_server_listening() {
-  mc-monitor status --host localhost --port "$SERVER_PORT" --timeout 10s >& /dev/null
+  mc-monitor status --host localhost --port $SERVER_PORT --timeout 10s >& /dev/null
 }
 
 java_clients_connected() {
   local connections
   if java_running ; then
-    connections=$(mc-monitor status --host localhost --port "$SERVER_PORT" --show-player-count)
+    connections=$(mc-monitor status --host localhost --port $SERVER_PORT --show-player-count)
   else
     connections=0
   fi
-  (( connections > 0 ))
+  (( $connections > 0 ))
 }

scripts/start-setupEnvVariables

@@ -1,18 +1,17 @@
 #!/bin/bash
 
-# shellcheck source=start-utils
-. "${SCRIPTS:-/}start-utils"
+. ${SCRIPTS:-/}start-utils
 
 set -e
 
-: "${REPLACE_ENV_IN_PLACE:=${REPLACE_ENV_VARIABLES:-false}}"
-: "${REPLACE_ENV_PATHS:=/data}"
-: "${REPLACE_ENV_SUFFIXES:=yml,yaml,txt,cfg,conf,properties,hjson,json,tml,toml}"
-: "${REPLACE_ENV_VARIABLE_PREFIX:=${ENV_VARIABLE_PREFIX:-CFG_}}"
-: "${REPLACE_ENV_VARIABLES_EXCLUDES:=}"
-: "${REPLACE_ENV_VARIABLES_EXCLUDE_PATHS:=}"
-: "${PATCH_DEFINITIONS:=}"
-: "${DEBUG:=false}"
+: ${REPLACE_ENV_IN_PLACE:=${REPLACE_ENV_VARIABLES:-false}}
+: ${REPLACE_ENV_PATHS:=/data}
+: ${REPLACE_ENV_SUFFIXES:=yml,yaml,txt,cfg,conf,properties,hjson,json,tml,toml}
+: ${REPLACE_ENV_VARIABLE_PREFIX:=${ENV_VARIABLE_PREFIX:-CFG_}}
+: ${REPLACE_ENV_VARIABLES_EXCLUDES:=}
+: ${REPLACE_ENV_VARIABLES_EXCLUDE_PATHS:=}
+: ${PATCH_DEFINITIONS:=}
+: ${DEBUG:=false}
 
 if isTrue "${REPLACE_ENV_IN_PLACE}"; then
   log "Replacing env variables in ${REPLACE_ENV_PATHS} that match the prefix $REPLACE_ENV_VARIABLE_PREFIX ..."
@@ -21,15 +20,15 @@ if isTrue "${REPLACE_ENV_IN_PLACE}"; then
     --replace-env-file-suffixes="${REPLACE_ENV_SUFFIXES}" \
     --replace-env-excludes="${REPLACE_ENV_VARIABLES_EXCLUDES}" \
     --replace-env-exclude-paths="${REPLACE_ENV_VARIABLES_EXCLUDE_PATHS}" \
-    --replace-env-prefix="${REPLACE_ENV_VARIABLE_PREFIX}" \
+    --replace-env-prefix=${REPLACE_ENV_VARIABLE_PREFIX} \
     "${REPLACE_ENV_PATHS[@]}"
 fi
 
 if [[ ${PATCH_DEFINITIONS} ]]; then
   log "Applying patch definitions from ${PATCH_DEFINITIONS}"
   mc-image-helper --debug=${DEBUG} patch \
-    --patch-env-prefix="${REPLACE_ENV_VARIABLE_PREFIX}" \
+    --patch-env-prefix=${REPLACE_ENV_VARIABLE_PREFIX} \
     "${PATCH_DEFINITIONS}"
 fi
 
-exec "${SCRIPTS:-/}start-finalExec" "$@"
+exec ${SCRIPTS:-/}start-finalExec $@