Auto-merging via docker-versions-create

# Conflicts:
#	.circleci/config.yml

.circleci/config.yml

@@ -0,0 +1,25 @@
+version: 2
+jobs:
+  minecraft_server:
+    docker:
+      - image: circleci/buildpack-deps:stable
+    steps:
+      - checkout
+      - setup_remote_docker
+      - run:
+          name: Build image
+          command: docker build -t itzg/minecraft-server:${CIRCLE_BRANCH} .
+#      - run:
+#          name: Build arm v7 image
+#          command: docker build -t itzg/minecraft-server:${CIRCLE_BRANCH}-arm-v7 --platform linux/arm/v7 --build-arg ARCH=armv7 .
+
+workflows:
+  version: 2
+  build:
+    jobs:
+      - minecraft_server:
+          filters:
+            branches:
+              ignore:
+                - armv7
+                - multiarch

.github/workflows/main.yml

@@ -1,10 +1,21 @@
 # This is a basic workflow to help you get started with Actions
 
-name: build
+name: Build non-multiarch branches/tags
 
 on:
   push:
-    branches: [ master ]
+    branches:
+      - master
+      - openj9
+      - openj9-nightly
+      - adopt11
+      - adopt13
+    tags:
+      - "[0-9]+.[0-9]+.[0-9]+"
+      - "[0-9]+.[0-9]+.[0-9]+-openj9"
+      - "[0-9]+.[0-9]+.[0-9]+-openj9-nightly"
+      - "[0-9]+.[0-9]+.[0-9]+-adopt11"
+      - "[0-9]+.[0-9]+.[0-9]+-adopt13"
   pull_request:
     branches: [ master ]
 

DEVELOPMENT.md

@@ -0,0 +1,28 @@
+Individual scripts can be iteratively developed and tested using the following procedure.
+
+First, build a baseline of the image to include the packages needed by existing or new scripts:
+
+```shell script
+docker build -t mc-dev .
+```
+
+Using the baseline image, an interactive container can be started to iteratively run the scripts to be developed. By attaching the current workspace directory, you can use the local editor of your choice to iteratively modify scripts while using the container to run them.
+
+```shell script
+docker run -it --rm -v ${PWD}:/scripts -e SCRIPTS=/scripts/ --entrypoint bash mc-dev 
+```
+
+From within the container you can run individual scripts via the attached `/scripts/` path; however, be sure to set any environment variables expected by the scripts by either `export`ing them manually:
+
+```shell script
+export VANILLA_VERSION=1.12.2
+/scripts/start-magma
+```
+
+...or pre-pending script execution:
+
+```shell script
+VANILLA_VERSION=1.12.2 /scripts/start-magma
+```
+
+> NOTE: You may want to temporarily add an `exit` statement near the end of your script to isolate execution to just the script you're developing.

Dockerfile

@@ -1,4 +1,4 @@
-FROM openjdk:8u212-jre-alpine
+FROM adoptopenjdk/openjdk8-openj9:alpine
 
 LABEL maintainer "itzg"
 
@@ -67,7 +67,7 @@ COPY log4j2.xml /tmp/log4j2.xml
 WORKDIR /data
 
 ENV UID=1000 GID=1000 \
-  JVM_XX_OPTS="-XX:+UseG1GC" MEMORY="1G" \
+  MEMORY="1G" \
   TYPE=VANILLA VERSION=LATEST FORGEVERSION=RECOMMENDED SPONGEBRANCH=STABLE SPONGEVERSION= FABRICVERSION=LATEST LEVEL=world \
   PVP=true DIFFICULTY=easy ENABLE_RCON=true RCON_PORT=25575 RCON_PASSWORD=minecraft \
   LEVEL_TYPE=DEFAULT SERVER_PORT=25565 ONLINE_MODE=TRUE SERVER_NAME="Dedicated Server" \

README.md

@@ -525,6 +525,15 @@ A [Magma](https://magmafoundation.org/) server, which is a combination of Forge
 
 > **NOTE** there are limited base versions supported, so you will also need to  set `VERSION`, such as "1.12.2"
 
+
+## Running a Mohist server
+
+A [Mohist](https://github.com/Mohist-Community/Mohist) server can be used with
+
+    -e TYPE=MOHIST
+
+> **NOTE** there are limited base versions supported, so you will also need to  set `VERSION`, such as "1.12.2"
+
 ## Running a server with a Feed the Beast modpack
 
 > **NOTE** requires `itzg/minecraft-server:multiarch` image
@@ -1090,6 +1099,14 @@ via a `JVM_XX_OPTS` environment variable.
 For some cases, if e.g. after removing mods, it could be necessary to startup minecraft with an additional `-D` parameter like `-Dfml.queryResult=confirm`. To address this you can use the environment variable `JVM_DD_OPTS`, which builds the params from a given list of values separated by space, but without the `-D` prefix. To make things running under systems (e.g. Plesk), which doesn't allow `=` inside values, a `:` (colon) could be used instead. The upper example would look like this:
 `JVM_DD_OPTS=fml.queryResult:confirm`, and will be converted to `-Dfml.queryResult=confirm`.
 
+The container uses [OpenJ9](https://www.eclipse.org/openj9/docs) and a couple of J9 options are
+simplified by environment variables:
+
+- `-e TUNE_VIRTUALIZED=TRUE` : enables the option to 
+  [optimize for virtualized environments](https://www.eclipse.org/openj9/docs/xtunevirtualized/)
+- `-e TUNE_NURSERY_SIZES=TRUE` : configures nursery sizes where the initial size is 50%
+  of the `MAX_MEMORY` and the max size is 80%.
+
 ### Enable Remote JMX for Profiling
 
 To enable remote JMX, such as for profiling with VisualVM or JMC, add the environment variable `ENABLE_JMX=true` and add a port forwarding of TCP port 7091, such as:

docker-versions-create.sh

@@ -10,12 +10,28 @@ function TrapExit {
 
 batchMode=false
 
-while getopts "b" arg
+while getopts "hbt:" arg
 do
   case $arg in
     b)
       batchMode=true
       ;;
+    t)
+      tag=${OPTARG}
+      ;;
+    h)
+      echo "
+Usage $0 [options]
+
+Options:
+  -b      enable batch mode, which avoids interactive prompts and causes script to fail immediately
+          when any merge fails
+  -t TAG  tag and push the current revision on master with the given tag
+          and apply respective tags to each branch
+  -h      display this help and exit
+"
+      exit
+      ;;
     *)
       echo "Unsupported arg $arg"
       exit 2
@@ -34,6 +50,10 @@ test -d ./.git || { echo ".git folder was not found. Please start this script fr
 git checkout master
 git pull --all || { echo "Can't pull the repo!"; \
   exit 1; }
+if [[ $tag ]]; then
+  git tag $tag
+  git push origin $tag
+fi
 
 git_branches=$(git branch -a)
 
@@ -57,6 +77,10 @@ for branch in "${branches_list[@]}"; do
         git commit -m "Auto merge branch with master" -a
         # push may fail if remote doesn't have this branch yet. In this case - sending branch
         git push || git push -u origin "$branch" || { echo "Can't push changes to the origin."; exit 1; }
+        if [[ $tag ]]; then
+          git tag "$tag-$branch"
+          git push origin "$tag-$branch"
+        fi
       elif ${batchMode}; then
         status=$?
         echo "Git merge failed in batch mode"

health.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. /start-utils
+. ${SCRIPTS:-/}start-utils
 
 if isTrue "${ENABLE_AUTOPAUSE}" && [[ "$( ps -a -o stat,comm | grep 'java' | awk '{ print $1 }')" =~ ^T.*$ ]]; then
   echo "Java process suspended by Autopause function"

start

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. /start-utils
+. ${SCRIPTS:-/}start-utils
 
 umask 0002
 chmod g+w /data
@@ -45,7 +45,7 @@ if [ $(id -u) = 0 ]; then
     echo 'hosts: files dns' > /etc/nsswitch.conf
   fi
 
-  exec su-exec ${runAsUser}:${runAsGroup} /start-configuration $@
+  exec su-exec ${runAsUser}:${runAsGroup} ${SCRIPTS:-/}start-configuration $@
 else
-  exec /start-configuration $@
+  exec ${SCRIPTS:-/}start-configuration $@
 fi

start-autopause

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. /start-utils
+. ${SCRIPTS:-/}start-utils
 
 log "Autopause functionality enabled"
 

start-configuration

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. /start-utils
+. ${SCRIPTS:-/}start-utils
 
 shopt -s nullglob
 
@@ -69,53 +69,57 @@ cd /data || exit 1
 export ORIGINAL_TYPE=${TYPE^^}
 
 if isTrue "${ENABLE_AUTOPAUSE}"; then
-  /start-autopause
+  ${SCRIPTS:-/}start-autopause
 fi
 
 log "Resolving type given ${TYPE}"
 case "${TYPE^^}" in
   *BUKKIT|SPIGOT)
-    exec /start-deployBukkitSpigot "$@"
+    exec ${SCRIPTS:-/}start-deployBukkitSpigot "$@"
   ;;
 
   PAPER)
-    exec /start-deployPaper "$@"
+    exec ${SCRIPTS:-/}start-deployPaper "$@"
   ;;
 
   TUINITY)
-    exec /start-deployTuinity "$@"
+    exec ${SCRIPTS:-/}start-deployTuinity "$@"
   ;;
 
   FORGE)
-    exec /start-deployForge "$@"
+    exec ${SCRIPTS:-/}start-deployForge "$@"
   ;;
 
   FABRIC)
-    exec /start-deployFabric "$@"
+    exec ${SCRIPTS:-/}start-deployFabric "$@"
   ;;
 
   FTB|CURSEFORGE)
-    exec /start-deployFTB "$@"
+    exec ${SCRIPTS:-/}start-deployFTB "$@"
   ;;
 
   VANILLA)
-    exec /start-deployVanilla "$@"
+    exec ${SCRIPTS:-/}start-deployVanilla "$@"
   ;;
 
   SPONGEVANILLA)
-    exec /start-deploySpongeVanilla "$@"
+    exec ${SCRIPTS:-/}start-deploySpongeVanilla "$@"
   ;;
 
   CUSTOM)
-    exec /start-deployCustom "$@"
+    exec ${SCRIPTS:-/}start-deployCustom "$@"
   ;;
 
   CURSE_INSTANCE)
-    exec /start-validateCurseInstance "$@"
+    exec ${SCRIPTS:-/}start-validateCurseInstance "$@"
   ;;
 
   MAGMA)
-    exec /start-magma "$@"
+    exec ${SCRIPTS:-/}start-magma "$@"
+  ;;
+
+  MOHIST)
+    exec ${SCRIPTS:-/}start-mohist "$@"
   ;;
 
   *)

start-deployBukkitSpigot

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. /start-utils
+. ${SCRIPTS:-/}start-utils
 
 set -e
 
@@ -102,4 +102,4 @@ export TYPE=SPIGOT
 export SKIP_LOG4J_CONFIG=true
 
 # Continue to Final Setup
-exec /start-finalSetup01World $@
+exec ${SCRIPTS:-/}start-finalSetup01World $@

start-deployCustom

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. /start-utils
+. ${SCRIPTS:-/}start-utils
 
 if isURL ${CUSTOM_SERVER}; then
   filename=$(basename ${CUSTOM_SERVER})
@@ -28,4 +28,4 @@ fi
 export SKIP_LOG4J_CONFIG=true
 
 # Continue to Final Setup
-exec /start-finalSetup01World $@
+exec ${SCRIPTS:-/}start-finalSetup01World $@

start-deployFTB

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. /start-utils
+. ${SCRIPTS:-/}start-utils
 
 export FTB_BASE_DIR=/data/FeedTheBeast
 legacyJavaFixerUrl=http://ftb.cursecdn.com/FTB2/maven/net/minecraftforge/lex/legacyjavafixer/1.0/legacyjavafixer-1.0.jar
@@ -135,4 +135,4 @@ elif [ -e "${FTB_DIR}/Install.sh" ]; then
 fi
 
 # Continue to Final Setup
-exec /start-finalSetup01World $@
+exec ${SCRIPTS:-/}start-finalSetup01World $@

start-deployFabric

@@ -1,7 +1,7 @@
 #!/bin/bash
 set -eu
 
-. /start-utils
+. ${SCRIPTS:-/}start-utils
 
 export TYPE=FABRIC
 
@@ -75,4 +75,4 @@ else
 fi
 
 # Contineut to Final Setup
-exec /start-finalSetup01World $@
+exec ${SCRIPTS:-/}start-finalSetup01World $@

start-deployForge

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. /start-utils
+. ${SCRIPTS:-/}start-utils
 
 export TYPE=FORGE
 
@@ -113,4 +113,4 @@ else
 fi
 
 # Continue to Final Setup
-exec /start-finalSetup01World $@
+exec ${SCRIPTS:-/}start-finalSetup01World $@

start-deployPaper

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. /start-utils
+. ${SCRIPTS:-/}start-utils
 
 : ${PAPERBUILD:=latest}
 export SERVER=paper_server-${VANILLA_VERSION}-${PAPERBUILD}.jar
@@ -20,4 +20,4 @@ export TYPE=SPIGOT
 export SKIP_LOG4J_CONFIG=true
 
 # Continue to Final Setup
-exec /start-finalSetup01World $@
+exec ${SCRIPTS:-/}start-finalSetup01World $@

start-deploySpongeVanilla

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. /start-utils
+. ${SCRIPTS:-/}start-utils
 
 export TYPE=spongevanilla
 
@@ -36,4 +36,4 @@ if [ ! -e $SERVER ] || [ -n "$FORCE_REDOWNLOAD" ]; then
 fi
 
 # Continue to Final Setup
-exec /start-finalSetup01World $@
+exec ${SCRIPTS:-/}start-finalSetup01World $@

start-deployTuinity

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. /start-utils
+. ${SCRIPTS:-/}start-utils
 
 if [ "${VERSION}" != "LATEST" ]; then
   log "ERROR: Tunity server type only supports VERSION=LATEST"
@@ -24,4 +24,4 @@ fi
 export TYPE=SPIGOT
 
 # Continue to Final Setup
-exec /start-finalSetup01World $@
+exec ${SCRIPTS:-/}start-finalSetup01World $@

start-deployVanilla

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. /start-utils
+. ${SCRIPTS:-/}start-utils
 isDebugging && set -x
 set -o pipefail
 
@@ -43,4 +43,4 @@ fi
 isDebugging && ls -l
 
 # Continue to Final Setup
-exec /start-finalSetup01World $@
+exec ${SCRIPTS:-/}start-finalSetup01World $@

start-finalSetup01World

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. /start-utils
+. ${SCRIPTS:-/}start-utils
 set -e
 isDebugging && set -x
 
@@ -51,4 +51,4 @@ if [[ "$WORLD" ]] && [ ! -d "$worldDest" ]; then
   fi
 fi
 
-exec /start-finalSetup02Modpack $@
+exec ${SCRIPTS:-/}start-finalSetup02Modpack $@

start-finalSetup02Modpack

@@ -2,7 +2,7 @@
 
 set -e
 
-. /start-utils
+. ${SCRIPTS:-/}start-utils
 
 #  CURSE_URL_BASE used in manifest downloads below
 CURSE_URL_BASE=${CURSE_URL_BASE:-https://minecraft.curseforge.com/projects}
@@ -154,4 +154,4 @@ if [[ "${GENERIC_PACK}" ]]; then
   fi
 fi
 
-exec /start-finalSetup03Modconfig $@
+exec ${SCRIPTS:-/}start-finalSetup03Modconfig $@

start-finalSetup03Modconfig

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. /start-utils
+. ${SCRIPTS:-/}start-utils
 
 # If supplied with a URL for a config (simple zip of configurations), download it and unpack
 if [[ "$MODCONFIG" ]]; then
@@ -24,4 +24,4 @@ case "X$MODCONFIG" in
 esac
 fi
 
-exec /start-finalSetup04ServerProperties $@
+exec ${SCRIPTS:-/}start-finalSetup04ServerProperties $@

start-finalSetup04ServerProperties

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. /start-utils
+. ${SCRIPTS:-/}start-utils
 
 # FUNCTIONS
 function setServerProp {
@@ -194,4 +194,4 @@ if isDebugging; then
   cat /data/server.properties
 fi
 
-exec /start-finalSetup05EnvVariables $@
+exec ${SCRIPTS:-/}start-finalSetup05EnvVariables $@

start-finalSetup05EnvVariables

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. /start-utils
+. ${SCRIPTS:-/}start-utils
 
 if [ "${REPLACE_ENV_VARIABLES^^}" = "TRUE" ]; then
   log "Replacing env variables in configs that match the prefix $ENV_VARIABLE_PREFIX..."
@@ -25,4 +25,4 @@ if [ "${REPLACE_ENV_VARIABLES^^}" = "TRUE" ]; then
   done < <(env)
 fi
 
-exec /start-minecraftFinalSetup $@
+exec ${SCRIPTS:-/}start-minecraftFinalSetup $@

start-magma

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. /start-utils
+. ${SCRIPTS:-/}start-utils
 
 export SERVER="/data/magma-server-${VANILLA_VERSION}.jar"
 
@@ -15,4 +15,4 @@ fi
 export SKIP_LOG4J_CONFIG=true
 
 # Continue to Final Setup
-exec /start-finalSetup01World $@
+exec ${SCRIPTS:-/}start-finalSetup01World $@

start-minecraftFinalSetup

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. /start-utils
+. ${SCRIPTS:-/}start-utils
 
 if [ -n "$OPS" ]; then
   log "Setting/adding ops"
@@ -100,6 +100,23 @@ if [ -n "$JVM_DD_OPTS" ]; then
       done
 fi
 
+if isTrue ${TUNE_VIRTUALIZED}; then
+  JVM_XX_OPTS="${JVM_XX_OPTS} -Xtune:virtualized"
+fi
+
+if isTrue ${TUNE_NURSERY_SIZES}; then
+  case ${MAX_MEMORY^^} in
+    *G)
+      MAX_MEMORY_MB=$(( ${MAX_MEMORY%?} * 1024 )) ;;
+    *M)
+      MAX_MEMORY_MB=${MAX_MEMORY%?} ;;
+  esac
+
+  NURSERY_MINIMUM=$(( ${MAX_MEMORY_MB} / 2 ))
+  NURSERY_MAXIMUM=$(( ${MAX_MEMORY_MB} * 4/5 ))
+  JVM_XX_OPTS="${JVM_XX_OPTS} -Xmns${NURSERY_MINIMUM}M -Xmnx${NURSERY_MAXIMUM}M"
+fi
+
 if isTrue ${ENABLE_JMX}; then
   : ${JMX_HOST:=0.0.0.0}
   : ${JMX_PORT:=7091}

start-mohist

@@ -0,0 +1,40 @@
+#!/bin/bash
+
+. ${SCRIPTS:-/}start-utils
+requireVar VANILLA_VERSION
+set -o pipefail
+set -e
+isDebugging && set -x
+
+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/Mohist-Community/ for available versions"
+  exit 1
+fi
+
+latestBuildRelPath=$(
+  curl -fsSL "${mohistJob}lastSuccessfulBuild/api/json" |
+    jq -r '.artifacts[0].relativePath'
+)
+
+baseName=$(basename "${latestBuildRelPath}")
+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"
+  exit 1
+fi
+
+export SERVER="/data/${baseName}"
+
+if [ ! -f ${SERVER} ]; then
+  log "Downloading ${SERVER}"
+  curl -o "${SERVER}" -fsSL "${mohistJob}lastSuccessfulBuild/artifact/${latestBuildRelPath}"
+fi
+
+export SKIP_LOG4J_CONFIG=true
+
+# Continue to Final Setup
+exec ${SCRIPTS:-/}start-finalSetup01World $@

start-utils

@@ -99,4 +99,11 @@ function versionLessThan {
       return 1
     fi
   fi
-}
+}
+
+requireVar() {
+  if [ ! -v $1 ]; then
+    log "ERROR: $1 is required to be set"
+    exit 1
+  fi
+}

start-validateCurseInstance

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. /start-utils
+. ${SCRIPTS:-/}start-utils
 
 if ! [[ -v CURSE_INSTANCE_JSON ]]; then
   log "ERROR: CURSE_INSTANCE_JSON needs to be set"
@@ -15,4 +15,4 @@ fi
 log "Resolved CURSE_INSTANCE_JSON as ${CURSE_INSTANCE_JSON}"
 
 # Continue to Final Setup
-exec /start-finalSetup01World "$@"
+exec ${SCRIPTS:-/}start-finalSetup01World "$@"