Auto-merging via docker-versions-create

Envvars in files from `/config` and `/mods` now replaced as expected (#701)

.github/workflows/build-multiarch.yml

@@ -1,62 +0,0 @@
-name: Build and publish multiarch
-on:
-  push:
-    branches:
-      - multiarch
-      - multiarch-latest
-      - "test-multiarch-.*"
-    tags:
-      - "[0-9]+.[0-9]+.[0-9]+-multiarch"
-      - "[0-9]+.[0-9]+.[0-9]+-multiarch-latest"
-
-jobs:
-  docker-buildx:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2.2.0
-
-      - name: Prepare
-        id: prep
-        run: |
-          DOCKER_IMAGE=itzg/minecraft-server
-          VERSION=edge
-          if [[ $GITHUB_REF == refs/tags/* ]]; then
-            VERSION=${GITHUB_REF#refs/tags/}
-          fi
-          if [[ $GITHUB_REF == refs/heads/* ]]; then
-            VERSION=${GITHUB_REF#refs/heads/}
-            if [[ $VERSION == master ]]; then
-              VERSION=latest
-            fi
-          fi
-          TAGS="${DOCKER_IMAGE}:${VERSION}"
-          echo ::set-output name=tags::${TAGS}
-          echo ::set-output name=cache_from::${TAGS}
-
-      - name: Setup Docker Buildx
-        uses: docker/setup-buildx-action@v1
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-
-      - name: Login to DockerHub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKER_USER }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      - name: Build and push
-        id: docker_build
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          file: ./Dockerfile
-          platforms: linux/amd64,linux/arm/v7,linux/arm64
-          push: ${{ github.event_name != 'pull_request' }}
-          tags: ${{ steps.prep.outputs.tags }}
-          cache-from: type=registry,ref=${{ steps.prep.outputs.cache_from }}
-          cache-to: type=inline
-
-      - name: Image digest
-        run: echo ${{ steps.docker_build.outputs.digest }}

BUILDING.md

@@ -1,11 +0,0 @@
-Ensure buildx/BuildKit support is enabled and run:
-
-```shell script
-docker buildx build --platform=linux/arm64 --platform=linux/arm/v7 --platform=linux/amd64 --tag itzg/minecraft-server:multiarch --push .
-```
-
-To build for local testing, use:
-
-```shell script
-docker buildx build --platform=linux/amd64 --tag mc-multiarch --load .
-```

Dockerfile

@@ -1,27 +1,32 @@
-FROM ubuntu:18.04
+FROM adoptopenjdk/openjdk14:alpine-jre
 
 LABEL org.opencontainers.image.authors="Geoff Bourne <itzgeoff@gmail.com>"
 
-RUN apt-get update \
-  && DEBIAN_FRONTEND=noninteractive \
-  apt-get install -y \
-    openjdk-8-jre-headless \
-    imagemagick \
-    gosu \
-    curl wget \
-    jq \
-    dos2unix \
-    mysql-client \
-    tzdata \
-    rsync \
-    nano \
-    unzip \
-    knockd \
-    ttf-dejavu \
-    && apt-get clean
+# upgrade all packages since alpine jre8 base image tops out at 8u212
+RUN apk -U --no-cache upgrade
 
-RUN addgroup --gid 1000 minecraft \
-  && adduser --system --shell /bin/false --uid 1000 --ingroup minecraft --home /data minecraft
+RUN apk add --no-cache -U \
+  openssl \
+  imagemagick \
+  lsof \
+  su-exec \
+  shadow \
+  bash \
+  curl iputils wget \
+  git \
+  jq \
+  mysql-client \
+  tzdata \
+  rsync \
+  nano \
+  sudo \
+  knock \
+  ttf-dejavu
+
+RUN addgroup -g 1000 minecraft \
+  && adduser -Ss /bin/false -u 1000 -G minecraft -h /home/minecraft minecraft \
+  && mkdir -m 777 /data \
+  && chown minecraft:minecraft /data /home/minecraft
 
 COPY files/sudoers* /etc/sudoers.d
 
@@ -29,9 +34,9 @@ EXPOSE 25565 25575
 
 # hook into docker BuildKit --platform support
 # see https://docs.docker.com/engine/reference/builder/#automatic-platform-args-in-the-global-scope
-ARG TARGETOS
-ARG TARGETARCH
-ARG TARGETVARIANT
+ARG TARGETOS=linux
+ARG TARGETARCH=amd64
+ARG TARGETVARIANT=""
 
 ARG EASY_ADD_VER=0.7.1
 ADD https://github.com/itzg/easy-add/releases/download/${EASY_ADD_VER}/easy-add_${TARGETOS}_${TARGETARCH}${TARGETVARIANT} /usr/bin/easy-add

start

@@ -40,7 +40,7 @@ if [ $(id -u) = 0 ]; then
     echo 'hosts: files dns' > /etc/nsswitch.conf
   fi
 
-  exec gosu ${runAsUser}:${runAsGroup} ${SCRIPTS:-/}start-configuration $@
+  exec su-exec ${runAsUser}:${runAsGroup} ${SCRIPTS:-/}start-configuration $@
 else
   exec ${SCRIPTS:-/}start-configuration $@
 fi

start-configuration

@@ -7,8 +7,6 @@ shopt -s nullglob
 #umask 002
 export HOME=/data
 
-log "Running as uid=$(id -u) gid=$(id -g) with /data as '$(ls -lnd /data)'"
-
 if [ ! -e /data/eula.txt ]; then
   if ! isTrue "$EULA"; then
     log ""
@@ -24,6 +22,15 @@ if [ ! -e /data/eula.txt ]; then
 fi
 
 
+log "Running as uid=$(id -u) gid=$(id -g) with /data as '$(ls -lnd /data)'"
+
+if ! touch /data/.verify_access; then
+  log "ERROR: /data doesn't seem to be writable. Please make sure attached directory is writable by uid=$(id -u)"
+  exit 2
+fi
+
+rm /data/.verify_access || true
+
 if [[ $PROXY ]]; then
     export http_proxy="$PROXY"
     export https_proxy="$PROXY"
@@ -95,11 +102,7 @@ case "${TYPE^^}" in
     exec ${SCRIPTS:-/}start-deployFabric "$@"
   ;;
 
-  FTBA)
-    exec ${SCRIPTS:-/}start-deployFTBA "$@"
-  ;;
-
-  CURSEFORGE|FTB)
+  FTB|CURSEFORGE)
     exec ${SCRIPTS:-/}start-deployCF "$@"
   ;;
 

start-deployCF

@@ -7,7 +7,7 @@ isDebugging && set -x
 
 export FTB_BASE_DIR=/data/FeedTheBeast
 legacyJavaFixerUrl=https://ftb.forgecdn.net/FTB2/maven/net/minecraftforge/lex/legacyjavafixer/1.0/legacyjavafixer-1.0.jar
-export TYPE=CURSEFORGE
+export TYPE=FEED-THE-BEAST
 
 FTB_SERVER_MOD=${FTB_SERVER_MOD:-$CF_SERVER_MOD}
 

start-deployFTBA

@@ -1,72 +0,0 @@
-#!/bin/bash
-
-ftbInstallMarker=".ftb-installed"
-
-. ${SCRIPTS:-/}start-utils
-isDebugging && set -x
-set -e
-
-if ! [[ -v FTB_MODPACK_ID ]]; then
-  log "ERROR FTB_MODPACK_ID is required with TYPE=FTB"
-  exit 1
-fi
-
-if ! [[ ${FTB_MODPACK_ID} =~ [0-9]+ ]]; then
-  log "ERROR FTB_MODPACK_ID needs to be numeric"
-  exit 1
-fi
-
-if ! [[ -v FTB_MODPACK_VERSION_ID ]]; then
-  if ! FTB_MODPACK_VERSION_ID=$(curl -fsSL https://api.modpacks.ch/public/modpack/${FTB_MODPACK_ID} | jq -r '.versions | sort_by(.updated)[-1].id'); then
-    log "ERROR unable to resolve latest modpack version ID for modpack ${FTB_MODPACK_ID}"
-    exit 1
-  fi
-elif ! [[ ${FTB_MODPACK_VERSION_ID} =~ [0-9]+ ]]; then
-  log "ERROR FTB_MODPACK_VERSION_ID needs to be numeric"
-  exit 1
-fi
-
-if ! [ -f "${ftbInstallMarker}" ] || [ $(cat "${ftbInstallMarker}") != "${FTB_MODPACK_ID}=${FTB_MODPACK_VERSION_ID}" ]; then
-  ftbInstaller=/data/ftb-installer
-  if ! [[ -f "${ftbInstaller}" ]]; then
-    log "Downloading FTB installer"
-    curl -fsSL https://api.modpacks.ch/public/modpack/1/1/server/linux -o "${ftbInstaller}"
-    chmod +x "${ftbInstaller}"
-  fi
-
-  rm -rf forge*jar mods config libraries defaultconfigs changelogs
-
-  log "Installing modpack ID ${FTB_MODPACK_ID}, version ID ${FTB_MODPACK_VERSION_ID}"
-  ${ftbInstaller} ${FTB_MODPACK_ID} ${FTB_MODPACK_VERSION_ID} --noscript --auto
-  rm -f forge*installer.jar
-
-  echo "${FTB_MODPACK_ID}=${FTB_MODPACK_VERSION_ID}" > ${ftbInstallMarker}
-
-  writeEula
-else
-  log "FTB modpack ID ${FTB_MODPACK_ID}, version ID ${FTB_MODPACK_VERSION_ID} is ready to go"
-fi
-
-isDebugging && cat version.json
-forgeVersion=$(jq -r '.targets[] | select(.name == "forge") | .version' version.json)
-mcVersion=$(jq -r '.targets[] | select(.name == "minecraft") | .version' version.json)
-
-variants=(
-  forge-${mcVersion}-${forgeVersion}.jar
-  forge-${mcVersion}-${forgeVersion}-universal.jar
-  forge-${mcVersion}-${forgeVersion}-${mcVersion}-universal.jar
-)
-for f in ${variants[@]}; do
-  if [ -f $f ]; then
-    export SERVER=$f
-    break
-  fi
-done
-if ! [ -v SERVER ]; then
-  log "ERROR unable to locate the installed forge server jar"
-  ls *.jar
-  exit 2
-fi
-
-# Continue to Final Setup
-exec ${SCRIPTS:-/}start-finalSetupWorld $@

start-deployPaper

@@ -4,54 +4,66 @@
 set -o pipefail
 isDebugging && set -x
 
-# PaperMC API v2 docs : https://papermc.io/api/docs/swagger-ui/index.html?configUrl=/api/openapi/swagger-config
+if [[ $PAPER_DOWNLOAD_URL ]]; then
+  export SERVER=$(getFilenameFromUrl "${PAPER_DOWNLOAD_URL}")
 
-build=$(curl -fsSL "https://papermc.io/api/v2/projects/paper/versions/${VANILLA_VERSION}" -H  "accept: application/json" \
- | jq '.builds[-1]')
-case $? in
-  0)
-    ;;
-  22)
-    versions=$(curl -fsSL "https://papermc.io/api/v2/projects/paper" -H  "accept: application/json")
-    if [[ $VERSION = LATEST ]]; then
-        VANILLA_VERSION=$(echo "$versions" | jq -r '.versions[-1]')
-        log "WARN: using ${VANILLA_VERSION} since that's the latest provided by PaperMC"
-        # re-execute the current script with the newly computed version
-        exec $0 "$@"
-    fi
-    log "ERROR: ${VANILLA_VERSION} is not published by PaperMC"
-    log "       Set VERSION to one of the following: "
-    log "       $(echo "$versions" | jq -r '.versions | join(", ")')"
+  if [ -f "$SERVER" ]; then
+    zarg=(-z "$SERVER")
+  fi
+
+  echo "Preparing custom PaperMC jar from $PAPER_DOWNLOAD_URL"
+
+  curl -fsSL -o "$SERVER" "${zarg[@]}" "${PAPER_DOWNLOAD_URL}"
+else
+  # PaperMC API v2 docs : https://papermc.io/api/docs/swagger-ui/index.html?configUrl=/api/openapi/swagger-config
+
+  build=$(curl -fsSL "https://papermc.io/api/v2/projects/paper/versions/${VANILLA_VERSION}" -H  "accept: application/json" \
+   | jq '.builds[-1]')
+  case $? in
+    0)
+      ;;
+    22)
+      versions=$(curl -fsSL "https://papermc.io/api/v2/projects/paper" -H  "accept: application/json")
+      if [[ $VERSION = LATEST ]]; then
+          VANILLA_VERSION=$(echo "$versions" | jq -r '.versions[-1]')
+          log "WARN: using ${VANILLA_VERSION} since that's the latest provided by PaperMC"
+          # re-execute the current script with the newly computed version
+          exec $0 "$@"
+      fi
+      log "ERROR: ${VANILLA_VERSION} is not published by PaperMC"
+      log "       Set VERSION to one of the following: "
+      log "       $(echo "$versions" | jq -r '.versions | join(", ")')"
+      exit 1
+      ;;
+    *)
+      echo "ERROR: unknown error while looking up PaperMC version=${VANILLA_VERSION}"
+      exit 1
+      ;;
+  esac
+  if [ $? != 0 ]; then
+    echo "ERROR: failed to lookup PaperMC build from version ${VANILLA_VERSION}"
     exit 1
-    ;;
-  *)
-    echo "ERROR: unknown error while looking up PaperMC version=${VANILLA_VERSION}"
+  fi
+
+  export SERVER=$(curl -fsSL "https://papermc.io/api/v2/projects/paper/versions/${VANILLA_VERSION}/builds/${build}" -H  "accept: application/json" \
+   | jq -r '.downloads.application.name')
+  if [ $? != 0 ]; then
+    echo "ERROR: failed to lookup PaperMC download file from version=${VANILLA_VERSION} build=${build}"
     exit 1
-    ;;
-esac
-if [ $? != 0 ]; then
-  echo "ERROR: failed to lookup PaperMC build from version ${VANILLA_VERSION}"
-  exit 1
-fi
+  fi
 
-export SERVER=$(curl -fsSL "https://papermc.io/api/v2/projects/paper/versions/${VANILLA_VERSION}/builds/${build}" -H  "accept: application/json" \
- | jq -r '.downloads.application.name')
-if [ $? != 0 ]; then
-  echo "ERROR: failed to lookup PaperMC download file from version=${VANILLA_VERSION} build=${build}"
-  exit 1
-fi
+  if [ -f "$SERVER" ]; then
+    zarg=(-z "$SERVER")
+  fi
 
-if [ -f "$SERVER" ]; then
-  zarg=(-z "$SERVER")
-fi
-
-log "Downloading PaperMC $VANILLA_VERSION (build $build) ..."
-curl -fsSL -o "$SERVER" "${zarg[@]}" \
-  "https://papermc.io/api/v2/projects/paper/versions/${VANILLA_VERSION}/builds/${build}/downloads/${SERVER}" \
-  -H  "accept: application/java-archive"
-if [ $? != 0 ]; then
-  echo "ERROR: failed to download PaperMC from version=${VANILLA_VERSION} build=${build} download=${SERVER}"
-  exit 1
+  log "Downloading PaperMC $VANILLA_VERSION (build $build) ..."
+  curl -fsSL -o "$SERVER" "${zarg[@]}" \
+    "https://papermc.io/api/v2/projects/paper/versions/${VANILLA_VERSION}/builds/${build}/downloads/${SERVER}" \
+    -H  "accept: application/java-archive"
+  if [ $? != 0 ]; then
+    echo "ERROR: failed to download PaperMC from version=${VANILLA_VERSION} build=${build} download=${SERVER}"
+    exit 1
+  fi
 fi
 
 # Normalize on Spigot for downstream operations

start-finalSetupModconfig

@@ -24,4 +24,4 @@ case "X$MODCONFIG" in
 esac
 fi
 
-exec ${SCRIPTS:-/}start-finalSetupPlugins $@
+exec ${SCRIPTS:-/}start-finalSetupMounts $@

start-finalSetupModpack

@@ -19,8 +19,13 @@ if isTrue ${REMOVE_OLD_MODS}; then
       ;;
   esac
 
-  log "Removing old mods in $remove_mods_dest..."
-  find $remove_mods_dest -mindepth 1 -maxdepth ${REMOVE_OLD_MODS_DEPTH:-16} -wholename "${REMOVE_OLD_MODS_INCLUDE:-*}" -not -wholename "${REMOVE_OLD_MODS_EXCLUDE}" -delete
+  # only try to remove existing mods dir
+  if [ -d "$remove_mods_dest" ]; then
+    log "Removing old mods in $remove_mods_dest..."
+    find $remove_mods_dest -mindepth 1 -maxdepth ${REMOVE_OLD_MODS_DEPTH:-16} -wholename "${REMOVE_OLD_MODS_INCLUDE:-*}" -not -wholename "${REMOVE_OLD_MODS_EXCLUDE}" -delete
+  else
+    log "Directory $remove_mods_dest does not exist; removing nothing."
+  fi
 fi
 
 # If supplied with a URL for a modpack (simple zip of jars), download it and unpack

start-finalSetupMounts

@@ -0,0 +1,38 @@
+#!/bin/bash
+
+. ${SCRIPTS:-/}start-utils
+
+: ${PLUGINS_SYNC_UPDATE:=true}
+
+isDebugging && set -x
+
+if [ -d /plugins ]; then
+  case ${TYPE} in
+    SPIGOT|BUKKIT|PAPER|MAGMA)
+      mkdir -p /data/plugins
+      log "Copying plugins over..."
+      if isTrue ${PLUGINS_SYNC_UPDATE}; then
+        updateArg="--update"
+      fi
+      # Copy plugins over using rsync to allow deeply nested updates of plugins
+      rsync -a --out-format="update:%f:Last Modified %M" --prune-empty-dirs $updateArg /plugins /data
+      ;;
+  esac
+fi
+
+# If any modules have been provided, copy them over
+if [ -d /mods ]; then
+  log "Copying any mods over..."
+  mkdir -p /data/mods
+  rsync -a --out-format="update:%f:Last Modified %M" "${rsyncArgs[@]}" --prune-empty-dirs --update /mods /data
+fi
+
+: ${COPY_CONFIG_DEST:="/data/config"}
+
+if [ -d /config ]; then
+  log "Copying any configs from /config to $COPY_CONFIG_DEST"
+  mkdir -p $COPY_CONFIG_DEST
+  rsync -a --out-format="update:%f:Last Modified %M" "${rsyncArgs[@]}" --prune-empty-dirs --update /config/ $COPY_CONFIG_DEST
+fi
+
+exec ${SCRIPTS:-/}start-finalSetupServerProperties $@

start-finalSetupPlugins

@@ -1,23 +0,0 @@
-#!/bin/bash
-
-. ${SCRIPTS:-/}start-utils
-
-: ${PLUGINS_SYNC_UPDATE:=true}
-
-isDebugging && set -x
-
-if [ -d /plugins ]; then
-  case ${TYPE} in
-    SPIGOT|BUKKIT|PAPER)
-      mkdir -p /data/plugins
-      log "Copying plugins over..."
-      if isTrue ${PLUGINS_SYNC_UPDATE}; then
-        updateArg="--update"
-      fi
-      # Copy plugins over using rsync to allow deeply nested updates of plugins
-      rsync -a --out-format="update:%f:Last Modified %M" --prune-empty-dirs $updateArg /plugins /data
-      ;;
-  esac
-fi
-
-exec ${SCRIPTS:-/}start-finalSetupServerProperties $@

start-minecraftFinalSetup

@@ -2,8 +2,6 @@
 
 . ${SCRIPTS:-/}start-utils
 
-: ${COPY_CONFIG_DEST:="/data/config"}
-
 if [ -n "$OPS" ]; then
   log "Setting/adding ops"
   rm -rf /data/ops.txt.converted
@@ -51,20 +49,6 @@ for j in $JSON_FILES; do
   fi
 done
 
-
-# If any modules have been provided, copy them over
-if [ -d /mods ]; then
-  log "Copying any mods over..."
-  mkdir -p /data/mods
-  rsync -a --out-format="update:%f:Last Modified %M" "${rsyncArgs[@]}" --prune-empty-dirs --update /mods /data
-fi
-
-if [ -d /config ]; then
-  log "Copying any configs from /config to $COPY_CONFIG_DEST"
-  mkdir -p $COPY_CONFIG_DEST
-  rsync -a --out-format="update:%f:Last Modified %M" "${rsyncArgs[@]}" --prune-empty-dirs --update /config/ $COPY_CONFIG_DEST
-fi
-
 EXTRA_ARGS=""
 # Optional disable console
 if versionLessThan 1.14 && [[ ${CONSOLE,,} = false ]]; then
@@ -180,7 +164,7 @@ if [[ ${TYPE} == "CURSE_INSTANCE" ]]; then
     exec mc-server-runner ${mcServerRunnerArgs} \
       --cf-instance-file "${CURSE_INSTANCE_JSON}" \
       java $JVM_XX_OPTS $JVM_OPTS $expandedDOpts -jar _SERVERJAR_ "$@" $EXTRA_ARGS
-elif [[ ${TYPE} == "CURSEFORGE" && "${SERVER}" ]]; then
+elif [[ ${TYPE} == "FEED-THE-BEAST" && "${SERVER}" ]]; then
   copyFilesForCurseForge
 
   cd "${FTB_DIR}"
@@ -189,7 +173,7 @@ elif [[ ${TYPE} == "CURSEFORGE" && "${SERVER}" ]]; then
     set -x
   fi
   exec mc-server-runner ${bootstrapArgs} ${mcServerRunnerArgs} java $JVM_XX_OPTS $JVM_OPTS $expandedDOpts -jar $(basename "${SERVER}") "$@" $EXTRA_ARGS
-elif [[ ${TYPE} == "CURSEFORGE" ]]; then
+elif [[ ${TYPE} == "FEED-THE-BEAST" ]]; then
   mcServerRunnerArgs="${mcServerRunnerArgs} --shell bash"
 
   copyFilesForCurseForge