Auto-merging via docker-versions-create

.circleci/config.yml

@@ -0,0 +1,22 @@
+version: 2
+jobs:
+  minecraft_server:
+    docker:
+      - image: circleci/buildpack-deps:19.10
+    steps:
+      - checkout
+      - setup_remote_docker
+      - run:
+          name: Build image
+          command: docker build -t mc:$CIRCLE_BUILD_NUM .
+
+workflows:
+  version: 2
+  build:
+    jobs:
+      - minecraft_server:
+          filters:
+            branches:
+              ignore:
+                - armv7
+                - multiarch

.github/workflows/main.yml

@@ -1,28 +0,0 @@
-# This is a basic workflow to help you get started with Actions
-
-name: build
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v2
-
-    - 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 }}
-        tag_with_ref: true
-        tag_with_sha: true
-        cache_froms: itzg/minecraft-server:latest
-        add_git_labels: true
-        push: false

Dockerfile

@@ -1,4 +1,4 @@
-FROM openjdk:8u212-jre-alpine
+FROM adoptopenjdk/openjdk13:alpine-jre
 
 LABEL maintainer "itzg"
 
@@ -15,18 +15,15 @@ RUN apk add --no-cache -U \
   mysql-client \
   tzdata \
   rsync \
-  nano \
-  sudo \
-  knock \
-  ttf-dejavu
+  nano
+
+HEALTHCHECK --start-period=1m CMD mc-monitor status --host localhost --port $SERVER_PORT
 
 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
-
 EXPOSE 25565 25575
 
 # hook into docker BuildKit --platform support
@@ -66,21 +63,14 @@ COPY server.properties /tmp/server.properties
 COPY log4j2.xml /tmp/log4j2.xml
 WORKDIR /data
 
+ENTRYPOINT [ "/start" ]
+
 ENV UID=1000 GID=1000 \
-  JVM_XX_OPTS="-XX:+UseG1GC" MEMORY="1G" \
+  MEMORY="1G" \
   TYPE=VANILLA VERSION=LATEST FORGEVERSION=RECOMMENDED SPONGEBRANCH=STABLE SPONGEVERSION= FABRICVERSION=LATEST LEVEL=world \
   PVP=true DIFFICULTY=easy ENABLE_RCON=true RCON_PORT=25575 RCON_PASSWORD=minecraft \
   LEVEL_TYPE=DEFAULT SERVER_PORT=25565 ONLINE_MODE=TRUE SERVER_NAME="Dedicated Server" \
-  REPLACE_ENV_VARIABLES="FALSE" ENV_VARIABLE_PREFIX="CFG_" \
-  ENABLE_AUTOPAUSE=false AUTOPAUSE_TIMEOUT_EST=3600 AUTOPAUSE_TIMEOUT_KN=120 AUTOPAUSE_TIMEOUT_INIT=600 AUTOPAUSE_PERIOD=10
+  REPLACE_ENV_VARIABLES="FALSE" ENV_VARIABLE_PREFIX="CFG_"
 
 COPY start* /
-COPY health.sh /
-ADD files/autopause /autopause
-
 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

README.md

@@ -179,40 +179,6 @@ You can also query the container's health in a script friendly way:
 healthy
 ```
 
-## Autopause
-
-### Description
-
-> There are various bug reports on [Mojang](https://bugs.mojang.com) about high CPU usage of servers with newer versions, even with few or no clients connected (e.g. [this one](https://bugs.mojang.com/browse/MC-149018), in fact the functionality is based on [this comment in the thread](https://bugs.mojang.com/browse/MC-149018?focusedCommentId=593606&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-593606)).
-
-An autopause functionality has been added to this image to monitor whether clients are connected to the server. If for a specified time no client is connected, the Java process is stopped. When knocking on the server port (e.g. by the ingame Multiplayer server overview), the process is resumed. The experience for the client does not change.
-
-Of course, even loaded chunks are not ticked when the process is stopped.
-
-From the server's point of view, the pausing causes a single tick to take as long as the process is stopped, so the server watchdog might intervene after the process is continued, possibly forcing a container restart. To prevent this, ensure that the `max-tick-time` in the `server.properties` file is set correctly.
-
-On startup the `server.properties` file is checked and, if applicable, a warning is printed to the terminal. When the server is created (no data available in the persistent directory), the properties file is created with the Watchdog disabled.
-
-The autopause functionality is not compatible with docker's host network_mode, as the `knockd` utility cannot properly listen for connections in that mode.
-
-### Enabling Autopause
-
-Enable the Autopause functionality by setting:
-
-```
--e ENABLE_AUTOPAUSE=TRUE
-```
-
-There are 4 more environment variables that define the behaviour:
-* `AUTOPAUSE_TIMEOUT_EST`, default `3600` (seconds)  
-describes the time between the last client disconnect and the pausing of the process (read as timeout established)
-* `AUTOPAUSE_TIMEOUT_INIT`, default `600` (seconds)  
-describes the time between server start and the pausing of the process, when no client connects inbetween (read as timeout initialized)
-* `AUTOPAUSE_TIMEOUT_KN`, default `120` (seconds)  
-describes the time between knocking of the port (e.g. by the main menu ping) and the pausing of the process, when no client connects inbetween (read as timeout knocked)
-* `AUTOPAUSE_PERIOD`, default `10` (seconds)  
-describes period of the daemonized state machine, that handles the pausing of the process (resuming is done independently)
-
 ## Deployment Templates and Examples
 
 ### Helm Charts
@@ -230,7 +196,7 @@ Enable Forge server mode by adding a `-e TYPE=FORGE` to your command-line.
 By default the container will run the `RECOMMENDED` version of [Forge server](http://www.minecraftforge.net/wiki/)
 but you can also choose to run a specific version with `-e FORGEVERSION=10.13.4.1448`.
 
-    $ docker run -d -v /path/on/host:/data \
+    $ docker run -d -v /path/on/host:/data -e VERSION=1.7.10 \
         -e TYPE=FORGE -e FORGEVERSION=10.13.4.1448 \
         -p 25565:25565 -e EULA=TRUE --name mc itzg/minecraft-server
 
@@ -384,10 +350,10 @@ The content of `db_password`:
 
 ## Running a Bukkit/Spigot server
 
-Enable Bukkit/Spigot server mode by adding a `-e TYPE=BUKKIT` or `-e TYPE=SPIGOT` to your command-line.
+Enable Bukkit/Spigot server mode by adding a `-e TYPE=BUKKIT -e VERSION=1.8` or `-e TYPE=SPIGOT -e VERSION=1.8` to your command-line.
 
     docker run -d -v /path/on/host:/data \
-        -e TYPE=SPIGOT \
+        -e TYPE=SPIGOT -e VERSION=1.8 \
         -p 25565:25565 -e EULA=TRUE --name mc itzg/minecraft-server
 
 If you are hosting your own copy of Bukkit/Spigot you can override the download URLs with:
@@ -401,7 +367,7 @@ You can build spigot from source by adding `-e BUILD_FROM_SOURCE=true`
 pass `--noconsole` at the very end of the command line and not use `-it`. For example,
 
     docker run -d -v /path/on/host:/data \
-        -e TYPE=SPIGOT \
+        -e TYPE=SPIGOT -e VERSION=1.8 \
         -p 25565:25565 -e EULA=TRUE --name mc itzg/minecraft-server --noconsole
 
 You can install Bukkit plugins in two ways...
@@ -446,20 +412,20 @@ in either persistent volumes or a downloadable archive.
 
 ## Running a PaperSpigot server
 
-Enable PaperSpigot server mode by adding a `-e TYPE=PAPER` to your command-line.
+Enable PaperSpigot server mode by adding a `-e TYPE=PAPER -e VERSION=1.9.4` to your command-line.
 
 By default the container will run the latest build of [Paper server](https://papermc.io/downloads)
 but you can also choose to run a specific build with `-e PAPERBUILD=205`.
 
     docker run -d -v /path/on/host:/data \
-        -e TYPE=PAPER \
+        -e TYPE=PAPER -e VERSION=1.9.4 \
         -p 25565:25565 -e EULA=TRUE --name mc itzg/minecraft-server
 
 **NOTE: to avoid pegging the CPU when running PaperSpigot,** you will need to
 pass `--noconsole` at the very end of the command line and not use `-it`. For example,
 
     docker run -d -v /path/on/host:/data \
-        -e TYPE=PAPER \
+        -e TYPE=PAPER -e VERSION=1.9.4 \
         -p 25565:25565 -e EULA=TRUE --name mc itzg/minecraft-server --noconsole
 
 If you are hosting your own copy of PaperSpigot you can override the download URL with:
@@ -525,46 +491,20 @@ A [Magma](https://magmafoundation.org/) server, which is a combination of Forge
 
 > **NOTE** there are limited base versions supported, so you will also need to  set `VERSION`, such as "1.12.2"
 
-## Running a server with a Feed the Beast modpack
+## Running a Server with a Feed-The-Beast (FTB) / CurseForge modpack
 
-> **NOTE** requires `itzg/minecraft-server:multiarch` image
-
-[Feed the Beast application](https://www.feed-the-beast.com/) modpacks are supported by using `-e TYPE=FTBA` (**note** the "A" at the end of the type). This server type will automatically take care of downloading and installing the modpack and appropriate version of Forge, so the `VERSION` does not need to be specified.
-
-### Environment Variables:
-- `FTB_MODPACK_ID`: **required**, the numerical ID of the modpack to install. The ID can be located by finding the modpack at [Neptune FTB](https://ftb.neptunepowered.org/) and using the "Pack ID"
-- `FTB_MODPACK_VERSION_ID`: optional, the numerical Id of the version to install. If not specified, the latest version will be installed. The "Version ID" can be obtained by drilling into the Versions tab and clicking a specific version.
-
-### Upgrading
-
-If a specific `FTB_MODPACK_VERSION_ID` was not specified, simply restart the container to pick up the newest modpack version. If using a specific version ID, recreate the container with the new version ID.
-
-### Example
-
-The following example runs the latest version of [FTB Presents Direwolf20 1.12](https://ftb.neptunepowered.org/pack/ftb-presents-direwolf20-1-12/):
-
-```
-docker run -d --name mc-ftb -e EULA=TRUE \
-  -e TYPE=FTBA -e FTB_MODPACK_ID=31 \
-  -p 25565:25565 \
-  itzg/minecraft-server:multiarch
-```
-
-> Normally you will also add `-v` volume for `/data` since the mods and config are installed there along with world data.
-
-## Running a server with a CurseForge modpack
-
-Enable this server mode by adding `-e TYPE=CURSEFORGE` to your command-line,
+Enable this server mode by adding a `-e TYPE=FTB` or `-e TYPE=CURSEFORGE` to your command-line,
 but note the following additional steps needed...
 
-You need to specify a modpack to run, using the `CF_SERVER_MOD` environment
-variable. A CurseForge server modpack is available together with its respective
-client modpack at <https://www.curseforge.com/minecraft/modpacks> .
+You need to specify a modpack to run, using the `FTB_SERVER_MOD` or `CF_SERVER_MOD` environment
+variable. An FTB/CurseForge server modpack is available together with its respective
+client modpack on <https://www.feed-the-beast.com> under "Additional Files." Similar you can
+locate the modpacks for CurseForge at <https://www.curseforge.com/minecraft/modpacks> .
 
-Now you can add a `-e CF_SERVER_MOD=name_of_modpack.zip` to your command-line.
+Now you can add a `-e FTB_SERVER_MOD=name_of_modpack.zip` to your command-line.
 
-    docker run -d -v /path/on/host:/data -e TYPE=CURSEFORGE \
-        -e CF_SERVER_MOD=SkyFactory_4_Server_4.1.0.zip \
+    docker run -d -v /path/on/host:/data -e TYPE=FTB \
+        -e FTB_SERVER_MOD=FTBPresentsSkyfactory3Server_3.0.6.zip \
         -p 25565:25565 -e EULA=TRUE --name mc itzg/minecraft-server
 
 If you want to keep the pre-download modpacks separate from your data directory,
@@ -572,8 +512,8 @@ then you can attach another volume at a path of your choosing and reference that
 The following example uses `/modpacks` as the container path as the pre-download area:
 
     docker run -d -v /path/on/host:/data -v /path/to/modpacks:/modpacks \
-        -e TYPE=CURSEFORGE \
-        -e CF_SERVER_MOD=/modpacks/SkyFactory_4_Server_4.1.0.zip \
+        -e TYPE=FTB \
+        -e FTB_SERVER_MOD=/modpacks/FTBPresentsSkyfactory3Server_3.0.6.zip \
         -p 25565:25565 -e EULA=TRUE --name mc itzg/minecraft-server
 
 ### Fixing "unable to launch forgemodloader"
@@ -586,6 +526,42 @@ then you apply a workaround by adding this to the run invocation:
 
     -e FTB_LEGACYJAVAFIXER=true
 
+### Using a client-made curseforge modpack
+
+If you use something like CurseForge, you may end up creating/using modpacks that do not
+contain server mod jars. Instead, the CurseForge setup has `manifest.json` files, which
+will show up under `/data/FeedTheBeast/manifest.json`.
+
+To use these packs you will need to:
+
+- Specify the manifest location with env var `MANIFEST=/data/FeedTheBeast/manifest`
+- Pick a relevant ServerStart.sh and potentially settings.cfg and put them in `/data/FeedTheBeast`
+
+An example of the latter would be to use <https://github.com/AllTheMods/Server-Scripts>
+There, you'll find that all you have to do is put `ServerStart.sh` and `settings.cfg` into
+`/data/FeedTheBeast`, taking care to update `settings.cfg` to specify your desired version
+of minecraft and forge. You can do this in the cli with something like:
+
+```
+$ wget https://raw.githubusercontent.com/AllTheMods/Server-Scripts/master/ServerStart.sh
+$ wget https://raw.githubusercontent.com/AllTheMods/Server-Scripts/master/settings.cfg
+$ vim settings.cfg #update the forge version to the one you want. Your manifest.json will have it
+$ chmod +x ServerStart.sh
+$ docker run -itd --name derpcraft \
+  -e MANIFEST=/data/FeedTheBeast/manifest.json \
+  -v $PWD/ServerStart.sh:/data/FeedTheBeast/ServerStart.sh \
+  -v $PWD/settings.cfg:/data/FeedTheBeast/settings.cfg \
+  -e VERSION=1.12.2\
+  -e TYPE=CURSEFORGE\
+  -e CF_SERVER_MOD=https://minecraft.curseforge.com/projects/your_amazing_modpack/files/2670435/download\
+  -p 25565:25565\
+  -e EULA=TRUE\
+  --restart=always\
+  itzg/minecraft-server
+```
+
+Note the `CF_SERVER_MOD` env var should match the server version of the modpack you are targeting.
+
 ## Running a SpongeVanilla server
 
 Enable SpongeVanilla server mode by adding a `-e TYPE=SPONGEVANILLA` to your command-line.
@@ -607,7 +583,7 @@ Enable Fabric server mode by adding a `-e TYPE=FABRIC` to your command-line.
 By default the container will run the latest version of [Fabric server](http://fabricmc.net/use/)
 but you can also choose to run a specific version with `-e FABRICVERSION=0.5.0.32`.
 
-    $ docker run -d -v /path/on/host:/data \
+    $ docker run -d -v /path/on/host:/data -e VERSION=1.14.3 \
         -e TYPE=FABRIC -e FABRICVERSION=0.5.0.32 \
         -p 25565:25565 -e EULA=TRUE --name mc itzg/minecraft-server
 
@@ -686,7 +662,7 @@ For example, with PaperSpigot, it would look something like this:
 
 ```
 docker run -d -v /path/on/host:/data \
-    -e TYPE=PAPER -e FORCE_REDOWNLOAD=true \
+    -e TYPE=PAPER -e VERSION=1.14.1 -e FORCE_REDOWNLOAD=true \
     -p 25565:25565 -e EULA=TRUE --name mc itzg/minecraft-server
 ```
 
@@ -984,19 +960,30 @@ where the default is "world":
 
 ### Downloadable world
 
-Instead of mounting the `/data` volume, you can instead specify the URL of a ZIP file containing an archived world. It will be searched for a file `level.dat` and the containing subdirectory moved to the directory named by `$LEVEL`. This means that most of the archived Minecraft worlds downloadable from the Internet will already be in the correct format.
+Instead of mounting the `/data` volume, you can instead specify the URL of
+a ZIP file containing an archived world. This will be downloaded, and
+unpacked in the `/data` directory; if it does not contain a subdirectory
+called `world/` then it will be searched for a file `level.dat` and the
+containing subdirectory renamed to `world`. This means that most of the
+archived Minecraft worlds downloadable from the Internet will already be in
+the correct format.
+
+The ZIP file may also contain a `server.properties` file and `modules`
+directory, if required.
 
     docker run -d -e WORLD=http://www.example.com/worlds/MySave.zip ...
 
-**NOTE:** This URL must be accessible from inside the container. Therefore,
-you should use an IP address or a globally resolvable FQDN, or else the
-name of a linked container.
+**NOTE:** Unless you also mount `/data` as an external volume, this world
+will be deleted when the container is deleted.
 
-**NOTE:** If the archive contains more than one `level.dat`, then the one to select can be picked with `WORLD_INDEX`, which defaults to 1.
+**NOTE:** This URL must be accessible from inside the container. Therefore,
+you should use an IP address or a globally resolveable FQDN, or else the
+name of a linked container.
 
 ### Cloning world from a container path
 
-The `WORLD` option can also be used to reference a directory or zip file that will be used as a source to clone or unzip the world directory.
+The `WORLD` option can also be used to reference a directory that will be used
+as a source to clone the world directory.
 
 For example, the following would initially clone the world's content
 from `/worlds/basic`. Also notice in the example that you can use a
@@ -1111,7 +1098,7 @@ Large page support can also be enabled by adding
 ### HTTP Proxy
 
 You may configure the use of an HTTP/HTTPS proxy by passing the proxy's URL via the `PROXY`
-environment variable. In [the example compose file](examples/docker-compose-proxied.yml) it references
+environment variable. In [the example compose file](docker-compose-proxied.yml) it references
 a companion squid proxy by setting the equivalent of
 
     -e PROXY=proxy:3128

docker-versions-create.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 #set -x
 # Use this variable to indicate a list of branches that docker hub is watching
-branches_list=('openj9' 'openj9-nightly' 'adopt11' 'adopt13' 'multiarch')
+branches_list=('openj9' 'openj9-nightly' 'adopt11' 'adopt13' 'multiarch' 'armv7')
 
 function TrapExit {
   echo "Checking out back in master"

examples/docker-compose-curseforge.yml

@@ -3,11 +3,9 @@ version: '3.2'
 services:
   mc:
     image: itzg/minecraft-server
-    volumes:
-    - ./modpacks:/modpacks:ro
     environment:
       EULA: "true"
-      TYPE: CURSEFORGE
-      CF_SERVER_MOD: /modpacks/SkyFactory_4_Server_4.1.0.zip
+      TYPE: FTB
+      FTB_SERVER_MOD: https://minecraft.curseforge.com/projects/all-the-mods-expert-remastered/files/2493900/download
     ports:
       - 25565:25565

examples/docker-compose-ftb.yml

@@ -0,0 +1,16 @@
+version: '3.2'
+
+services:
+  mc:
+    image: itzg/minecraft-server
+    environment:
+      EULA: "true"
+      TYPE: FTB
+      FTB_SERVER_MOD: https://www.feed-the-beast.com/projects/ftb-presents-skyfactory-3/files/2481284
+    ports:
+      - 25565:25565
+    volumes:
+      - mc-ftb:/data
+
+volumes:
+  mc-ftb:

examples/docker-compose-ftba.yml

@@ -1,23 +0,0 @@
-version: "3.7"
-
-services:
-  mc:
-    # 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
-    environment:
-      # REQUIRED for all types
-      EULA: "TRUE"
-      # Set server type (vs the default of vanilla)
-      TYPE: FTBA
-      # Use Pack ID from https://ftb.neptunepowered.org/pack/ftb-presents-direwolf20-1-12/
-      FTB_MODPACK_ID: "31"
-    volumes:
-      # use a named, managed volume for data volume
-      - mc_ftb:/data
-
-volumes:
-  # declared the named volume, but use default/local storage engine
-  mc_ftb: {}

examples/docker-compose-world-download.yml

@@ -1,11 +0,0 @@
-version: "3.7"
-
-services:
-  mc:
-    image: itzg/minecraft-server
-    ports:
-      - 25565:25565
-    environment:
-      EULA: "TRUE"
-      VERSION: 1.7.2
-      WORLD: https://www.minecraftmaps.com/survival-maps/cube-survival/download

examples/modpacks/.gitignore

@@ -1 +0,0 @@
-*.zip

examples/modpacks/README.md

@@ -1,3 +0,0 @@
-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/2787018>.

files/autopause/autopause-daemon.sh

@@ -1,97 +0,0 @@
-#!/bin/bash
-
-. /autopause/autopause-fcns.sh
-
-. /start-utils
-
-sudo /usr/sbin/knockd -c /autopause/knockd-config.cfg -d
-if [ $? -ne 0 ] ; then
-  while :
-  do
-    if [[ -n $(ps -o comm | grep java) ]] ; then
-      break
-    fi
-    sleep 0.1
-  done
-  logAutopause "Failed to start knockd daemon."
-  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
-
-while :
-do
-  case X$STATE in
-  XINIT)
-    # Server startup
-    if mc_server_listening ; then
-      TIME_THRESH=$(($(current_uptime)+$AUTOPAUSE_TIMEOUT_INIT))
-      logAutopause "MC Server listening for connections - stopping in $AUTOPAUSE_TIMEOUT_INIT seconds"
-      STATE=K
-    fi
-    ;;
-  XK)
-    # Knocked
-    if java_clients_connected ; then
-      logAutopause "Client connected - waiting for disconnect"
-      STATE=E
-    else
-      if [[ $(current_uptime) -ge $TIME_THRESH ]] ; then
-        logAutopause "No client connected since startup / knocked - stopping"
-        /autopause/pause.sh
-        STATE=S
-      fi
-    fi
-    ;;
-  XE)
-    # Established
-    if ! java_clients_connected ; then
-      TIME_THRESH=$(($(current_uptime)+$AUTOPAUSE_TIMEOUT_EST))
-      logAutopause "All clients disconnected - stopping in $AUTOPAUSE_TIMEOUT_EST seconds"
-      STATE=I
-    fi
-    ;;
-  XI)
-    # Idle
-    if java_clients_connected ; then
-      logAutopause "Client reconnected - waiting for disconnect"
-      STATE=E
-    else
-      if [[ $(current_uptime) -ge $TIME_THRESH ]] ; then
-        logAutopause "No client reconnected - stopping"
-        /autopause/pause.sh
-        STATE=S
-      fi
-    fi
-    ;;
-  XS)
-    # Stopped
-    if rcon_client_exists ; then
-      /autopause/resume.sh
-    fi
-    if java_running ; then
-      if java_clients_connected ; then
-        logAutopause "Client connected - waiting for disconnect"
-        STATE=E
-      else
-        TIME_THRESH=$(($(current_uptime)+$AUTOPAUSE_TIMEOUT_KN))
-        logAutopause "Server was knocked - waiting for clients or timeout"
-        STATE=K
-      fi
-    fi
-    ;;
-  *)
-    logAutopause "Error: invalid state: $STATE"
-    ;;
-  esac
-  if [[ "$STATE" == "S" ]] ; then
-    # before rcon times out
-    sleep 2
-  else
-    sleep $AUTOPAUSE_PERIOD
-  fi
-done

files/autopause/autopause-fcns.sh

@@ -1,38 +0,0 @@
-#!/bin/bash
-
-current_uptime() {
-  echo $(awk '{print $1}' /proc/uptime | cut -d . -f 1)
-}
-
-java_running() {
-  [[ $( ps -a -o stat,comm | grep 'java' | awk '{ print $1 }') =~ ^S.*$ ]]
-}
-
-rcon_client_exists() {
-  [[ -n "$(ps -a -o comm | grep 'rcon-cli')" ]]
-}
-
-mc_server_listening() {
-  [[ -n $(netstat -tln | grep "0.0.0.0:$SERVER_PORT" | grep LISTEN) ]]
-}
-
-java_clients_connected() {
-  local connections
-  connections=$(netstat -tn | grep ":$SERVER_PORT" | grep ESTABLISHED)
-  if [[ -z "$connections" ]] ; then
-    return 1
-  fi
-  IFS=$'\n'
-  connections=($connections)
-  unset IFS
-  # check that at least one external address is not localhost
-  # remember, that the host network mode does not work with autopause because of the knockd utility
-  for (( i=0; i<${#connections[@]}; i++ ))
-  do
-    if [[ ! $(echo "${connections[$i]}" | awk '{print $5}') =~ ^\s*127\.0\.0\.1:.*$ ]] ; then
-      # not localhost
-      return 0
-    fi
-  done
-  return 1
-}

files/autopause/knockd-config.cfg

@@ -1,12 +0,0 @@
-[options]
- logfile = /dev/null
-[unpauseMCServer-server]
- sequence = 25565
- seq_timeout = 1
- command = /sbin/su-exec minecraft:minecraft /autopause/resume.sh
- tcpflags = syn
-[unpauseMCServer-rcon]
- sequence = 25575
- seq_timeout = 1
- command = /sbin/su-exec minecraft:minecraft /autopause/resume.sh
- tcpflags = syn

files/autopause/pause.sh

@@ -1,21 +0,0 @@
-#!/bin/bash
-
-. /start-utils
-
-if [[ $( ps -a -o stat,comm | grep 'java' | awk '{ print $1 }') =~ ^S.*$ ]] ; then
-  # save world
-  rcon-cli save-all >/dev/null
-
-  # wait until mc-monitor is no longer connected to the server
-  while :
-  do
-    if [[ -z "$(netstat -nt | grep "127.0.0.1:$SERVER_PORT" | grep 'ESTABLISHED')" ]]; then
-      break
-    fi
-    sleep 0.1
-  done
-
-  # finally pause the process
-  logAutopauseAction "Pausing Java process"
-  killall -q -STOP java
-fi

files/autopause/resume.sh

@@ -1,8 +0,0 @@
-#!/bin/bash
-
-. /start-utils
-
-if [[ $( ps -a -o stat,comm | grep 'java' | awk '{ print $1 }') =~ ^T.*$ ]] ; then
-  logAutopauseAction "Knocked, resuming Java process"
-  killall -q -CONT java
-fi

files/sudoers-mc

@@ -1,2 +0,0 @@
-%minecraft ALL=(ALL) NOPASSWD:/usr/bin/killall
-%minecraft ALL=(ALL) NOPASSWD:/usr/sbin/knockd

health.sh

@@ -1,11 +0,0 @@
-#!/bin/bash
-
-. /start-utils
-
-if isTrue "${ENABLE_AUTOPAUSE}" && [[ "$( ps -a -o stat,comm | grep 'java' | awk '{ print $1 }')" =~ ^T.*$ ]]; then
-  echo "Java process suspended by Autopause function"
-  exit 0
-else
-  mc-monitor status --host localhost --port $SERVER_PORT
-  exit $?
-fi

start

@@ -36,11 +36,6 @@ if [ $(id -u) = 0 ]; then
     chown -R ${runAsUser}:${runAsGroup} /data
   fi
 
-  if [[ $(stat -c "%u" /autopause) != $UID ]]; then
-    log "Changing ownership of /autopause to $UID ..."
-    chown -R ${runAsUser}:${runAsGroup} /autopause
-  fi
-
   if [[ ${SKIP_NSSWITCH_CONF^^} != TRUE ]]; then
     echo 'hosts: files dns' > /etc/nsswitch.conf
   fi

start-autopause

@@ -1,60 +0,0 @@
-#!/bin/bash
-
-. /start-utils
-
-log "Autopause functionality enabled"
-
-# update server port to listen to
-regseq="^\s*sequence\s*=\s*$SERVER_PORT\s*$"
-linenum=$(grep -nm1 sequence /autopause/knockd-config.cfg | cut -d : -f 1 | tail -n1)
-if ! [[ $(awk "NR==$linenum" /autopause/knockd-config.cfg) =~ $regseq ]]; then
-  sed -i "${linenum}s/sequence.*/sequence = $SERVER_PORT/" /autopause/knockd-config.cfg
-  log "Updated server port in knockd config"
-fi
-# update rcon port to listen to
-regseq="^\s*sequence\s*=\s*$RCON_PORT\s*$"
-linenum=$(grep -nm2 sequence /autopause/knockd-config.cfg | cut -d : -f 1 | tail -n1)
-if ! [[ $(awk "NR==$linenum" /autopause/knockd-config.cfg) =~ $regseq ]]; then
-  sed -i "${linenum}s/sequence.*/sequence = $RCON_PORT/" /autopause/knockd-config.cfg
-  log "Updated rcon port in knockd config"
-fi
-
-if ! [[ $AUTOPAUSE_PERIOD =~ ^[0-9]+$ ]]; then
-  AUTOPAUSE_PERIOD=10
-  export AUTOPAUSE_PERIOD
-  log "Warning: AUTOPAUSE_PERIOD is not numeric, set to 10 (seconds)"
-fi
-if [ "$AUTOPAUSE_PERIOD" -eq "0" ] ; then
-  AUTOPAUSE_PERIOD=10
-  export AUTOPAUSE_PERIOD
-  log "Warning: AUTOPAUSE_PERIOD must not be 0, set to 10 (seconds)"
-fi
-if ! [[ $AUTOPAUSE_TIMEOUT_KN =~ ^[0-9]+$ ]] ; then
-  AUTOPAUSE_TIMEOUT_KN=120
-  export AUTOPAUSE_TIMEOUT_KN
-  log "Warning: AUTOPAUSE_TIMEOUT_KN is not numeric, set to 120 (seconds)"
-fi
-if ! [[ $AUTOPAUSE_TIMEOUT_EST =~ ^[0-9]+$ ]] ; then
-  AUTOPAUSE_TIMEOUT_EST=3600
-  export AUTOPAUSE_TIMEOUT_EST
-  log "Warning: AUTOPAUSE_TIMEOUT_EST is not numeric, set to 3600 (seconds)"
-fi
-if ! [[ $AUTOPAUSE_TIMEOUT_INIT =~ ^[0-9]+$ ]] ; then
-  AUTOPAUSE_TIMEOUT_INIT=600
-  export AUTOPAUSE_TIMEOUT_INIT
-  log "Warning: AUTOPAUSE_TIMEOUT_INIT is not numeric, set to 600 (seconds)"
-fi
-
-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)"
-else
-  if versionLessThan 1.8.1; then
-    # 10 years
-    MAX_TICK_TIME=315360000000
-  else
-    MAX_TICK_TIME=-1
-  fi
-  export MAX_TICK_TIME
-fi
-
-/autopause/autopause-daemon.sh &

start-configuration

@@ -68,10 +68,6 @@ cd /data || exit 1
 
 export ORIGINAL_TYPE=${TYPE^^}
 
-if isTrue "${ENABLE_AUTOPAUSE}"; then
-  /start-autopause
-fi
-
 log "Resolving type given ${TYPE}"
 case "${TYPE^^}" in
   *BUKKIT|SPIGOT)

start-deployFTB

@@ -16,12 +16,7 @@ if [[ -z $FTB_SERVER_MOD ]]; then
     exit 2
 fi
 
-entryScriptExpr="
-  -name ServerStart.sh
-  -o -name ServerStartLinux.sh
-  -o -name LaunchServer.sh
-  -o -name server-start.sh
-  "
+entryScriptExpr="-name ServerStart.sh -o -name ServerStartLinux.sh -o -name LaunchServer.sh"
 
 if [[ -d ${FTB_BASE_DIR} ]]; then
   startScriptCount=$(find ${FTB_BASE_DIR} $entryScriptExpr |wc -l)

start-deployVanilla

@@ -1,7 +1,6 @@
 #!/bin/bash
 
 . /start-utils
-isDebugging && set -x
 set -o pipefail
 
 export SERVER="minecraft_server.${VANILLA_VERSION// /_}.jar"
@@ -40,7 +39,5 @@ if [ ! -e $SERVER ] || [ -n "$FORCE_REDOWNLOAD" ]; then
   fi
 fi
 
-isDebugging && ls -l
-
 # Continue to Final Setup
 exec /start-finalSetup01World $@

start-finalSetup01World

@@ -1,8 +1,6 @@
 #!/bin/bash
 
 . /start-utils
-set -e
-isDebugging && set -x
 
 if [ $TYPE = "FEED-THE-BEAST" ]; then
   worldDest=$FTB_BASE_DIR/$LEVEL
@@ -10,45 +8,46 @@ else
   worldDest=/data/$LEVEL
 fi
 
+# If no world exists and a URL for a world is supplied, download it and unpack
 if [[ "$WORLD" ]] && [ ! -d "$worldDest" ]; then
-  if isURL $WORLD; then
-    curl -fsSL "$WORLD" -o /tmp/world.zip
-    zipSrc=/tmp/world.zip
-  elif [[ "$WORLD" =~ .*\.zip ]]; then
-    zipSrc="$WORLD"
-  fi
-
-  if [[ "$zipSrc" ]]; then
+case "X$WORLD" in
+  X[Hh][Tt][Tt][Pp]*)
+    log "Downloading world from $WORLD"
+    curl -sSL -o - "$WORLD" > /data/world.zip
     log "Unzipping world"
-
-    # Stage contents so that the correct subdirectory can be picked off
-    mkdir -p /tmp/world-data
-    (cd /tmp/world-data && unzip -o -q "$zipSrc")
-
-    baseDirs=$(find /tmp/world-data -name "level.dat" -exec dirname "{}" \;)
-    count=$(echo "$baseDirs" | wc -l)
-    if [[ $count -gt 1 ]]; then
-      baseDir="$(echo "$baseDirs" | sed -n ${WORLD_INDEX:-1}p)"
-      baseName=$(basename "$baseDir")
-      log "WARN multiple levels found, picking: $baseName"
-    elif [[ $count -gt 0 ]]; then
-      baseDir="$baseDirs"
+    unzip -o -q /data/world.zip
+    rm -f /data/world.zip
+    if [ ! -d $worldDest ]; then
+      log World directory not found
+      for i in /data/*/level.dat; do
+        if [ -f "$i" ]; then
+          d=`dirname "$i"`
+          log Renaming world directory from $d
+          mv -f "$d" $worldDest
+        fi
+      done
+    fi
+    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" "/data/${LEVEL}_the_end"
+      [ -d "$worldDest/DIM-1" ] && mv -f "$worldDest/DIM-1" "/data/${LEVEL}_nether"
+    fi
+    ;;
+  *)
+    if [[ -d "$WORLD" ]]; then
+      if [[ ! -d "$worldDest" ]]; then
+        log "Cloning world directory from $WORLD ..."
+        cp -r "$WORLD" "$worldDest"
+      else
+        log "Skipping clone from $WORLD since $worldDest exists"
+      fi
     else
-      log "ERROR invalid world content"
+      log "World cloning source '$WORLD' doesn't seem to exist"
       exit 1
     fi
-    mv "$baseDir" "$worldDest"
-  else
-    log "Cloning world directory from $WORLD ..."
-    cp -r "$WORLD" "$worldDest"
-  fi
-
-  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" "/data/${LEVEL}_the_end"
-    [ -d "$worldDest/DIM-1" ] && mv -f "$worldDest/DIM-1" "/data/${LEVEL}_nether"
-  fi
+    ;;
+esac
 fi
 
 exec /start-finalSetup02Modpack $@

start-finalSetup04ServerProperties

@@ -180,18 +180,4 @@ else
   log "server.properties already created, skipping"
 fi
 
-if isTrue "${ENABLE_AUTOPAUSE}"; then
-  current_max_tick=$( grep 'max-tick-time' "$SERVER_PROPERTIES" | sed -r 's/( )+//g' | awk -F= '{print $2}' )
-  if (( $current_max_tick > 0 && $current_max_tick < 86400000 )); then
-    log "Warning: The server.properties for the server doesn't have the Server Watchdog (effectively) disabled."
-    log "Warning (cont): Autopause functionality resuming the process might trigger the Watchdog and restart the server completely."
-    log "Warning (cont): Set the max-tick-time property to a high value (or disable the Watchdog with value -1 for versions 1.8.1+)."
-  fi
-fi
-
-if isDebugging; then
-  log "DEBUG Dumping server.properties"
-  cat /data/server.properties
-fi
-
 exec /start-finalSetup05EnvVariables $@

start-utils

@@ -49,14 +49,6 @@ function log {
   echo "[init] $*"
 }
 
-function logAutopause {
-  echo "[Autopause loop] $*"
-}
-
-function logAutopauseAction {
-  echo "[$(date -Iseconds)] [Autopause] $*"
-}
-
 function normalizeMemSize {
   local scale=1
   case ${1,,} in
@@ -83,20 +75,10 @@ function versionLessThan {
     return 1
   fi
 
-  if (( ${#activeParts[@]} == 2 )); then
-    if (( activeParts[0] < givenParts[0] )) || \
-      (( activeParts[0] == givenParts[0] && activeParts[1] < givenParts[1] )); then
-      return 0
-    else
-      return 1
-    fi
+  if (( activeParts[0] < givenParts[0] )) || \
+     (( activeParts[0] == givenParts[0] && activeParts[1] < givenParts[1] )); then
+    return 0
   else
-    if (( activeParts[0] < givenParts[0] )) || \
-      (( activeParts[0] == givenParts[0] && activeParts[1] < givenParts[1] )) || \
-      (( activeParts[0] == givenParts[0] && activeParts[1] == givenParts[1] && activeParts[2] < givenParts[2] )); then
-      return 0
-    else
-      return 1
-    fi
+    return 1
   fi
 }