Auto-merging via docker-versions-create

2026-02-17 15:13:55 +00:00 · 2020-12-27 22:05:17 -06:00 · 2020-12-19 08:23:58 -06:00 · 2020-12-15 13:59:46 -06:00 · 2020-11-25 15:53:49 -06:00 · 2020-08-09 13:06:24 -05:00
60 changed files with 847 additions and 1768 deletions
--- a/.circleci/config.yml
+++ b/.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
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,7 +0,0 @@
-version: 2
-updates:
-  # Maintain dependencies for GitHub Actions
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "weekly"
--- a/.github/workflows/build-multiarch.yml
+++ b/.github/workflows/build-multiarch.yml
@@ -2,86 +2,24 @@ name: Build and publish multiarch
 on:
  push:
    branches:
-      - master
-      - "*-multiarch"
-      - "multiarch*"
-      - java8-openj9
-      - java11*
-      - java16*
-      - test/multiarch/*
+      - 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]+-java16*"
-    paths-ignore:
-      - "*.md"
-      - "docs/**"
-      - "examples/**"
+      - "[0-9]+.[0-9]+.[0-9]+-multiarch"

 jobs:
  docker-buildx:
-    if: github.repository == 'itzg/docker-minecraft-server'
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v2.3.4
-
-      - name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v3
+        uses: actions/checkout@v2.2.0
+      - name: Get branch name
+        uses: nelonoel/branch-name@v1
+      - name:  Docker Buildx
+        uses: ilteoood/docker_buildx@1.0.4
        with:
-          images: |
-            itzg/minecraft-server
-          tags: |
-            type=ref,event=branch
-            type=ref,event=tag
-          flavor: |
-            latest=${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
+          publish: true
+          imageName: itzg/minecraft-server
+          tag: ${{ env.BRANCH_NAME }}
+          dockerHubUser: ${{ secrets.DOCKER_USER }}
+          dockerHubPassword: ${{ secrets.DOCKER_PASSWORD }}

-      - name: Setup Docker Buildx
-        uses: docker/setup-buildx-action@v1
-
-      - name: Cache Docker layers
-        uses: actions/cache@v2.1.6
-        with:
-          path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-buildx-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-buildx-
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1.2.0
-
-      - 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.6.1
-        with:
-          context: .
-          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
-          pull: true
-          cache-from: type=local,src=/tmp/.buildx-cache
-          cache-to: type=local,dest=/tmp/.buildx-cache-new
-          labels: ${{ steps.meta.outputs.labels }}
-
-      - name: Image digest
-        run: echo ${{ steps.docker_build.outputs.digest }}
-
-      - # Temp fix
-        # https://github.com/docker/build-push-action/issues/252
-        # https://github.com/moby/buildkit/issues/1896
-        name: Move cache
-        run: |
-          rm -rf /tmp/.buildx-cache
-          mv /tmp/.buildx-cache-new /tmp/.buildx-cache
--- a/.github/workflows/generate-toc.yml
+++ b/.github/workflows/generate-toc.yml
@@ -1,21 +0,0 @@
-name: Generate README table of contents
-on:
-  push:
-    branches:
-      - master
-    paths:
-      - README.md
-jobs:
-  generate:
-    if: github.repository == 'itzg/docker-minecraft-server'
-    runs-on: ubuntu-latest
-    timeout-minutes: 5
-    steps:
-      - uses: actions/checkout@v2.3.4
-      - run: |
-          curl https://raw.githubusercontent.com/ekalinin/github-markdown-toc/master/gh-md-toc -o gh-md-toc
-          chmod a+x gh-md-toc
-          ./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"
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -3,24 +3,28 @@ name: Build and Publish
 on:
  push:
    branches:
-      - java8
+      - master
      - openj9
-      - openj9-11
+      - openj9-nightly
      - adopt11
-      - test/*
+      - adopt13
+      - adopt14
+      - adopt15
    tags:
-      - "[0-9]+.[0-9]+.[0-9]+-java8"
+      - "[0-9]+.[0-9]+.[0-9]+"
      - "[0-9]+.[0-9]+.[0-9]+-openj9"
-      - "[0-9]+.[0-9]+.[0-9]+-openj9-11"
      - "[0-9]+.[0-9]+.[0-9]+-openj9-nightly"
      - "[0-9]+.[0-9]+.[0-9]+-adopt11"
+      - "[0-9]+.[0-9]+.[0-9]+-adopt13"
+      - "[0-9]+.[0-9]+.[0-9]+-adopt14"
+      - "[0-9]+.[0-9]+.[0-9]+-adopt15"

 jobs:
  test:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest

    steps:
-      - uses: actions/checkout@v2.3.4
+      - uses: actions/checkout@v2

      - name: Run tests
        run: |
@@ -28,73 +32,20 @@ jobs:
  build:
    needs:
      - test
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest

    steps:
-    - uses: actions/checkout@v2.3.4
+    - uses: actions/checkout@v2

-    - 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=version::${VERSION//\//-}
-
-    - name: Setup Docker Buildx
-      uses: docker/setup-buildx-action@v1
-
-    - name: Cache Docker layers
-      uses: actions/cache@v2.1.6
-      with:
-        path: /tmp/.buildx-cache
-        key: ${{ runner.os }}-buildx-${{ github.sha }}
-        restore-keys: |
-          ${{ runner.os }}-buildx-
-
-    - name: Login to DockerHub
-      uses: docker/login-action@v1
+    - name: Build and push Docker images
+      uses: docker/build-push-action@v1.1.0
      with:
+        repository: itzg/minecraft-server
        username: ${{ secrets.DOCKER_USER }}
        password: ${{ secrets.DOCKER_PASSWORD }}
-
-    - name: Build and push
-      id: docker_build
-      uses: docker/build-push-action@v2.6.1
-      with:
-        context: .
-        file: ./Dockerfile
-        # ensure latest base image is used
-        pull: true
-        # publish
+        tag_with_ref: true
+        tag_with_sha: false
+        cache_froms: itzg/minecraft-server:latest
+        add_git_labels: true
+        labels: org.opencontainers.image.url=https://github.com/itzg/docker-minecraft-server,org.opencontainers.image.documentation=https://github.com/itzg/docker-minecraft-server
        push: true
-        # tags determined by prep step
-        tags: ${{ steps.prep.outputs.tags }}
-        cache-from: type=local,src=/tmp/.buildx-cache
-        cache-to: type=local,dest=/tmp/.buildx-cache-new
-        labels: |
-          org.opencontainers.image.documentation=https://github.com/itzg/docker-minecraft-server
-          org.opencontainers.image.version=${{ steps.prep.outputs.version }}
-          org.opencontainers.image.source=https://github.com/itzg/docker-minecraft-server
-          org.opencontainers.image.revision=${{ github.sha }}
-
-    - name: Image digest
-      run: echo ${{ steps.docker_build.outputs.digest }}
-
-    - # Temp fix
-      # https://github.com/docker/build-push-action/issues/252
-      # https://github.com/moby/buildkit/issues/1896
-      name: Move cache
-      run: |
-        rm -rf /tmp/.buildx-cache
-        mv /tmp/.buildx-cache-new /tmp/.buildx-cache
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -9,7 +9,7 @@ jobs:
    runs-on: ubuntu-latest

    steps:
-      - uses: actions/checkout@v2.3.4
+      - uses: actions/checkout@v2

      - name: Run tests
        run: |
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
 /data/
 /.idea/
-*.iml
-/gh-md-toc
+*.iml
--- a/BUILDING.md
+++ b/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 .
-```
--- a/67
+++ b/67
@@ -1,29 +1,32 @@
-FROM adoptopenjdk:11-jre
+FROM adoptopenjdk/openjdk8-openj9:alpine

 LABEL org.opencontainers.image.authors="Geoff Bourne <itzgeoff@gmail.com>"

-RUN apt-get update \
-  && DEBIAN_FRONTEND=noninteractive \
-  apt-get install -y \
-    imagemagick \
-    gosu \
-    sudo \
-    net-tools \
-    curl wget \
-    git \
-    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

@@ -31,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
@@ -48,7 +51,7 @@ RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
 --from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz

 RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
- --var version=0.7.1 --var app=mc-monitor --file {{.app}} \
+ --var version=0.1.7 --var app=mc-monitor --file {{.app}} \
 --from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz

 RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
@@ -66,15 +69,12 @@ COPY server.properties /tmp/server.properties
 COPY log4j2.xml /tmp/log4j2.xml
 WORKDIR /data

-STOPSIGNAL SIGTERM
-
 ENV UID=1000 GID=1000 \
  MEMORY="1G" \
-  TYPE=VANILLA VERSION=LATEST \
-  ENABLE_RCON=true RCON_PORT=25575 RCON_PASSWORD=minecraft \
-  SERVER_PORT=25565 ONLINE_MODE=TRUE SERVER_NAME="Dedicated Server" \
-  ENABLE_AUTOPAUSE=false AUTOPAUSE_TIMEOUT_EST=3600 AUTOPAUSE_TIMEOUT_KN=120 AUTOPAUSE_TIMEOUT_INIT=600 \
-  AUTOPAUSE_PERIOD=10 AUTOPAUSE_KNOCK_INTERFACE=eth0
+  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" \
+  ENABLE_AUTOPAUSE=false AUTOPAUSE_TIMEOUT_EST=3600 AUTOPAUSE_TIMEOUT_KN=120 AUTOPAUSE_TIMEOUT_INIT=600 AUTOPAUSE_PERIOD=10

 COPY start* /
 COPY health.sh /
@@ -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
--- a/README.md
+++ b/README.md
--- a/docker-versions-create.sh
+++ b/docker-versions-create.sh
@@ -1,16 +1,7 @@
 #!/bin/bash
 #set -x
 # Use this variable to indicate a list of branches that docker hub is watching
-branches_list=(
-  'java8'
-  'java8-multiarch'
-  'java8-openj9'
-  'java11'
-  'java11-openj9'
-  'java16'
-  'java16-openj9'
-  'multiarch-latest'
-  )
+branches_list=('openj9' 'openj9-nightly' 'adopt11' 'adopt13' 'adopt14' 'adopt15' 'multiarch' 'multiarch-latest')

 function TrapExit {
  echo "Checking out back in master"
--- a/docs/.gitkeep
+++ b/docs/.gitkeep
--- a/docs/level-vs-world.drawio.png
+++ b/docs/level-vs-world.drawio.png
--- a/docs/world-copy-compose-project.drawio.png
+++ b/docs/world-copy-compose-project.drawio.png
--- a/examples/docker-compose-big.yml
+++ b/examples/docker-compose-big.yml
@@ -1,4 +1,4 @@
-version: '3.8'
+version: '3'

 services:
  minecraft:
--- a/examples/docker-compose-curseforge.yml
+++ b/examples/docker-compose-curseforge.yml
@@ -1,8 +1,8 @@
-version: '3.8'
+version: '3.2'

 services:
  mc:
-    image: itzg/minecraft-server:java8
+    image: itzg/minecraft-server
    volumes:
    - ./modpacks:/modpacks:ro
    environment:
--- a/examples/docker-compose-curseinstance.yml
+++ b/examples/docker-compose-curseinstance.yml
@@ -0,0 +1,20 @@
+version: "3.7"
+
+services:
+  mc:
+    image: itzg/minecraft-server
+    ports:
+      - 25565:25565
+    volumes:
+      # Attach .../Curse/Minecraft/Instances for use at /instances
+      - ./Instances:/instances:ro
+      # Attach /data as usual
+      - ./ServerData:/data
+    environment:
+      EULA: "TRUE"
+      # Modpacks generally need more memory, so let's give at 2 GB
+      MEMORY: 2G
+      # Use new CURSE_INSTANCE type
+      TYPE: CURSE_INSTANCE
+      # Reference directory of or full path to minecraftinstance.json
+      CURSE_INSTANCE_JSON: /instances/FTB Presents SkyFactory 3
--- a/examples/docker-compose-fabric.yml
+++ b/examples/docker-compose-fabric.yml
@@ -1,15 +0,0 @@
-version: "3"
-
-services:
-  mc:
-    image: ${IMAGE:-itzg/minecraft-server}
-    environment:
-      EULA: "true"
-      TYPE: FABRIC
-    ports:
-      - 25565:25565
-    volumes:
-      - fabric:/data
-
-volumes:
-  fabric: {}
--- a/examples/docker-compose-forge.yml
+++ b/examples/docker-compose-forge.yml
@@ -1,8 +1,8 @@
-version: "3.8"
+version: "3.7"

 services:
  mc:
-    image: itzg/minecraft-server:java8
+    image: itzg/minecraft-server
    ports:
    # expose the Minecraft server port outside of container
    - 25565:25565
--- a/examples/docker-compose-ftba.yml
+++ b/examples/docker-compose-ftba.yml
@@ -1,9 +1,9 @@
-version: "3.8"
+version: "3.7"

 services:
  mc:
-    # FTBA support is only available in non-Alpine images
-    image: itzg/minecraft-server:java8-multiarch
+    # FTBA support is only available in multiarch image tag
+    image: itzg/minecraft-server:multiarch
    ports:
      # expose the Minecraft server port outside of container
      - 25565:25565
--- a/examples/docker-compose-paper.yml
+++ b/examples/docker-compose-paper.yml
@@ -1,4 +1,4 @@
-version: '3.8'
+version: '3.7'

 services:
  mc:
--- a/examples/docker-compose-proxied.yml
+++ b/examples/docker-compose-proxied.yml
@@ -1,4 +1,4 @@
-version: '3.8'
+version: '3'

 services:
  mc:
--- a/examples/docker-compose-simple.yml
+++ b/examples/docker-compose-simple.yml
@@ -1,12 +0,0 @@
-version: "3.8"
-
-services:
-  mc:
-    image: itzg/minecraft-server
-    ports:
-      - 25565:25565
-    environment:
-      EULA: "TRUE"
-    volumes:
-      # attach the relative directory 'data' to the container's /data path
-      - ./data:/data
--- a/examples/docker-compose-spiget.yml
+++ b/examples/docker-compose-spiget.yml
@@ -1,17 +0,0 @@
-version: "3"
-
-services:
-  mc:
-    # Only using IMAGE variable to allow for local testing
-    image: ${IMAGE:-itzg/minecraft-server}
-    ports:
-      - 25565:25565
-    environment:
-      EULA: "TRUE"
-      TYPE: SPIGOT
-      SPIGET_RESOURCES: 9089,34315,3836
-    volumes:
-      - data:/data
-
-volumes:
-  data: {}
--- a/examples/docker-compose-spongeforge.yml
+++ b/examples/docker-compose-spongeforge.yml
@@ -1,11 +1,11 @@
-version: '3.8'
+version: '3'
 # Forge with Sponge API support. THIS REQUIRES DOWNLOADING SPONGEFORGE.
 # Place the SpongeForge jar file in /data/mods. Other Forge mods go here as well.
 # Place Sponge mods in /data/mods/plugins. Yes, this is a directory inside the Forge mod directory. Do NOT use /data/plugins.

 services:
  minecraft:
-    image: itzg/minecraft-server:java8
+    image: itzg/minecraft-server
    ports:
      - "25565:25565"
    volumes:
--- a/examples/docker-compose-world-download.yml
+++ b/examples/docker-compose-world-download.yml
@@ -1,4 +1,4 @@
-version: "3.8"
+version: "3.7"

 services:
  mc:
--- a/examples/modpacks/README.md
+++ b/examples/modpacks/README.md
@@ -1,3 +1,3 @@
-Place server [modpacks downloaded from CurseForge](https://www.curseforge.com/minecraft/modpacks) in this directory.
+Please server [modpacks downloaded from CurseForge](https://www.curseforge.com/minecraft/modpacks) in this directory.

-The example [`docker-compose-curseforge.yml`](../docker-compose-curseforge.yml) references a modpack downloaded from <https://www.curseforge.com/minecraft/modpacks/skyfactory-4/files/3012800>.
+The example [`docker-compose-curseforge.yml`](../docker-compose-curseforge.yml) references a modpack downloaded from <https://www.curseforge.com/minecraft/modpacks/skyfactory-4/files/2787018>.
--- a/files/autopause/autopause-daemon.sh
+++ b/files/autopause/autopause-daemon.sh
@@ -2,48 +2,23 @@

 . /autopause/autopause-fcns.sh

-. ${SCRIPTS:-/}start-utils
+. /start-utils

-
-autopause_error_loop() {
-  logAutopause "Available interfaces within the docker container:"
-  INTERFACES=$(echo /sys/class/net/*)
-  INTERFACES=${INTERFACES//\/sys\/class\/net\//}
-  logAutopause "  $INTERFACES"
-  logAutopause "Please set the environment variable AUTOPAUSE_KNOCK_INTERFACE to the interface that handles incoming connections."
-  logAutopause "If unsure which interface to choose, run the ifconfig command in the container."
-  logAutopause "Autopause failed to initialize. This log entry will be printed every 30 minutes."
+sudo /usr/sbin/knockd -c /tmp/knockd-config.cfg -d
+if [ $? -ne 0 ] ; then
  while :
  do
-    sleep 1800
-    logAutopause "Autopause failed to initialize."
+    if [[ -n $(ps -o comm | grep java) ]] ; then
+      break
+    fi
+    sleep 0.1
  done
-}
-
-# wait for java process to be started
-while :
-do
-  if java_process_exists ; then
-    break
-  fi
-  sleep 0.1
-done
-
-# check for interface existence
-if [[ -z "$AUTOPAUSE_KNOCK_INTERFACE" ]] ; then
-  logAutopause "AUTOPAUSE_KNOCK_INTERFACE variable must not be empty!"
-  autopause_error_loop
-fi
-if ! [[ -d "/sys/class/net/$AUTOPAUSE_KNOCK_INTERFACE" ]] ; then
-  logAutopause "Selected interface \"$AUTOPAUSE_KNOCK_INTERFACE\" does not exist!"
-  autopause_error_loop
-fi
-
-sudo /usr/sbin/knockd -c /tmp/knockd-config.cfg -d -i "$AUTOPAUSE_KNOCK_INTERFACE"
-if [ $? -ne 0 ] ; then
  logAutopause "Failed to start knockd daemon."
-  logAutopause "Probable cause: Unable to attach to interface \"$AUTOPAUSE_KNOCK_INTERFACE\"."
-  autopause_error_loop
+  logAutopause "Possible cause: docker's host network mode."
+  logAutopause "Recreate without host mode or disable autopause functionality."
+  logAutopause "Stopping server."
+  killall -SIGTERM java
+  exit 1
 fi

 STATE=INIT
--- a/files/autopause/autopause-fcns.sh
+++ b/files/autopause/autopause-fcns.sh
@@ -5,15 +5,11 @@ current_uptime() {
 }

 java_running() {
-  [[ $( ps -ax -o stat,comm | grep 'java' | awk '{ print $1 }') =~ ^S.*$ ]]
-}
-
-java_process_exists() {
-  [[ -n "$(ps -ax -o comm | grep 'java')" ]]
+  [[ $( ps -a -o stat,comm | grep 'java' | awk '{ print $1 }') =~ ^S.*$ ]]
 }

 rcon_client_exists() {
-  [[ -n "$(ps -ax -o comm | grep 'rcon-cli')" ]]
+  [[ -n "$(ps -a -o comm | grep 'rcon-cli')" ]]
 }

 mc_server_listening() {
--- a/files/autopause/knockd-config.cfg
+++ b/files/autopause/knockd-config.cfg
@@ -3,10 +3,10 @@
 [unpauseMCServer-server]
 sequence = 25565
 seq_timeout = 1
- command = /usr/sbin/gosu minecraft:minecraft /autopause/resume.sh
+ command = /sbin/su-exec minecraft:minecraft /autopause/resume.sh
 tcpflags = syn
 [unpauseMCServer-rcon]
 sequence = 25575
 seq_timeout = 1
- command = /usr/sbin/gosu minecraft:minecraft /autopause/resume.sh
+ command = /sbin/su-exec minecraft:minecraft /autopause/resume.sh
 tcpflags = syn
--- a/files/autopause/pause.sh
+++ b/files/autopause/pause.sh
@@ -2,7 +2,7 @@

 . /start-utils

-if [[ $( ps -ax -o stat,comm | grep 'java' | awk '{ print $1 }') =~ ^S.*$ ]] ; then
+if [[ $( ps -a -o stat,comm | grep 'java' | awk '{ print $1 }') =~ ^S.*$ ]] ; then
  # save world
  rcon-cli save-all >/dev/null

@@ -17,5 +17,5 @@ if [[ $( ps -ax -o stat,comm | grep 'java' | awk '{ print $1 }') =~ ^S.*$ ]] ; t

  # finally pause the process
  logAutopauseAction "Pausing Java process"
-  pkill -STOP java
+  killall -q -STOP java
 fi
--- a/files/autopause/resume.sh
+++ b/files/autopause/resume.sh
@@ -2,7 +2,7 @@

 . /start-utils

-if [[ $( ps -ax -o stat,comm | grep 'java' | awk '{ print $1 }') =~ ^T.*$ ]] ; then
+if [[ $( ps -a -o stat,comm | grep 'java' | awk '{ print $1 }') =~ ^T.*$ ]] ; then
  logAutopauseAction "Knocked, resuming Java process"
-  pkill -CONT java
+  killall -q -CONT java
 fi
--- a/files/sudoers-mc
+++ b/files/sudoers-mc
@@ -1,2 +1,2 @@
-%minecraft ALL=(ALL) NOPASSWD:/usr/bin/pkill
+%minecraft ALL=(ALL) NOPASSWD:/usr/bin/killall
 %minecraft ALL=(ALL) NOPASSWD:/usr/sbin/knockd
--- a/health.sh
+++ b/health.sh
@@ -5,7 +5,7 @@
 if isTrue "${DISABLE_HEALTHCHECK}"; then
  echo "Healthcheck disabled"
  exit 0
-elif isTrue "${ENABLE_AUTOPAUSE}" && [[ "$( ps -ax -o stat,comm | grep 'java' | awk '{ print $1 }')" =~ ^T.*$ ]]; then
+elif isTrue "${ENABLE_AUTOPAUSE}" && [[ "$( ps -a -o stat,comm | grep 'java' | awk '{ print $1 }')" =~ ^T.*$ ]]; then
  echo "Java process suspended by Autopause function"
  exit 0
 else
--- a/4
+++ b/4
@@ -5,7 +5,7 @@
 umask 0002
 chmod g+w /data

-if ! isTrue "${SKIP_SUDO:-false}" && [ $(id -u) = 0 ]; then
+if [ $(id -u) = 0 ]; then
  runAsUser=minecraft
  runAsGroup=minecraft

@@ -40,7 +40,7 @@ if ! isTrue "${SKIP_SUDO:-false}" && [ $(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
--- a/9
+++ b/9
@@ -46,15 +46,10 @@ if ! [[ $AUTOPAUSE_TIMEOUT_INIT =~ ^[0-9]+$ ]] ; then
  export AUTOPAUSE_TIMEOUT_INIT
  log "Warning: AUTOPAUSE_TIMEOUT_INIT is not numeric, set to 600 (seconds)"
 fi
-if [[ "$AUTOPAUSE_KNOCK_INTERFACE" == "lo" ]] ; then
-  log "Warning: AUTOPAUSE_KNOCK_INTERFACE is set to the local loopback interface."
-  log "         This is not advisable, as incoming connections are likely not picked up there."
-  log "         Continuing with this setting."
-fi

-if [[ -n "$MAX_TICK_TIME" && "$MAX_TICK_TIME" != "-1" ]] ; then
+if [[ -n $MAX_TICK_TIME ]] ; then
  log "Warning: MAX_TICK_TIME is non-default, for autopause to work properly, this check should be disabled (-1 for versions >= 1.8.1)"
-elif [[ -z "$MAX_TICK_TIME" ]] ; then
+else
  if versionLessThan 1.8.1; then
    # 10 years
    MAX_TICK_TIME=315360000000
--- a/59
+++ b/59
@@ -1,20 +1,12 @@
 #!/bin/bash
-set -euo pipefail
-IFS=$'\n\t'

 . ${SCRIPTS:-/}start-utils

-: ${EULA:=}
-: ${PROXY:=}
-: ${RCON_PASSWORD_FILE:=}
-
 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 ""
@@ -30,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"
@@ -54,11 +55,7 @@ if [[ $RCON_PASSWORD_FILE ]]; then
    log ""
 fi

-if ! which java > /dev/null; then
-  log "Fixing PATH to include java"
-  PATH="${PATH}:/opt/java/openjdk/bin"
-fi
-
+export SERVER_PROPERTIES=/data/server.properties
 export VERSIONS_JSON=https://launchermeta.mojang.com/mc/game/version_manifest.json

 case "X$VERSION" in
@@ -98,12 +95,6 @@ case "${TYPE^^}" in
  ;;

  FORGE)
-    log "**********************************************************************"
-    log "WARNING: The image tag itzg/minecraft-server:java8 is recommended"
-    log "         since some mods require Java 8"
-    log "         Exception traces reporting ClassCastException: class jdk.internal.loader.ClassLoaders\$AppClassLoader"
-    log "         can be fixed with java8"
-    log "**********************************************************************"
    exec ${SCRIPTS:-/}start-deployForge "$@"
  ;;

@@ -111,17 +102,7 @@ case "${TYPE^^}" in
    exec ${SCRIPTS:-/}start-deployFabric "$@"
  ;;

-  FTBA)
-    exec ${SCRIPTS:-/}start-deployFTBA "$@"
-  ;;
-
  FTB|CURSEFORGE)
-    log "**********************************************************************"
-    log "WARNING: The image tag itzg/minecraft-server:java8 is recommended"
-    log "         since some mods require Java 8"
-    log "         Exception traces reporting ClassCastException: class jdk.internal.loader.ClassLoaders\$AppClassLoader"
-    log "         can be fixed with java8"
-    log "**********************************************************************"
    exec ${SCRIPTS:-/}start-deployCF "$@"
  ;;

@@ -153,27 +134,11 @@ case "${TYPE^^}" in
    exec ${SCRIPTS:-/}start-deployCatserver "$@"
  ;;

-  PURPUR)
-    exec ${SCRIPTS:-/}start-deployPurpur "$@"
-  ;;
-
-  YATOPIA)
-    exec ${SCRIPTS:-/}start-deployYatopia "$@"
-  ;;
-
-  AIRPLANE)
-    exec ${SCRIPTS:-/}start-deployAirplane "$@"
-  ;;
-
-  CANYON)
-    exec ${SCRIPTS:-/}start-deployCanyon "$@"
-  ;;
-
  *)
      log "Invalid type: '$TYPE'"
      log "Must be: VANILLA, FORGE, BUKKIT, SPIGOT, PAPER, FTBA (multiarch-only),"
-      log "         CURSE_INSTANCE, CURSEFORGE, SPONGEVANILLA, TUINITY, PURPUR"
-      log "         CUSTOM, MAGMA, MOHIST, CATSERVER, YATOPIA, AIRPLANE, CANYON"
+      log "         CURSE_INSTANCE, CURSEFORGE, SPONGEVANILLA,"
+      log "         CUSTOM, MAGMA, MOHIST, CATSERVER"
      exit 1
  ;;

--- a/49
+++ b/49
@@ -1,49 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-IFS=$'\n\t'
-
-. ${SCRIPTS:-/}start-utils
-isDebugging && set -x
-
-if [ "${VERSION}" != "LATEST" ] && [ "${VERSION}" != "1.16" ] && [ "${VERSION}" != "1.17" ] && [ "${VERSION}" != "PURPUR" ] && [ "${VERSION}" != "PURPUR-1.16" ] ; then
-  log "ERROR: Airplane server type only supports VERSION=LATEST, VERSION=1.17, VERSION=1.16, VERSION=PURPUR or VERSION=PURPUR-1.16. Note that these are branches, not #.#.# versions."
-  exit 1
-fi
-
-: ${AIRPLANE_BUILD:=lastSuccessfulBuild}
-
-if  [ "${VERSION}" = "LATEST" ] || [ "${VERSION}" = "1.17" ]; then
-  AIRPLANE_BRANCH="1.17"
-fi
-
-if [ "${VERSION}" = "1.16" ]; then
-  AIRPLANE_BRANCH="1.16"
-fi
-
-if [ "${VERSION}" = "PURPUR" ]; then
-  AIRPLANE_BRANCH="Purpur-1.17"
-fi
-
-if [ "${VERSION}" = "PURPUR-1.16" ]; then
-  AIRPLANE_BRANCH="Purpur-1.16"
-fi
-
-log "Using Airplane-${AIRPLANE_BRANCH} branch"
-
-export SERVER=airplane-${AIRPLANE_BRANCH}-${AIRPLANE_BUILD}.jar
-
-if [ ! -f "$SERVER" ] || isTrue "${FORCE_REDOWNLOAD:-false}"; then
-    downloadUrl="https://ci.tivy.ca/job/Airplane-${AIRPLANE_BRANCH}/${AIRPLANE_BUILD}/artifact/launcher-airplane.jar"
-    log "Downloading Airplane from $downloadUrl ..."
-    curl -fsSL -o "$SERVER" "$downloadUrl"
-    if [ ! -f "$SERVER" ]; then
-      log "ERROR: failed to download from $downloadUrl (status=$?)"
-      exit 3
-    fi
-fi
-
-# Normalize on Spigot for later operations
-export TYPE=SPIGOT
-export SKIP_LOG4J_CONFIG=true
-
-exec ${SCRIPTS:-/}start-spiget "$@"
--- a/13
+++ b/13
@@ -64,11 +64,7 @@ function downloadSpigot {
  fi

  if [[ -z $downloadUrl ]]; then
-    if versionLessThan 1.16.5; then
-      downloadUrl="https://cdn.getbukkit.org/${getbukkitFlavor}/${getbukkitFlavor}-${VANILLA_VERSION}.jar"
-    else
-      downloadUrl="https://download.getbukkit.org/${getbukkitFlavor}/${getbukkitFlavor}-${VANILLA_VERSION}.jar"
-    fi
+    downloadUrl="https://cdn.getbukkit.org/${getbukkitFlavor}/${getbukkitFlavor}-${VANILLA_VERSION}.jar"
  fi

  setServerVar
@@ -86,9 +82,7 @@ function downloadSpigot {

 ERROR: failed to download from $downloadUrl
       Visit https://getbukkit.org/download/${getbukkitFlavor} to lookup the
-       exact version, such as 1.4.6-R0.4-SNAPSHOT or 1.8-R0.1-SNAPSHOT-latest.
-       Click into the version entry to find the **exact** version, because something
-       like "1.8" is not sufficient according to their download naming.
+       exact version, such as 1.4.6-R0.4-SNAPSHOT or 1.8-R0.1-SNAPSHOT-LATEST

 EOF

@@ -129,4 +123,5 @@ fi
 export TYPE=SPIGOT
 export SKIP_LOG4J_CONFIG=true

-exec ${SCRIPTS:-/}start-spiget "$@"
+# Continue to Final Setup
+exec ${SCRIPTS:-/}start-finalSetupWorld $@
--- a/63
+++ b/63
@@ -3,31 +3,11 @@
 set -e

 . ${SCRIPTS:-/}start-utils
-
-loadForgeVars() {
-  cfgFile=${1?}
-  pat='^([^#;][^=]+)=[:space:]*([^;]*)'
-  while read -r line || [[ -n "$line" ]] ; do
-      if [[ $line =~ $pat ]]; then
-          #echo "MATCHED $line"
-          k=${BASH_REMATCH[1]}
-          v=${BASH_REMATCH[2]}
-          case $k in
-            FORGEURL)
-              forgeInstallerUrl="$v"
-              ;;
-          esac
-      fi
-  done < "$cfgFile"
-}
-
 isDebugging && set -x

-: ${FTB_BASE_DIR:=${CF_BASE_DIR:-/data/FeedTheBeast}}
-export FTB_BASE_DIR
-
+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}

@@ -60,39 +40,23 @@ if ! isTrue ${USE_MODPACK_START_SCRIPT:-true}; then
    mkdir -p ${FTB_BASE_DIR}
    unzip -o "${FTB_SERVER_MOD}" -d ${FTB_BASE_DIR} | awk '{printf "."} END {print ""}'

-    serverJar=$(find ${FTB_BASE_DIR} -type f \( -path "*/libraries/*" -o -path "*/mods/*" \) -prune -o -name "forge*.jar" -not -name "forge*installer.jar" -print)
+    serverJar=$(find ${FTB_BASE_DIR}  -path "*/libraries/*" -prune -type f -o  -not -name "forge*installer.jar" -name "forge*.jar")
    if [[ -z "$serverJar" ]]; then
-
-      if [ -f "${FTB_BASE_DIR}/settings.cfg" ]; then
-        loadForgeVars "${FTB_BASE_DIR}/settings.cfg"
-
-        if [[ $forgeInstallerUrl ]]; then
-          forgeInstallerJar="${FTB_BASE_DIR}/forge-installer.jar"
-          if ! curl -fsSL -o "$forgeInstallerJar" "$forgeInstallerUrl" ; then
-            log "ERROR failed to download Forge installer from $forgeInstallerUrl"
-            exit 2
-          fi
-        fi
-      else
-        forgeInstallerJar=$(find "${FTB_BASE_DIR}" -name "forge*installer.jar")
-      fi
-
+      forgeInstallerJar=$(find ${FTB_BASE_DIR} -name "forge*installer.jar")
      if [[ -z "${forgeInstallerJar}" ]]; then
-        log "ERROR Unable to find forge installer in modpack"
-        log "      or download using modpack config."
+        log "ERROR Unable to find forge installer in modpack."
        log "      Make sure you downloaded the server files."
        exit 2
      fi

      log "Installing forge server"
-      dirOfInstaller=$(dirname "${forgeInstallerJar}")
-      (cd "${dirOfInstaller}"; java -jar $(basename "${forgeInstallerJar}") --installServer)
+      (cd $(dirname "${forgeInstallerJar}"); java -jar $(basename "${forgeInstallerJar}") --installServer) | awk '{printf "."} END {print ""}'
    fi

    echo "${FTB_SERVER_MOD}" > $installMarker
  fi

-  export SERVER=$(find ${FTB_BASE_DIR} -type f \( -path "/libraries/*" -o -path "/mods/*" \) -prune -o -name "forge*.jar" -not -name "forge*installer.jar" -maxdepth 2 -print)
+  export SERVER=$(find ${FTB_BASE_DIR}  -path "*/libraries/*" -prune -type f -o  -not -name "forge*installer.jar" -name "forge*.jar")
  if [[ -z "${SERVER}" || ! -f "${SERVER}" ]]; then
    log "ERROR unable to locate installed forge server jar"
    isDebugging && find ${FTB_BASE_DIR} -name "forge*.jar"
@@ -110,7 +74,6 @@ entryScriptExpr="
  -o -name ServerStartLinux.sh
  -o -name LaunchServer.sh
  -o -name server-start.sh
-  -o -name start-server.sh
  -o -name startserver.sh
  -o -name StartServer.sh
  "
@@ -169,23 +132,13 @@ if [[ $startScriptCount = 0 ]]; then
  log "Unpacking FTB server modpack ${srv_modpack} ..."
  mkdir -p ${FTB_BASE_DIR}
  unzip -o "${srv_modpack}" -d ${FTB_BASE_DIR} | awk '{printf "."} END {print ""}'
-
-  installScript=$(find "${FTB_BASE_DIR}" -maxdepth 2 -type f -name install.sh)
-  if [[ "$installScript" ]]; then
-    (
-      cd "$(dirname "${installScript}")"
-      chmod +x ./install.sh
-      log "Running included install.sh"
-      ./install.sh
-    )
-  fi
 fi

 if [[ $(find ${FTB_BASE_DIR} $entryScriptExpr | wc -l) = 0 ]]; then

    # Allow up to 2 levels since some modpacks have a top-level directory named
    # for the modpack
-    forgeJar=$(find ${FTB_BASE_DIR} -type f \( -path "/libraries/*" -o -path "/mods/*" \) -prune -o -name "forge*.jar" -not -name "forge*installer.jar" -maxdepth 2 -print)
+    forgeJar=$(find ${FTB_BASE_DIR} -maxdepth 2 -name 'forge*.jar' -a -not -name 'forge*installer')
    if [[ "$forgeJar" ]]; then
      export FTB_BASE_DIR=$(dirname "${forgeJar}")
      log "No entry script found, so building one for ${forgeJar}"
--- a/54
+++ b/54
@@ -1,54 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-IFS=$'\n\t'
-
-. ${SCRIPTS:-/}start-utils
-isDebugging && set -x
-
-: ${CANYON_BUILD:=lastSuccessfulBuild}
-JAVA_VER=$(java -version 2>&1 | head -1 | cut -d'"' -f2 | sed '/^1\./s///' | cut -d'.' -f1)
-
-if [ "${JAVA_VER}" != "8" ]; then
-  log "ERROR: Canyon server type only supports Java version 8"
-  exit 1
-fi
-
-if [ "${VERSION}" != "b1.7.3" ]; then
-  log "ERROR: Canyon server type only supports VERSION=b1.7.3"
-  exit 1
-fi
-
-canyonJob="https://ci.velocitypowered.com/job/Canyon"
-
-buildRelPath=$(
-  curl -fsSL "${canyonJob}/${CANYON_BUILD}/api/json" |
-    jq -r '.artifacts[0].relativePath'
-)
-buildNumber=$(
-  curl -fsSL "${canyonJob}/${CANYON_BUILD}/api/json" |
-    jq -r '.number'
-)
-baseName=$(basename "${buildRelPath}")
-
-# Add build tag to non-tagged builds for version detection
-if [ ${baseName%.*} = 'canyon-server' ]; then
-    export SERVER=${baseName%.*}_build${buildNumber}.jar
-else
-    export SERVER="${baseName}"
-fi
-
-if [ ! -f "$SERVER" ]; then
-    downloadUrl="${canyonJob}/${CANYON_BUILD}/artifact/${buildRelPath}"
-    log "Downloading Canyon build ${buildNumber} from $downloadUrl ..."
-    curl -fsSL -o "$SERVER" "$downloadUrl"
-    if [ ! -f "$SERVER" ]; then
-      log "ERROR: failed to download from $downloadUrl (status=$?)"
-      exit 3
-    fi
-fi
-
-# Normalize on Spigot for later operations
-export TYPE=SPIGOT
-export SKIP_LOG4J_CONFIG=true
-
-exec ${SCRIPTS:-/}start-spiget "$@"
--- a/7
+++ b/7
@@ -1,7 +1,6 @@
 #!/bin/bash

 . ${SCRIPTS:-/}start-utils
-isDebugging && set -x

 if isURL ${CUSTOM_SERVER}; then
  filename=$(basename ${CUSTOM_SERVER})
@@ -18,16 +17,12 @@ if isURL ${CUSTOM_SERVER}; then
  fi

 elif [[ -f ${CUSTOM_SERVER} ]]; then
-  export SERVER=${CUSTOM_SERVER}
-
-elif [[ ${GENERIC_PACK} ]]; then
-  log "Using custom server jar from generic pack at ${CUSTOM_SERVER} ..."
+  log "Using custom server jar at ${CUSTOM_SERVER} ..."
  export SERVER=${CUSTOM_SERVER}

 else
  log "CUSTOM_SERVER is not properly set to a URL or existing jar file"
  exit 2
-
 fi

 export SKIP_LOG4J_CONFIG=true
--- a/77
+++ b/77
@@ -1,77 +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
-
-  # some modpacks result in --w----r-- permissions
-  chmod a+r version.json
-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|unique[] | select(.name == "forge") | .version' version.json)
-fabricVersion=$(jq -r '.targets|unique[] | select(.name == "fabric") | .version' version.json)
-mcVersion=$(jq -r '.targets|unique[] | select(.name == "minecraft") | .version' version.json)
-
-variants=(
-  forge-${mcVersion}-${forgeVersion}.jar
-  forge-${mcVersion}-${forgeVersion}-universal.jar
-  forge-${mcVersion}-${forgeVersion}-${mcVersion}-universal.jar
-  fabric-${mcVersion}-${fabricVersion}-server-launch.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 FTB server jar"
-  ls *.jar
-  exit 2
-fi
-
-# Continue to Final Setup
-exec ${SCRIPTS:-/}start-finalSetupWorld $@
--- a/80
+++ b/80
@@ -3,50 +3,58 @@ set -eu

 . ${SCRIPTS:-/}start-utils

-requireVar VANILLA_VERSION
 export TYPE=FABRIC
-export SERVER=fabric-server-${VANILLA_VERSION}.jar

-isDebugging && set -x
-
-if [[ ! -e ${SERVER} ]]; then
-
-  : ${FABRIC_INSTALLER:=}
-  : ${FABRIC_INSTALLER_URL:=}
-  : ${FABRIC_INSTALLER_VERSION:=${FABRICVERSION:-LATEST}}
-
-  if [[ -z $FABRIC_INSTALLER && -z $FABRIC_INSTALLER_URL ]]; then
-    log "Checking Fabric version information."
-    if [[ ${FABRIC_INSTALLER_VERSION^^} = LATEST ]]; then
+FABRIC_INSTALLER=${FABRIC_INSTALLER:-}
+FABRIC_INSTALLER_URL=${FABRIC_INSTALLER_URL:-}
+FABRIC_INSTALLER_VERSION=${FABRIC_INSTALLER_VERSION:-${FABRICVERSION:-LATEST}}
+if [[ -z $FABRIC_INSTALLER && -z $FABRIC_INSTALLER_URL ]]; then
+  log "Checking Fabric version information."
+  case $FABRIC_INSTALLER_VERSION in
+    LATEST)
      FABRIC_INSTALLER_VERSION=$(maven-metadata-release https://maven.fabricmc.net/net/fabricmc/fabric-installer/maven-metadata.xml)
-    fi
+      ;;
+  esac

-    FABRIC_INSTALLER="fabric-installer-${FABRIC_INSTALLER_VERSION}.jar"
-    FABRIC_INSTALLER_URL="https://maven.fabricmc.net/net/fabricmc/fabric-installer/${FABRIC_INSTALLER_VERSION}/fabric-installer-${FABRIC_INSTALLER_VERSION}.jar"
-  elif [[ -z $FABRIC_INSTALLER ]]; then
-    FABRIC_INSTALLER="fabric-installer.jar"
-  elif [[ ! -e $FABRIC_INSTALLER ]]; then
-    log "ERROR: the given Fabric installer doesn't exist : $FABRIC_INSTALLER"
-    exit 2
-  fi
+  FABRIC_INSTALLER="/tmp/fabric-installer-${FABRIC_INSTALLER_VERSION}.jar"
+  markerVersion=$FABRIC_INSTALLER_VERSION

+elif [[ -z $FABRIC_INSTALLER ]]; then
+  FABRIC_INSTALLER="/tmp/fabric-installer.jar"
+  markerVersion=custom
+elif [[ ! -e $FABRIC_INSTALLER ]]; then
+  log "ERROR: the given Fabric installer doesn't exist : $FABRIC_INSTALLER"
+  exit 2
+fi
+
+installMarker="/data/.fabric-installed-${VANILLA_VERSION}-${markerVersion}"
+
+debug Checking for installMarker ${installMarker}
+if [[ ! -e $installMarker ]]; then
  if [[ ! -e $FABRIC_INSTALLER ]]; then
-    log "Downloading $FABRIC_INSTALLER_URL ..."
-    if ! curl -o $FABRIC_INSTALLER -fsSL $FABRIC_INSTALLER_URL; then
-      log "Failed to download from given location $FABRIC_INSTALLER_URL"
-      exit 2
+    if [[ -z $FABRIC_INSTALLER_URL ]]; then
+      log "Downloading installer version $FABRIC_INSTALLER_VERSION"
+      downloadUrl="https://maven.fabricmc.net/net/fabricmc/fabric-installer/${FABRIC_INSTALLER_VERSION}/fabric-installer-${FABRIC_INSTALLER_VERSION}.jar"
+      log "...trying $downloadUrl"
+      curl -o $FABRIC_INSTALLER -fsSL $downloadUrl
+    else
+      log "Downloading $FABRIC_INSTALLER_URL ..."
+      if ! curl -o $FABRIC_INSTALLER -fsSL $FABRIC_INSTALLER_URL; then
+        log "Failed to download from given location $FABRIC_INSTALLER_URL"
+        exit 2
+      fi
    fi
  fi

-  log "Installing Fabric ${VANILLA_VERSION} using $FABRIC_INSTALLER"
-
+  if isDebugging; then
+    debug "Installing Fabric ${VANILLA_VERSION} using $FABRIC_INSTALLER"
+  else
+    log "Installing Fabric using $FABRIC_INSTALLER"
+  fi
  tries=3
  set +e
  while ((--tries >= 0)); do
-    java -jar $FABRIC_INSTALLER server \
-      -mcversion $VANILLA_VERSION \
-      -downloadMinecraft \
-      -dir /data
+    java -jar $FABRIC_INSTALLER server -mcversion $VANILLA_VERSION -downloadMinecraft
    if [[ $? == 0 ]]; then
      break
    fi
@@ -56,9 +64,13 @@ if [[ ! -e ${SERVER} ]]; then
    log "Fabric failed to install after several tries." >&2
    exit 10
  fi
+  export SERVER=fabric-server-launch.jar
+  log "Using server $SERVER"
+  echo $SERVER > $installMarker

-  mv fabric-server-launch.jar ${SERVER}
+else
+  export SERVER=$(< $installMarker)
 fi

-# Continue to Final Setup
+# Contineut to Final Setup
 exec ${SCRIPTS:-/}start-finalSetupWorld $@
--- a/13
+++ b/13
@@ -1,9 +1,8 @@
 #!/bin/bash

 . ${SCRIPTS:-/}start-utils
+
 export TYPE=FORGE
-: ${FORGEVERSION:=RECOMMENDED}
-isDebugging && set -x

 if [[ -z $FORGE_INSTALLER && -z $FORGE_INSTALLER_URL ]]; then
  norm=$VANILLA_VERSION
@@ -46,8 +45,6 @@ elif [[ -z $FORGE_INSTALLER ]]; then
 elif [[ ! -e $FORGE_INSTALLER ]]; then
  log "ERROR: the given Forge installer doesn't exist : $FORGE_INSTALLER"
  exit 2
-else
-  shortForgeVersion=$VANILLA_VERSION-custom
 fi

 installMarker="/data/.forge-installed-$shortForgeVersion"
@@ -68,7 +65,7 @@ if [ ! -e $installMarker ]; then
          log "Unable to compute URL for $normForgeVersion"
          exit 2
        fi
-        downloadUrl=https://maven.minecraftforge.net/net/minecraftforge/forge/$fn
+        downloadUrl=http://files.minecraftforge.net/maven/net/minecraftforge/forge/$fn
        log "...trying $downloadUrl"
        if curl -o $FORGE_INSTALLER -fsSL $downloadUrl; then
          break
@@ -100,11 +97,7 @@ if [ ! -e $installMarker ]; then
  log "Finding installed server jar..."
  unset -v latest
  for file in *forge*.jar; do
-    if ! [[ $file =~ installer ]]; then
-      if [[ -z $latest ]] || [[ $file -nt $latest ]]; then
-        latest=$file
-      fi
-    fi
+    [[ $file =~ installer ]] || [[ $file -nt $latest ]] && latest=$file
  done
  if [[ -z $latest ]]; then
    log "Unable to derive server jar for Forge"
--- a/15
+++ b/15
@@ -6,27 +6,26 @@ set -e
 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

-buildRelPath=$(
-  curl -fsSL "${mohistJob}${MOHIST_BUILD}/api/json" |
+latestBuildRelPath=$(
+  curl -fsSL "${mohistJob}lastSuccessfulBuild/api/json" |
    jq -r '.artifacts[0].relativePath'
 )

-baseName=$(basename "${buildRelPath}")
+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/MohistMC/ for available versions"
+  log "       check https://ci.codemc.io/job/Mohist-Community/ for available versions"
  log "       and set VERSION accordingly"
  exit 1
 fi
@@ -35,7 +34,7 @@ export SERVER="/data/${baseName}"

 if [ ! -f ${SERVER} ]; then
  log "Downloading ${baseName}"
-  curl -o "${SERVER}" -fsSL "${mohistJob}${MOHIST_BUILD}/artifact/${buildRelPath}"
+  curl -o "${SERVER}" -fsSL "${mohistJob}lastSuccessfulBuild/artifact/${latestBuildRelPath}"
 fi

 export SKIP_LOG4J_CONFIG=true
--- a/15
+++ b/15
@@ -17,8 +17,8 @@ if [[ $PAPER_DOWNLOAD_URL ]]; then
 else
  # PaperMC API v2 docs : https://papermc.io/api/docs/swagger-ui/index.html?configUrl=/api/openapi/swagger-config

-  build=${PAPERBUILD:=$(curl -fsSL "https://papermc.io/api/v2/projects/paper/versions/${VANILLA_VERSION}" -H  "accept: application/json" \
-   | jq '.builds[-1]')}
+  build=$(curl -fsSL "https://papermc.io/api/v2/projects/paper/versions/${VANILLA_VERSION}" -H  "accept: application/json" \
+   | jq '.builds[-1]')
  case $? in
    0)
      ;;
@@ -28,7 +28,7 @@ else
          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" "$@"
+          exec $0 "$@"
      fi
      log "ERROR: ${VANILLA_VERSION} is not published by PaperMC"
      log "       Set VERSION to one of the following: "
@@ -56,12 +56,6 @@ else
    zarg=(-z "$SERVER")
  fi

-  log "Removing old PaperMC versions ..."
-  shopt -s nullglob
-  for f in paper-*.jar; do
-    [[ $f != $SERVER ]] && rm $f
-  done
-
  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}" \
@@ -76,4 +70,5 @@ fi
 export TYPE=SPIGOT
 export SKIP_LOG4J_CONFIG=true

-exec ${SCRIPTS:-/}start-spiget "$@"
+# Continue to Final Setup
+exec ${SCRIPTS:-/}start-finalSetupWorld $@
--- a/37
+++ b/37
@@ -1,37 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-IFS=$'\n\t'
-
-. ${SCRIPTS:-/}start-utils
-isDebugging && set -x
-
-: ${VANILLA_VERSION:?}
-: ${PURPUR_BUILD:=LATEST}
-: ${FORCE_REDOWNLOAD:=false}
-
-if [[ ${PURPUR_BUILD} == LATEST ]]; then
-  PURPUR_BUILD=$(curl -fsSL "https://api.pl3x.net/v2/purpur/${VANILLA_VERSION}" |
-    jq -r '.builds.latest' || echo "")
-  if [[ -z ${PURPUR_BUILD} ]]; then
-    log "ERROR: Failed to locate a Purpur build for ${VANILLA_VERSION}."
-    log "       Please check if a download is available at https://purpur.pl3x.net/downloads/"
-    exit 3
-  fi
-fi
-
-export SERVER="purpur-${VANILLA_VERSION}-${PURPUR_BUILD}.jar"
-
-if [ ! -f "$SERVER" ] || isTrue "$FORCE_REDOWNLOAD"; then
-    downloadUrl="https://api.pl3x.net/v2/purpur/${VANILLA_VERSION}/${PURPUR_BUILD}/download"
-    log "Downloading Purpur from $downloadUrl ..."
-    if ! curl -fsSL -o "$SERVER" "$downloadUrl"; then
-      log "ERROR: failed to download from $downloadUrl (status=$?)"
-      exit 3
-    fi
-fi
-
-# Normalize on Spigot for later operations
-export TYPE=SPIGOT
-export SKIP_LOG4J_CONFIG=true
-
-exec ${SCRIPTS:-/}start-spiget "$@"
--- a/2
+++ b/2
@@ -3,8 +3,6 @@
 . ${SCRIPTS:-/}start-utils

 export TYPE=spongevanilla
-: ${SPONGEBRANCH:=STABLE}
-: ${SPONGEVERSION:=}

 # Parse branch
 log "Choosing branch for Sponge"
--- a/15
+++ b/15
@@ -3,16 +3,16 @@
 . ${SCRIPTS:-/}start-utils

 if [ "${VERSION}" != "LATEST" ]; then
-  log "ERROR: Tuinity server type only supports VERSION=LATEST"
+  log "ERROR: Tunity server type only supports VERSION=LATEST"
  exit 1
 fi

-: ${TUINITY_BUILD:=lastSuccessfulBuild}
-export SERVER=tuinity-${VANILLA_VERSION}-${TUINITY_BUILD}.jar
+: ${TUNITY_BUILD:=lastSuccessfulBuild}
+export SERVER=tunity-${VANILLA_VERSION}-${TUNITY_BUILD}.jar

 if [ ! -f "$SERVER" ] || [ -n "$FORCE_REDOWNLOAD" ]; then
-    downloadUrl="https://ci.codemc.io/job/Spottedleaf/job/Tuinity/${TUINITY_BUILD}/artifact/tuinity-paperclip.jar"
-    log "Downloading Tuinity (build $TUINITY_BUILD) from $downloadUrl ..."
+    downloadUrl="https://ci.codemc.io/job/Spottedleaf/job/Tuinity/${TUNITY_BUILD}/artifact/tuinity-paperclip.jar"
+    log "Downloading Tunity (build $TUNITY_BUILD) from $downloadUrl ..."
    curl -fsSL -o "$SERVER" "$downloadUrl"
    if [ ! -f "$SERVER" ]; then
      log "ERROR: failed to download from $downloadUrl (status=$?)"
@@ -20,7 +20,8 @@ if [ ! -f "$SERVER" ] || [ -n "$FORCE_REDOWNLOAD" ]; then
    fi
 fi

-# Normalize on Spigot for later operations
+# Normalize on Spigot for operations below
 export TYPE=SPIGOT

-exec ${SCRIPTS:-/}start-spiget "$@"
+# Continue to Final Setup
+exec ${SCRIPTS:-/}start-finalSetupWorld $@
--- a/30
+++ b/30
@@ -1,30 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-IFS=$'\n\t'
-
-. ${SCRIPTS:-/}start-utils
-isDebugging && set -x
-
-: ${VANILLA_VERSION:?}
-: ${RELEASE:=latest}
-: ${FORCE_REDOWNLOAD:=false}
-
-requireEnum RELEASE stable latest
-
-export SERVER="yatopia-${RELEASE}-${VANILLA_VERSION}.jar"
-
-if [ ! -f "$SERVER" ] || isTrue "$FORCE_REDOWNLOAD"; then
-    downloadUrl="https://api.yatopiamc.org/v2/${RELEASE}Build/download?branch=ver/${VANILLA_VERSION}"
-    log "Downloading Yatopia from $downloadUrl ..."
-    if ! curl -fsSL -o "$SERVER" "$downloadUrl"; then
-      log "ERROR: failed to download from $downloadUrl (status=$?)"
-      exit 3
-    fi
-fi
-
-# Normalize on Spigot for later operations
-export TYPE=SPIGOT
-export SKIP_LOG4J_CONFIG=true
-
-# Continue to Final Setup
-exec ${SCRIPTS:-/}start-finalSetupWorld $@
--- a/42
+++ b/42
@@ -5,7 +5,7 @@
 : ${ENV_VARIABLE_PREFIX:=CFG_}

 if isTrue "${REPLACE_ENV_VARIABLES}"; then
-  log "Replacing env variables in configs that match the prefix $ENV_VARIABLE_PREFIX ..."
+  log "Replacing env variables in configs that match the prefix $ENV_VARIABLE_PREFIX..."

  # File excludes
  fileExcludes=
@@ -22,30 +22,28 @@ if isTrue "${REPLACE_ENV_VARIABLES}"; then
  isDebugging && echo "Using find file exclusions: $fileExcludes"
  isDebugging && echo "Using find directory exclusions: $dirExcludes"

-  for name in $(compgen -v $ENV_VARIABLE_PREFIX); do
+  while IFS='=' read -r name value ; do
    # check if name of env variable matches the prefix
    # sanity check environment variables to avoid code injections
-    # Read content from file environment
-    if [[ $name = *"_FILE" ]]; then
-      value=$(<${!name})
-      name="${name%_FILE}"
-    else
-      value=${!name}
+    if [[ "$name" = $ENV_VARIABLE_PREFIX* ]] \
+        && [[ $value =~ ^[0-9a-zA-Z_:/=?.+\-]*$ ]] \
+        && [[ $name =~ ^[0-9a-zA-Z_\-]*$ ]]; then
+      # Read content from file environment
+      if [[ $name = *"_FILE" ]] && [[ -f $value ]]; then
+        name="${name/_FILE/}"
+        value=$(<$value)
+      fi
+
+      log "Replacing $name with $value ..."
+      find /data/ \
+          $dirExcludes \
+          -type f \
+          \( -name "*.yml" -or -name "*.yaml" -or -name "*.txt" -or -name "*.cfg" \
+          -or -name "*.conf" -or -name "*.properties" \) \
+          $fileExcludes \
+          -exec sed -i 's#${'"$name"'}#'"$value"'#g' {} \;
    fi
-
-    log "Replacing $name with $value ..."
-
-    value=${value//\\/\\\\}
-    value=${value//#/\\#}
-
-    find /data/ \
-        $dirExcludes \
-        -type f \
-        \( -name "*.yml" -or -name "*.yaml" -or -name "*.txt" -or -name "*.cfg" \
-        -or -name "*.conf" -or -name "*.properties" -or -name "*.hjson" -or -name "*.json" \) \
-        $fileExcludes \
-        -exec sed -i 's#${'"$name"'}#'"$value"'#g' {} \;
-  done
+  done < <(env)
 fi

 exec ${SCRIPTS:-/}start-minecraftFinalSetup $@
--- a/88
+++ b/88
@@ -11,9 +11,21 @@ fi
 CURSE_URL_BASE=${CURSE_URL_BASE:-https://minecraft.curseforge.com/projects}

 # Remove old mods/plugins
-if isTrue ${REMOVE_OLD_MODS:-false}; then
-  removeOldMods /data/mods
-  removeOldMods /data/plugins
+if isTrue ${REMOVE_OLD_MODS}; then
+  remove_mods_dest="/data/mods"
+  case ${TYPE} in
+    SPIGOT|BUKKIT|PAPER)
+      remove_mods_dest="/data/plugins"
+      ;;
+  esac
+
+  # 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
@@ -25,39 +37,35 @@ if [[ "$MODPACK" ]]; then
      downloadUrl=$(curl -Ls -o /dev/null -w %{effective_url} $MODPACK)
      if ! [[ $downloadUrl == *.zip ]]; then
        log "ERROR Invalid URL given for MODPACK: $downloadUrl resolved from $MODPACK"
-        log "      Must be HTTP, HTTPS or FTP and a ZIP file"
+        log "      Must be HTTP or HTTPS and a ZIP file"
        exit 1
      fi
    fi

-    log "Downloading mod/plugin pack"
+    log "Downloading mod/plugin pack via HTTP"
    log "  from $downloadUrl ..."
    if ! curl -sSL -o /tmp/modpack.zip "$downloadUrl"; then
      log "ERROR: failed to download from $downloadUrl"
      exit 2
    fi
-  elif [[ "$MODPACK" =~ .*\.zip ]]; then
-    if ! cp $MODPACK /tmp/modpack.zip; then
-      log "ERROR: failed to copy from $MODPACK"
-      exit 2
+
+    if [ "$TYPE" = "SPIGOT" ]; then
+      mkdir -p /data/plugins
+      if ! unzip -o -d /data/plugins /tmp/modpack.zip; then
+        log "ERROR: failed to unzip the modpack from $downloadUrl"
+      fi
+    else
+      mkdir -p /data/mods
+      if ! unzip -o -d /data/mods /tmp/modpack.zip; then
+        log "ERROR: failed to unzip the modpack from $downloadUrl"
+      fi
    fi
+    rm -f /tmp/modpack.zip
+
  else
-    log "ERROR Invalid URL or Path given for MODPACK: $MODPACK"
+    log "ERROR Invalid URL given for MODPACK: $MODPACK"
    exit 1
  fi
-
-  if [ "$TYPE" = "SPIGOT" ]; then
-    mkdir -p /data/plugins
-    if ! unzip -o -d /data/plugins /tmp/modpack.zip; then
-      log "ERROR: failed to unzip the modpack from $downloadUrl"
-    fi
-  else
-    mkdir -p /data/mods
-    if ! unzip -o -d /data/mods /tmp/modpack.zip; then
-      log "ERROR: failed to unzip the modpack from $downloadUrl"
-    fi
-  fi
-  rm -f /tmp/modpack.zip
 fi

 # If supplied with a URL for a plugin download it.
@@ -73,36 +81,19 @@ if [[ "$MODS" ]]; then
  do
    if isURL $i; then
      log "Downloading mod/plugin $i ..."
-      if isValidFileURL jar "$i"; then
-        if ! curl -fsSL -o "${out_dir}/$(getFilenameFromUrl "${i}")" "${i}"; then
+      effective_url=$(resolveEffectiveUrl "$i")
+      if isValidFileURL jar "${effective_url}"; then
+        out_file=$(getFilenameFromUrl "${effective_url}")
+        if ! curl -fsSL -o "${out_dir}/$out_file" "${effective_url}"; then
          log "ERROR: failed to download from $i into $out_dir"
          exit 2
        fi
      else
-        effective_url=$(resolveEffectiveUrl "$i")
-        if isValidFileURL jar "${effective_url}"; then
-          out_file=$(getFilenameFromUrl "${effective_url}")
-          if ! curl -fsSL -o "${out_dir}/$out_file" "${effective_url}"; then
-            log "ERROR: failed to download from $i into $out_dir"
-            exit 2
-          fi
-        else
-          log "ERROR: $effective_url resolved from $i is not a valid jar URL"
-          exit 2
-        fi
-      fi
-    elif [[ -f "$i" && "$i" =~ .*\.jar ]]; then
-      log "Copying plugin located at $i ..."
-      out_file=$(basename "$i")
-      if ! cp "$i" "${out_dir}/$out_file"; then
-        log "ERROR: failed to copy from $i into $out_dir"
+        log "ERROR: $effective_url resolved from $i is not a valid jar URL"
        exit 2
      fi
-    elif [[ -d "$i" ]]; then
-      log "Copying plugin jars from $i ..."
-      cp "$i"/*.jar "${out_dir}"
    else
-      log "ERROR Invalid URL or path given in MODS: $i"
+      log "ERROR Invalid URL given in MODS: $i"
      exit 2
    fi
  done
@@ -162,8 +153,7 @@ if [[ "${GENERIC_PACK}" ]]; then
  if ! sha256sum -c ${sum_file} -s 2> /dev/null; then
    base_dir=/tmp/generic_pack_base
    mkdir -p ${base_dir}
-    isDebugging && ls -l "${GENERIC_PACK}"
-    unzip -q -d ${base_dir} "${GENERIC_PACK}"
+    unzip -q -d ${base_dir} ${GENERIC_PACK}
    if [ -f /data/manifest.txt ]; then
      log "Manifest exists from older generic pack, cleaning up ..."
      while read f; do
@@ -181,7 +171,7 @@ if [[ "${GENERIC_PACK}" ]]; then
    for d in $(find ${base_dir} -type d); do mkdir -p "$(sed "s#${base_dir}#/data#" <<< $d)"; done
    for f in $(find ${base_dir} -type f); do cp -f "$f" "$(sed "s#${base_dir}#/data#" <<< $f)"; done
    rm -rf ${base_dir}
-    sha256sum "${GENERIC_PACK}" > ${sum_file}
+    sha256sum ${GENERIC_PACK} > ${sum_file}
  fi
 fi

--- a/12
+++ b/12
@@ -21,20 +21,18 @@ if [ -d /plugins ]; then
 fi

 # If any modules have been provided, copy them over
-: ${COPY_MODS_DEST:="/data/mods"}
-
 if [ -d /mods ]; then
  log "Copying any mods over..."
-  mkdir -p "${COPY_MODS_DEST}"
-  rsync -a --out-format="update:%f:Last Modified %M" "${rsyncArgs[@]}" --prune-empty-dirs --update /mods/ "${COPY_MODS_DEST}"
+  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}"
+  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 $@
--- a/27
+++ b/27
@@ -2,8 +2,6 @@

 . ${SCRIPTS:-/}start-utils

-: ${SERVER_PROPERTIES:=/data/server.properties}
-
 # FUNCTIONS
 function setServerProp {
  local prop=$1
@@ -14,27 +12,18 @@ function setServerProp {
      TRUE|FALSE)
        var=${var,,} ;;
    esac
-    if grep "${prop}" "$SERVER_PROPERTIES" > /dev/null; then
-      log "Setting ${prop} to '${var}' in ${SERVER_PROPERTIES}"
-      sed -i "/^${prop}\s*=/ c ${prop}=${var//\\/\\\\}" "$SERVER_PROPERTIES"
-    else
-      log "Adding ${prop} with '${var}' in ${SERVER_PROPERTIES}"
-      echo "${prop}=${var}" >> "$SERVER_PROPERTIES"
-    fi
+    log "Setting ${prop} to '${var}' in ${SERVER_PROPERTIES}"
+    sed -i "/^${prop}\s*=/ c ${prop}=${var}" "$SERVER_PROPERTIES"
  else
-    isDebugging && log "Skip setting ${prop}"
+    log "Skip setting ${prop}"
  fi
 }

 function customizeServerProps {
-  if [ -n "$WHITELIST" ] || isTrue ${ENABLE_WHITELIST:-false}; then
+  if [ -n "$WHITELIST" ]; then
    log "Creating whitelist"
    setServerProp "whitelist" "true"
    setServerProp "white-list" "true"
-  else
-    log "Disabling whitelist"
-    setServerProp "whitelist" "false"
-    setServerProp "white-list" "false"
  fi

  # If not provided, generate a reasonable default message-of-the-day,
@@ -80,7 +69,7 @@ function customizeServerProps {
  setServerProp "max-world-size" "$MAX_WORLD_SIZE"
  setServerProp "level-name" "$LEVEL"
  setServerProp "level-seed" "$SEED"
-  setServerProp "pvp" "${PVP}"
+  setServerProp "pvp" "$PVP"
  setServerProp "generator-settings" "$GENERATOR_SETTINGS"
  setServerProp "online-mode" "$ONLINE_MODE"
  setServerProp "allow-flight" "$ALLOW_FLIGHT"
@@ -181,8 +170,8 @@ function customizeServerProps {
 }

 # Deploy server.properties file
-if [[ ${TYPE} == "CURSEFORGE" ]]; then
-  export SERVER_PROPERTIES="${FTB_DIR}/server.properties"
+if [[ ${TYPE} == "FEED-THE-BEAST" ]]; then
+  export SERVER_PROPERTIES=${FTB_DIR}/server.properties
  log "detected FTB, changing properties path to ${SERVER_PROPERTIES}"
 fi

@@ -214,7 +203,7 @@ fi

 if isDebugging; then
  log "DEBUG Dumping server.properties"
-  cat "${SERVER_PROPERTIES}"
+  cat /data/server.properties
 fi

 exec ${SCRIPTS:-/}start-finalSetupEnvVariables $@
--- a/16
+++ b/16
@@ -4,23 +4,13 @@
 set -e
 isDebugging && set -x

-: ${LEVEL:=world}
-export LEVEL
-
-if [ $TYPE = "CURSEFORGE" ]; then
+if [ $TYPE = "FEED-THE-BEAST" ]; then
  worldDest=$FTB_DIR/$LEVEL
 else
  worldDest=/data/$LEVEL
 fi

 if [[ "$WORLD" ]] && ( isTrue "${FORCE_WORLD_COPY}" || [ ! -d "$worldDest" ] ); then
-  if isTrue "${FORCE_WORLD_COPY}"; then
-    log "Removing existing world data in $worldDest ${worldDest}_nether ${worldDest}_the_end"
-    rm -rf "$worldDest" \
-      "${worldDest}_nether" \
-      "${worldDest}_the_end"
-  fi
-
  if isURL $WORLD; then
    curl -fsSL "$WORLD" -o /tmp/world.zip
    zipSrc=/tmp/world.zip
@@ -66,8 +56,8 @@ if [[ "$WORLD" ]] && ( isTrue "${FORCE_WORLD_COPY}" || [ ! -d "$worldDest" ] );
  if [ "$TYPE" = "SPIGOT" ]; then
    # Reorganise if a Spigot server
    log "Moving End and Nether maps to Spigot location"
-    [ -d "$worldDest/DIM1" ] && mv -f "$worldDest/DIM1" "${worldDest}_the_end"
-    [ -d "$worldDest/DIM-1" ] && mv -f "$worldDest/DIM-1" "${worldDest}_nether"
+    [ -d "$worldDest/DIM1" ] && mv -f "$worldDest/DIM1" "/data/${LEVEL}_the_end"
+    [ -d "$worldDest/DIM-1" ] && mv -f "$worldDest/DIM-1" "/data/${LEVEL}_nether"
  fi
 fi

--- a/143
+++ b/143
@@ -1,53 +1,42 @@
 #!/bin/bash

 . ${SCRIPTS:-/}start-utils
-isDebugging && set -x

 if [ -n "$OPS" ]; then
-  log "Updating ops"
-  rm -f /data/ops.txt.converted
+  log "Setting/adding ops"
+  rm -rf /data/ops.txt.converted
  echo $OPS | awk -v RS=, '{print}' > /data/ops.txt
 fi
-if isTrue "${OVERRIDE_OPS}"; then
-  log "Recreating ops.json file at server startup"
-  rm -f /data/ops.json
-fi

 if [ -n "$WHITELIST" ]; then
-  log "Updating whitelist"
-  rm -f /data/white-list.txt.converted
+  log "Setting whitelist"
+  rm -rf /data/white-list.txt.converted
  echo $WHITELIST | awk -v RS=, '{print}' > /data/white-list.txt
 fi
-if isTrue "${OVERRIDE_WHITELIST}"; then
-  log "Recreating whitelist.json file at server startup"
-  rm -f /data/whitelist.json
-fi

-if [ -n "$ICON" ]; then
-    if [ ! -e server-icon.png ] || [ "${OVERRIDE_ICON}" == "TRUE" ]; then
-      log "Using server icon from $ICON..."
-      # Not sure what it is yet...call it "img"
-      curl -sSL -o /tmp/icon.img $ICON
-      specs=$(identify /tmp/icon.img | awk '{print $2,$3}')
-      if [ "$specs" = "PNG 64x64" ]; then
-        mv /tmp/icon.img /data/server-icon.png
-      else
-        log "Converting image to 64x64 PNG..."
-        convert /tmp/icon.img -resize 64x64! /data/server-icon.png
-      fi
-    fi
-fi
-
-if isTrue ${ENABLE_ROLLING_LOGS:-false}; then
-  # Set up log configuration
-  LOGFILE="/data/log4j2.xml"
-  if [ ! -e "$LOGFILE" ]; then
-    log "Creating log4j2.xml in ${LOGFILE}"
-    cp /tmp/log4j2.xml "$LOGFILE"
+if [ -n "$ICON" -a ! -e server-icon.png ]; then
+  log "Using server icon from $ICON..."
+  # Not sure what it is yet...call it "img"
+  curl -sSL -o /tmp/icon.img $ICON
+  specs=$(identify /tmp/icon.img | awk '{print $2,$3}')
+  if [ "$specs" = "PNG 64x64" ]; then
+    mv /tmp/icon.img /data/server-icon.png
  else
-    log "log4j2.xml already created, skipping"
+    log "Converting image to 64x64 PNG..."
+    convert /tmp/icon.img -resize 64x64! /data/server-icon.png
  fi
-  JVM_OPTS="-Dlog4j.configurationFile=/data/log4j2.xml ${JVM_OPTS}"
+fi
+
+if ! isTrue ${SKIP_LOG4J_CONFIG}; then
+# Set up log configuration
+LOGFILE="/data/log4j2.xml"
+if [ ! -e "$LOGFILE" ]; then
+  log "Creating log4j2.xml in ${LOGFILE}"
+  cp /tmp/log4j2.xml "$LOGFILE"
+else
+  log "log4j2.xml already created, skipping"
+fi
+JVM_OPTS="-Dlog4j.configurationFile=/data/log4j2.xml ${JVM_OPTS}"
 fi

 # Make sure files exist and are valid JSON (for pre-1.12 to 1.12 upgrades)
@@ -60,14 +49,15 @@ for j in $JSON_FILES; do
  fi
 done

+EXTRA_ARGS=""
 # Optional disable console
 if versionLessThan 1.14 && [[ ${CONSOLE,,} = false ]]; then
-  EXTRA_ARGS+=" --noconsole"
+  EXTRA_ARGS+="--noconsole"
 fi

 # Optional disable GUI for headless servers
 if [[ ${GUI} = false || ${GUI} = FALSE ]]; then
-  EXTRA_ARGS+=" nogui"
+  EXTRA_ARGS="${EXTRA_ARGS} nogui"
 fi

 # put these prior JVM_OPTS at the end to give any memory settings there higher precedence
@@ -81,7 +71,25 @@ 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}
  JVM_OPTS="${JVM_OPTS}
  -Dcom.sun.management.jmxremote.local.only=false
@@ -89,8 +97,8 @@ if isTrue ${ENABLE_JMX}; then
  -Dcom.sun.management.jmxremote.rmi.port=${JMX_PORT}
  -Dcom.sun.management.jmxremote.authenticate=false
  -Dcom.sun.management.jmxremote.ssl=false
-  -Dcom.sun.management.jmxremote.host=${JMX_BINDING:-0.0.0.0}
-  -Djava.rmi.server.hostname=${JMX_HOST:-localhost}"
+  -Dcom.sun.management.jmxremote.host=${JMX_HOST}
+  -Djava.rmi.server.hostname=${JMX_HOST}"

  log "JMX is enabled. Make sure you have port forwarding for ${JMX_PORT}"
 fi
@@ -144,13 +152,6 @@ if isTrue "${USE_LARGE_PAGES}"; then
  "
 fi

-if isTrue "${USE_FLARE_FLAGS}"; then
-  JVM_XX_OPTS="${JVM_XX_OPTS}
-  -XX:+UnlockDiagnosticVMOptions
-  -XX:+DebugNonSafepoints
-  "
-fi
-
 if isTrue "${DEBUG_MEMORY}"; then
  log "Memory usage and availability (in MB)"
  uname -a
@@ -162,11 +163,11 @@ JVM_OPTS="-Xms${INIT_MEMORY} -Xmx${MAX_MEMORY} ${JVM_OPTS}"
 function copyFilesForCurseForge() {
  # copy player modification files unconditionally since their
  # processing into json is additive anyway
-  [ -f /data/ops.txt ] && cp -f /data/ops.txt "${FTB_DIR}/"
-  [ -f /data/white-list.txt ] && cp -f /data/white-list.txt "${FTB_DIR}/"
+  [ -f /data/ops.txt ] && cp -f /data/ops.txt ${FTB_DIR}/
+  [ -f /data/white-list.txt ] && cp -f /data/white-list.txt ${FTB_DIR}/

  if [ ! -e "${FTB_DIR}/server-icon.png" -a -e /data/server-icon.png ]; then
-    cp -f /data/server-icon.png "${FTB_DIR}/"
+    cp -f /data/server-icon.png ${FTB_DIR}/
  fi

  cp -f /data/eula.txt "${FTB_DIR}/"
@@ -180,7 +181,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 +190,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
@@ -207,24 +208,10 @@ EOF

  cd "${FTB_DIR}"
  log "Running FTB ${FTB_SERVER_START} in ${FTB_DIR} ..."
-
-  finalArgs=(
-    "${FTB_SERVER_START}"
-  )
-
-  if isTrue ${SETUP_ONLY:=false}; then
-    echo "SETUP_ONLY: ${finalArgs[@]}"
-    exit
-  fi
-
  if isTrue ${DEBUG_EXEC}; then
    set -x
  fi
-  if isTrue ${EXEC_DIRECTLY:-false}; then
-    "${finalArgs[@]}"
-  else
-    exec mc-server-runner ${mcServerRunnerArgs} "${finalArgs[@]}"
-  fi
+  exec mc-server-runner ${mcServerRunnerArgs} "${FTB_SERVER_START}"
 else
  # If we have a bootstrap.txt file... feed that in to the server stdin
  if [ -f /data/bootstrap.txt ]; then
@@ -232,28 +219,8 @@ else
  fi

  log "Starting the Minecraft server..."
-
-  finalArgs=(
-    $JVM_XX_OPTS
-    $JVM_OPTS
-    $expandedDOpts
-    -jar $SERVER
-    "$@" $EXTRA_ARGS
-  )
-
-  if isTrue ${SETUP_ONLY:=false}; then
-    echo "SETUP_ONLY: java ${finalArgs[@]}"
-    exit
-  fi
-
  if isTrue ${DEBUG_EXEC}; then
    set -x
  fi
-
-  if isTrue ${EXEC_DIRECTLY:-false}; then
-    exec java "${finalArgs[@]}"
-  else
-    exec mc-server-runner ${bootstrapArgs} ${mcServerRunnerArgs} java "${finalArgs[@]}"
-  fi
+  exec mc-server-runner ${bootstrapArgs} ${mcServerRunnerArgs} java $JVM_XX_OPTS $JVM_OPTS $expandedDOpts -jar $SERVER "$@" $EXTRA_ARGS
 fi
-
--- a/69
+++ b/69
@@ -1,69 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-IFS=$'\n\t'
-
-. ${SCRIPTS:-/}start-utils
-handleDebugMode
-
-: ${SPIGET_RESOURCES:=}
-
-containsJars() {
-  file=${1?}
-
-  pat='\.jar$'
-
-  while read -r line; do
-    if [[ $line =~ $pat ]]; then
-      return 0
-    fi
-  done <<<$(unzip -l "$file")
-
-  return 1
-}
-
-getResourceFromSpiget() {
-  resource=${1?}
-
-  log "Downloading resource ${resource} ..."
-
-  mkdir -p /data/plugins
-
-  if [ -f /data/plugins/.${resource} ]; then
-    log "Resource '${resource}' already downloaded"
-  else
-    tmpfile="/tmp/${resource}.zip"
-    url="https://api.spiget.org/v2/resources/${resource}/download"
-    if ! curl -o "${tmpfile}" -fsSL -H "User-Agent: itzg/minecraft-server" "${extraCurlArgs[@]}" "${url}"; then
-      log "ERROR failed to download resource '${resource}' from ${url}"
-      exit 2
-    fi
-
-    if containsJars "${tmpfile}"; then
-      log "Extracting contents of resource ${resource} into plugins"
-      unzip -o -q -d /data/plugins "${tmpfile}"
-      touch "/data/plugins/.${resource}"
-      rm "${tmpfile}"
-    else
-      log "Moving resource ${resource} into plugins"
-      mv "${tmpfile}" "/data/plugins/${resource}.jar"
-      touch "/data/plugins/.${resource}"
-    fi
-  fi
-
-}
-
-if [[ ${SPIGET_RESOURCES} ]]; then
-  if isTrue ${REMOVE_OLD_MODS:-false}; then
-    removeOldMods /data/plugins
-    REMOVE_OLD_MODS=false
-  fi
-
-  log "Getting plugins via Spiget"
-  IFS=',' read -r -a resources <<<"${SPIGET_RESOURCES}"
-  for resource in "${resources[@]}"; do
-    getResourceFromSpiget "${resource}"
-  done
-fi
-
-# Continue to Final Setup
-exec ${SCRIPTS:-/}start-finalSetupWorld $@
--- a/34
+++ b/34
@@ -11,7 +11,7 @@ function join_by() {
 function isURL() {
  local value=$1

-  if [[ ${value:0:8} == "https://" || ${value:0:7} == "http://" || ${value:0:6} == "ftp://" ]]; then
+  if [[ ${value:0:8} == "https://" || ${value:0:7} == "http://" ]]; then
    return 0
  else
    return 1
@@ -57,20 +57,13 @@ function isTrue() {
 }

 function isDebugging() {
-  if isTrue "${DEBUG:-false}"; then
+  if [[ -v DEBUG ]] && [[ ${DEBUG^^} == TRUE ]]; then
    return 0
  else
    return 1
  fi
 }

-function handleDebugMode() {
-  if isDebugging; then
-    set -x
-    extraCurlArgs=(-v)
-  fi
-}
-
 function debug() {
  if isDebugging; then
    log "DEBUG: $*"
@@ -151,32 +144,11 @@ requireVar() {
  fi
 }

-requireEnum() {
-  var=${1?}
-  shift
-
-  for allowed in $*; do
-    if [[ ${!var} = $allowed ]]; then
-      return 0
-    fi
-  done
-
-  log "ERROR: $var must be set to one of $@"
-#  exit 1
-}
-
 function writeEula() {
-  if ! echo "# Generated via Docker
-# $(date)
+  if ! echo "# Generated via Docker on $(date)
 eula=${EULA,,}
 " >/data/eula.txt; then
    log "ERROR: unable to write eula to /data. Please make sure attached directory is writable by uid=${UID}"
    exit 2
  fi
 }
-
-function removeOldMods {
-  if [ -d "$1" ]; then
-    find "$1" -mindepth 1 -maxdepth ${REMOVE_OLD_MODS_DEPTH:-16} -wholename "${REMOVE_OLD_MODS_INCLUDE:-*}" -not -wholename "${REMOVE_OLD_MODS_EXCLUDE:-}" -delete
-  fi
-}
--- a/tests/docker-compose.test.yml
+++ b/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:
Author	SHA1	Message	Date
Geoff Bourne	796d2238da	Auto-merging via docker-versions-create	2020-12-27 22:05:17 -06:00
Geoff Bourne	d919881092	Auto-merging via docker-versions-create	2020-12-19 08:23:58 -06:00
Geoff Bourne	e406fee8fa	Auto-merging via docker-versions-create	2020-12-15 13:59:46 -06:00
Geoff Bourne	3497b06391	Auto-merging via docker-versions-create	2020-11-25 15:53:49 -06:00
Geoff Bourne	65b0e0d8bb	Auto-merging via docker-versions-create	2020-08-09 13:06:24 -05:00
Geoff Bourne	c5b9c199d6	Auto-merging via docker-versions-create	2020-07-26 08:29:13 -05:00
Geoff Bourne	5a61465c09	ci: Migrated main build and test back to Hub	2020-07-26 08:28:40 -05:00
Geoff Bourne	8a324c30de	Auto-merging via docker-versions-create	2020-07-18 18:39:40 -05:00
Geoff Bourne	e0cdf9e2ce	Auto-merging via docker-versions-create	2020-07-11 13:12:41 -05:00
Geoff Bourne	57740cb749	Auto-merging via docker-versions-create	2020-07-10 17:10:43 -05:00
Geoff Bourne	966c74cd08	Auto-merging via docker-versions-create	2020-07-04 14:57:07 -05:00
Geoff Bourne	d84b58dfd0	Auto-merging via docker-versions-create	2020-06-20 15:44:09 -05:00
Geoff Bourne	7aaf106ffe	Auto-merging via docker-versions-create # Conflicts: # .circleci/config.yml	2020-06-19 13:25:41 -05:00
Geoff Bourne	5f77902441	Auto-merging via docker-versions-create	2020-05-20 08:14:14 -05:00
Geoff Bourne	c200efc9c9	Auto-merging via docker-versions-create	2020-05-02 09:33:49 -05:00
Geoff Bourne	e924126a56	Auto-merging via docker-versions-create	2020-04-25 12:10:22 -05:00
Geoff Bourne	bbd3d3cfc1	Auto-merging via docker-versions-create	2020-04-17 21:28:25 -05:00
Geoff Bourne	d77c19c69b	Auto-merging via docker-versions-create	2020-04-11 08:51:36 -05:00
Geoff Bourne	7ee77e4f47	Auto-merging via docker-versions-create	2020-04-10 11:08:41 -05:00
Geoff Bourne	84d0cff4c8	Auto-merging via docker-versions-create	2020-04-03 13:31:30 -05:00
Geoff Bourne	70519b9764	Auto-merging via docker-versions-create # Conflicts: # README.md # start-minecraftFinalSetup	2020-04-03 13:28:27 -05:00
Geoff Bourne	4683ea496d	Auto-merging via docker-versions-create	2020-04-02 17:47:30 -05:00
Geoff Bourne	0e3a82f9d3	Auto-merging via docker-versions-create	2020-03-30 08:31:53 -05:00
Geoff Bourne	d2554f2271	Auto-merging via docker-versions-create	2020-03-26 20:54:00 -05:00
Geoff Bourne	55e62371ac	Auto-merging via docker-versions-create	2020-02-01 08:52:51 -06:00
Geoff Bourne	c9a5fcfac8	Auto-merging via docker-versions-create	2020-01-17 08:29:05 -06:00
Geoff Bourne	a1f8154d05	Auto-merging via docker-versions-create	2019-11-16 09:30:54 -06:00
Geoff Bourne	e5d0a9362a	Auto-merging via docker-versions-create	2019-11-16 09:04:17 -06:00
Geoff Bourne	ca9c280b0b	Merge branch 'master' into openj9	2019-11-16 09:01:17 -06:00
Geoff Bourne	6ef4e984c7	ci: disable cross-building arm-v7 image	2019-08-13 20:06:57 -05:00
Geoff Bourne	ea4f78346a	ci: try cross-building arm-v7 image	2019-08-13 20:04:34 -05:00
Geoff Bourne	007f9426bf	Switch to OpenJ9 base image (#360 ) (cherry picked from commit `93197ffb77`)	2019-08-10 18:56:36 -05:00