Auto-merging via docker-versions-create

2026-02-17 15:13:55 +00:00 · 2021-01-06 22:05:34 -06:00 · 2020-12-27 22:07:32 -06:00 · 2020-12-19 08:26:00 -06:00 · 2020-12-15 14:00:18 -06:00 · 2020-12-07 10:53:47 -06:00
28 changed files with 136 additions and 543 deletions
--- a/.github/workflows/build-multiarch.yml
+++ b/.github/workflows/build-multiarch.yml
@@ -1,82 +0,0 @@
-name: Build and publish multiarch
-on:
-  push:
-    branches:
-      - multiarch
-      - java8-multiarch
-      - multiarch-latest
-      - java15
-      - test/multiarch/*
-    tags:
-      - "[0-9]+.[0-9]+.[0-9]+-multiarch"
-      - "[0-9]+.[0-9]+.[0-9]+-multiarch-latest"
-      - "[0-9]+.[0-9]+.[0-9]+-java15"
-
-jobs:
-  docker-buildx:
-    runs-on: ubuntu-20.04
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2.2.0
-
-      - name: Prepare
-        id: prep
-        run: |
-          DOCKER_IMAGE=itzg/minecraft-server
-          VERSION=edge
-          if [[ $GITHUB_REF == refs/tags/* ]]; then
-            VERSION=${GITHUB_REF#refs/tags/}
-          fi
-          if [[ $GITHUB_REF == refs/heads/* ]]; then
-            VERSION=${GITHUB_REF#refs/heads/}
-            if [[ $VERSION == master ]]; then
-              VERSION=latest
-            fi
-          fi
-          TAGS="${DOCKER_IMAGE}:${VERSION//\//-}"
-          echo ::set-output name=tags::${TAGS}
-          echo ::set-output name=cache_from::${TAGS}
-          echo ::set-output name=version::${VERSION//\//-}
-          echo ::set-output name=cache_version::${VERSION//\//-}
-
-      - name: Setup Docker Buildx
-        uses: docker/setup-buildx-action@v1
-
-      - name: Cache Docker layers
-        uses: actions/cache@v2
-        with:
-          path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-buildx-${{ steps.prep.outputs.cache_version }}-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-buildx-${{ steps.prep.outputs.cache_version }}-
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-
-      - name: Login to DockerHub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKER_USER }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      - name: Build and push
-        id: docker_build
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          file: ./Dockerfile
-          platforms: linux/amd64,linux/arm/v7,linux/arm64
-          push: ${{ github.event_name != 'pull_request' }}
-          tags: ${{ steps.prep.outputs.tags }}
-          # ensure latest base image is used
-          pull: true
-          cache-from: type=local,src=/tmp/.buildx-cache
-          cache-to: type=local,dest=/tmp/.buildx-cache
-          labels: |
-            org.opencontainers.image.documentation=https://github.com/itzg/docker-minecraft-server
-            org.opencontainers.image.source=https://github.com/itzg/docker-minecraft-server
-            org.opencontainers.image.version=${{ steps.prep.outputs.version }}
-            org.opencontainers.image.revision=${{ github.sha }}
-
-      - name: Image digest
-        run: echo ${{ steps.docker_build.outputs.digest }}
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -4,22 +4,24 @@ on:
  push:
    branches:
      - master
-      - java8
      - openj9
-      - openj9-11
+      - openj9-nightly
      - adopt11
-      - test/*
+      - adopt13
+      - adopt14
+      - adopt15
    tags:
      - "[0-9]+.[0-9]+.[0-9]+"
-      - "[0-9]+.[0-9]+.[0-9]+-java8"
      - "[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
@@ -30,68 +32,20 @@ jobs:
  build:
    needs:
      - test
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest

    steps:
    - 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=cache_from::${TAGS}
-        echo ::set-output name=version::${VERSION//\//-}
-        echo ::set-output name=cache_version::${VERSION//\//-}
-
-    - name: Setup Docker Buildx
-      uses: docker/setup-buildx-action@v1
-
-    - name: Cache Docker layers
-      uses: actions/cache@v2
-      with:
-        path: /tmp/.buildx-cache
-        key: ${{ runner.os }}-buildx-${{ steps.prep.outputs.cache_version }}-${{ github.sha }}
-        restore-keys: |
-          ${{ runner.os }}-buildx-${{ steps.prep.outputs.cache_version }}-
-          ${{ 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
-      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
-        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 }}
--- 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/61
+++ b/61
@@ -1,29 +1,32 @@
-FROM ubuntu:18.04
+FROM adoptopenjdk/openjdk15:alpine-jre

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

-RUN apt-get update \
-  && DEBIAN_FRONTEND=noninteractive \
-  apt-get install -y \
-    openjdk-8-jre-headless \
-    imagemagick \
-    gosu \
-    sudo \
-    net-tools \
-    curl wget \
-    jq \
-    dos2unix \
-    mysql-client \
-    tzdata \
-    rsync \
-    nano \
-    unzip \
-    knockd \
-    ttf-dejavu \
-    && apt-get clean
+# upgrade all packages since alpine jre8 base image tops out at 8u212
+RUN apk -U --no-cache upgrade

-RUN addgroup --gid 1000 minecraft \
-  && adduser --system --shell /bin/false --uid 1000 --ingroup minecraft --home /data minecraft
+RUN apk add --no-cache -U \
+  openssl \
+  imagemagick \
+  lsof \
+  su-exec \
+  shadow \
+  bash \
+  curl iputils wget \
+  git \
+  jq \
+  mysql-client \
+  tzdata \
+  rsync \
+  nano \
+  sudo \
+  knock \
+  ttf-dejavu
+
+RUN addgroup -g 1000 minecraft \
+  && adduser -Ss /bin/false -u 1000 -G minecraft -h /home/minecraft minecraft \
+  && mkdir -m 777 /data \
+  && chown minecraft:minecraft /data /home/minecraft

 COPY files/sudoers* /etc/sudoers.d

@@ -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
@@ -67,10 +70,10 @@ COPY log4j2.xml /tmp/log4j2.xml
 WORKDIR /data

 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" \
+  JVM_XX_OPTS="-XX:+UseG1GC" 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" \
  ENABLE_AUTOPAUSE=false AUTOPAUSE_TIMEOUT_EST=3600 AUTOPAUSE_TIMEOUT_KN=120 AUTOPAUSE_TIMEOUT_INIT=600 \
  AUTOPAUSE_PERIOD=10 AUTOPAUSE_KNOCK_INTERFACE=eth0

--- a/README.md
+++ b/README.md
@@ -116,24 +116,8 @@ to map a directory on your host machine to the container's `/data` directory, su

    docker run -d -v /path/on/host:/data ...

-When attached in this way you can stop the server, edit the configuration under your attached `/path/on/host` and start the server again with `docker start CONTAINER_ID` to pick up the new configuration.
-
-As example, using Docker compose, create the following `docker-compose.yml` in its own directory and the container will automatically create/attach the relative directory `data` to the container:
-
-```yaml
-version: "3"
-
-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
-```
+When attached in this way you can stop the server, edit the configuration under your attached `/path/on/host`
+and start the server again with `docker start CONTAINERID` to pick up the new configuration.

 ## Versions

@@ -160,31 +144,23 @@ the server jar remain in the `/data` directory. It is safe to remove those._

 To use a different version of Java, please use a docker tag to run your Minecraft server.

-| Tag name       | Java version | Linux  | JVM Type | Architecture      |
-| -------------- | -------------|--------|----------|-------------------|
-| latest         | 11           | Alpine | Hotspot  | amd64             |
-| java8          | 8            | Alpine | Hotspot  | amd64             |
-| java8-multiarch | 8           | Debian | Hotspot  | amd64,arm64,armv7 |
-| java15         | 15           | Debian | Hotspot  | amd64,arm64,armv7 |
-| adopt11        | 11           | Alpine | Hotspot  | amd64             |
-| openj9         | 8            | Alpine | OpenJ9   | amd64             |
-| openj9-11      | 11           | Alpine | OpenJ9   | amd64             |
-| multiarch      | 11           | Debian | Hotspot  | amd64,arm64,armv7 |
-| multiarch-latest | 15+        | Debian | Hotspot  | amd64,arm64,armv7 |
+| Tag name       | Description                                 | Linux        |
+| -------------- | ------------------------------------------- | ------------ |
+| latest         | **Default**. Uses Java version 8            | Alpine Linux |
+| adopt15        | Uses Java version 15 from AdoptOpenJDK      | Alpine Linux |
+| adopt14        | Uses Java version 14 from AdoptOpenJDK      | Alpine Linux |
+| adopt13        | Uses Java version 13 from AdoptOpenJDK      | Alpine Linux |
+| adopt11        | Uses Java version 11 from AdoptOpenJDK      | Alpine Linux |
+| openj9         | Uses Eclipse OpenJ9 JVM                     | Alpine Linux |
+| openj9-nightly | Uses Eclipse OpenJ9 JVM testing builds      | Alpine Linux |
+| multiarch      | Uses Java version 8 latest update           | Debian Linux |
+| multiarch-latest | Uses Java version 15 latest update        | Debian Linux |

-For example, to use Java version 15 on any supported architecture:
+For example, to use a Java version 13:

-    docker run --name mc itzg/minecraft-server:java15
+    docker run --name mc itzg/minecraft-server:adopt13

-> Keep in mind that some versions of Minecraft server can't work on the newest versions of Java. Also, FORGE doesn't support openj9 JVM implementation.
-
-### Deprecated Image Tags
-
-The following image tags have been deprecated and are no longer receiving updates:
- adopt13
- adopt14
- adopt15
- openj9-nightly
+Keep in mind that some versions of Minecraft server can't work on the newest versions of Java. Also, FORGE doesn't support openj9 JVM implementation.

 ## Healthcheck

@@ -261,13 +237,12 @@ If you're looking for a simple way to deploy this to the Amazon Web Services Clo

 ## Running a Forge Server

-Enable [Forge server](http://www.minecraftforge.net/wiki/) mode by adding a `-e TYPE=FORGE` to your command-line.
-
-The overall version is specified by `VERSION`, [as described in the section above](#versions) and will run the recommended Forge version by default. You can also choose to run a specific Forge version with `FORGEVERSION`, such as `-e FORGEVERSION=14.23.5.2854`.
+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 \
-        -e TYPE=FORGE \
-        -e VERSION=1.12.2 -e FORGEVERSION=14.23.5.2854 \
+        -e TYPE=FORGE -e FORGEVERSION=10.13.4.1448 \
        -p 25565:25565 -e EULA=TRUE --name mc itzg/minecraft-server

 To use a pre-downloaded Forge installer, place it in the attached `/data` directory and
@@ -487,30 +462,6 @@ A [Tuinity](https://github.com/Spottedleaf/Tuinity) server, which is a fork of P

 > **NOTE** only `VERSION=LATEST` is supported

-## Running a Purpur server
-
-A [Purpur](https://purpur.pl3x.net/) server, which is "a fork of Paper and Tuinity with the goal of providing new and interesting configuration options".
-
-    -e TYPE=PURPUR
-
-> NOTE: the `VERSION` variable is used to lookup a build of Purpur to download
-
-Extra variables:
- `PURPUR_BUILD=LATEST` : set a specific Purpur build to use
- `FORCE_REDOWNLOAD=false` : set to true to force the located server jar to be re-downloaded
-
-## Running a Yatopia server
-
-A [Yatopia](https://github.com/YatopiaMC/Yatopia) server, which is a "blazing fast Tuinity fork with best in class performance".
-
-    -e TYPE=YATOPIA
-
-> NOTE: the `VERSION` variable is used to locate the Yatopia version to download
-
-Extra variables:
- `RELEASE=stable` : set to `stable` or `latest`
- `FORCE_REDOWNLOAD=false` : set to true to force the located server jar to be re-downloaded
-
 ## Running a Magma server

 A [Magma](https://magmafoundation.org/) server, which is a combination of Forge and PaperMC, can be used with
@@ -539,7 +490,7 @@ A [Catserver](http://catserver.moe/) type server can be used with

 ## Running a server with a Feed the Beast modpack

-> **NOTE** requires one of the Debian based images listed in [the Java versions section](#running-minecraft-server-on-different-java-version).
+> **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.

@@ -800,18 +751,12 @@ To whitelist players for your Minecraft server, pass the Minecraft usernames sep

 If the `WHITELIST` environment variable is not used, any user can join your Minecraft server if it's publicly accessible.

-> NOTE: When `WHITELIST` is used the server property `white-list` will automatically get set to `true`.
-
-> By default, the players in `WHITELIST` are **added** to the final `whitelist.json` file by the Minecraft server. If you set `OVERRIDE_WHITELIST` to "true" then the `whitelist.json` file will be recreated on each server startup.
-
 ### Op/Administrator Players

 To add more "op" (aka adminstrator) users to your Minecraft server, pass the Minecraft usernames separated by commas via the `OPS` environment variable, such as

    docker run -d -e OPS=user1,user2 ...

-> By default, the players in `OPS` are **added** to the final `ops.json` file by the Minecraft server. If you set `OVERRIDE_OPS` to "true" then the `ops.json` file will be recreated on each server startup.
-
 ### Server icon

 A server icon can be configured using the `ICON` variable. The image will be automatically
@@ -819,10 +764,6 @@ downloaded, scaled, and converted from any other image format:

    docker run -d -e ICON=http://..../some/image.png ...

-The server icon which has been set doesn't get overridden by default. It can be changed and overridden by setting `OVERRIDE_ICON` to `TRUE`.
-
-    docker run -d -e ICON=http://..../some/other/image.png -e OVERRIDE_ICON=TRUE...
-
 ### Rcon

 To use rcon use the `ENABLE_RCON` and `RCON_PASSORD` variables.
@@ -989,7 +930,7 @@ environment variable set to `false`, such as
 ### Level Type and Generator Settings

 By default, a standard world is generated with hills, valleys, water, etc. A different level type can
-be configured by setting `LEVEL_TYPE` to an expected type, for example
+be configured by setting `LEVEL_TYPE` to an expected type, such as

 - DEFAULT
 - FLAT
@@ -997,8 +938,6 @@ be configured by setting `LEVEL_TYPE` to an expected type, for example
 - AMPLIFIED
 - CUSTOMIZED
 - BUFFET
- BIOMESOP (Biomes O' Plenty for 1.12 and older)
- BIOMESOPLENTY (Biomes O' Plenty for 1.15 and above)

 Descriptions are available at the [gamepedia](http://minecraft.gamepedia.com/Server.properties).

@@ -1129,18 +1068,19 @@ is passed to `docker run`.

 ### Memory Limit

-By default, the image declares an initial and maximum Java memory-heap limit of 1 GB. There are several ways to adjust the memory settings:
+By default, the image declares a Java initial and maximum memory limit of 1 GB. There are several
+ways to adjust the memory settings:

- `MEMORY`: "1G" by default, can be used to adjust both initial (`Xms`) and max (`Xmx`) memory heap settings of the JVM
- `INIT_MEMORY`: independently sets the initial heap size
- `MAX_MEMORY`: independently sets the max heap size
+- `MEMORY`, "1G" by default, can be used to adjust both initial (`Xms`) and max (`Xmx`)
+  memory settings of the JVM
+- `INIT_MEMORY`, independently sets the initial heap size
+- `MAX_MEMORY`, independently sets the max heap size

-The values of all three are passed directly to the JVM and support format/units as `<size>[g|G|m|M|k|K]`. For example:
+The values of all three are passed directly to the JVM and support format/units as
+`<size>[g|G|m|M|k|K]`. For example:

    -e MEMORY=2G

-> NOTE: the settings above only set the Java **heap** limits. Memory resource requests and limits on the overall container should also account for non-heap memory usage. An extra 25% is [a general best practice](https://dzone.com/articles/best-practices-java-memory-arguments-for-container).
-
 ### JVM Options

 General JVM options can be passed to the Minecraft Server invocation by passing a `JVM_OPTS`
--- a/docker-versions-create.sh
+++ b/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=('java8' 'java8-multiarch' 'openj9' 'openj9-11' 'adopt11' 'java15' 'multiarch' '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/examples/docker-compose-simple.yml
+++ b/examples/docker-compose-simple.yml
@@ -1,12 +0,0 @@
-version: "3"
-
-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/files/autopause/autopause-fcns.sh
+++ b/files/autopause/autopause-fcns.sh
@@ -5,15 +5,15 @@ current_uptime() {
 }

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

 java_process_exists() {
-  [[ -n "$(ps -ax -o comm | grep 'java')" ]]
+  [[ -n "$(ps -a -o comm | grep 'java')" ]]
 }

 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

--- 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
 fi
--- 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/2
+++ b/2
@@ -40,7 +40,7 @@ if [ $(id -u) = 0 ]; then
    echo 'hosts: files dns' > /etc/nsswitch.conf
  fi

-  exec gosu ${runAsUser}:${runAsGroup} ${SCRIPTS:-/}start-configuration $@
+  exec su-exec ${runAsUser}:${runAsGroup} ${SCRIPTS:-/}start-configuration $@
 else
  exec ${SCRIPTS:-/}start-configuration $@
 fi
--- a/35
+++ b/35
@@ -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"
@@ -101,11 +102,7 @@ case "${TYPE^^}" in
    exec ${SCRIPTS:-/}start-deployFabric "$@"
  ;;

-  FTBA)
-    exec ${SCRIPTS:-/}start-deployFTBA "$@"
-  ;;
-
-  CURSEFORGE|FTB)
+  FTB|CURSEFORGE)
    exec ${SCRIPTS:-/}start-deployCF "$@"
  ;;

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

-  PURPUR)
-    exec ${SCRIPTS:-/}start-deployPurpur "$@"
-  ;;
-
-  YATOPIA)
-    exec ${SCRIPTS:-/}start-deployYatopia "$@"
-  ;;
-
  *)
      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"
+      log "         CURSE_INSTANCE, CURSEFORGE, SPONGEVANILLA,"
+      log "         CUSTOM, MAGMA, MOHIST, CATSERVER"
      exit 1
  ;;

--- a/2
+++ b/2
@@ -9,7 +9,7 @@ isDebugging && set -x
 export FTB_BASE_DIR

 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}

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

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

 if [[ -z $FORGE_INSTALLER && -z $FORGE_INSTALLER_URL ]]; then
  norm=$VANILLA_VERSION
--- a/12
+++ b/12
@@ -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,10 +56,6 @@ else
    zarg=(-z "$SERVER")
  fi

-  log "Removing old PaperMC versions ..."
-  paperJarSearchString=${SERVER/$build/[0-9]*}
-  find . -maxdepth 1 -name "$paperJarSearchString" ! -name "$SERVER" -delete -print
-
  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}" \
@@ -75,4 +71,4 @@ export TYPE=SPIGOT
 export SKIP_LOG4J_CONFIG=true

 # Continue to Final Setup
-exec ${SCRIPTS:-/}start-finalSetupWorld "$@"
+exec ${SCRIPTS:-/}start-finalSetupWorld $@
--- a/38
+++ b/38
@@ -1,38 +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://purpur.pl3x.net/api/v1/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://purpur.pl3x.net/api/v1/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
-
-# Continue to Final Setup
-exec ${SCRIPTS:-/}start-finalSetupWorld $@
--- 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/2
+++ b/2
@@ -20,7 +20,7 @@ if [ ! -f "$SERVER" ] || [ -n "$FORCE_REDOWNLOAD" ]; then
    fi
 fi

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

 # Continue to Final Setup
--- 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:=stable}
-: ${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/19
+++ b/19
@@ -81,23 +81,16 @@ 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
+        log "ERROR: $effective_url resolved from $i is not a valid jar URL"
+        exit 2
      fi
    else
      log "ERROR Invalid URL given in MODS: $i"
--- a/2
+++ b/2
@@ -69,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"
--- a/3
+++ b/3
@@ -4,9 +4,6 @@
 set -e
 isDebugging && set -x

-: ${LEVEL:=world}
-export LEVEL
-
 if [ $TYPE = "FEED-THE-BEAST" ]; then
  worldDest=$FTB_DIR/$LEVEL
 else
--- a/57
+++ b/57
@@ -3,40 +3,28 @@
 . ${SCRIPTS:-/}start-utils

 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
-
-  if isTrue "${OVERRIDE_OPS}"; then
-    log "Recreating ops.json file at server startup"
-    rm -f /data/ops.json
-  fi
 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
-
-  if isTrue "${OVERRIDE_WHITELIST}"; then
-    log "Recreating whitelist.json file at server startup"
-    rm -f /data/whitelist.json
-  fi
 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
+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 "Converting image to 64x64 PNG..."
+    convert /tmp/icon.img -resize 64x64! /data/server-icon.png
+  fi
 fi

 if ! isTrue ${SKIP_LOG4J_CONFIG}; then
@@ -158,21 +146,16 @@ 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}/"
 }

-if ! which java > /dev/null; then
-  log "Fixing PATH to include java"
-  PATH="${PATH}:/usr/bin"
-fi
-
 mcServerRunnerArgs="--stop-duration ${STOP_DURATION:-60}s"
 if [[ ${TYPE} == "CURSE_INSTANCE" ]]; then
    if isTrue ${DEBUG_EXEC}; then
@@ -181,7 +164,7 @@ if [[ ${TYPE} == "CURSE_INSTANCE" ]]; then
    exec mc-server-runner ${mcServerRunnerArgs} \
      --cf-instance-file "${CURSE_INSTANCE_JSON}" \
      java $JVM_XX_OPTS $JVM_OPTS $expandedDOpts -jar _SERVERJAR_ "$@" $EXTRA_ARGS
-elif [[ ${TYPE} == "CURSEFORGE" && "${SERVER}" ]]; then
+elif [[ ${TYPE} == "FEED-THE-BEAST" && "${SERVER}" ]]; then
  copyFilesForCurseForge

  cd "${FTB_DIR}"
@@ -190,7 +173,7 @@ elif [[ ${TYPE} == "CURSEFORGE" && "${SERVER}" ]]; then
    set -x
  fi
  exec mc-server-runner ${bootstrapArgs} ${mcServerRunnerArgs} java $JVM_XX_OPTS $JVM_OPTS $expandedDOpts -jar $(basename "${SERVER}") "$@" $EXTRA_ARGS
-elif [[ ${TYPE} == "CURSEFORGE" ]]; then
+elif [[ ${TYPE} == "FEED-THE-BEAST" ]]; then
  mcServerRunnerArgs="${mcServerRunnerArgs} --shell bash"

  copyFilesForCurseForge
--- a/17
+++ b/17
@@ -144,23 +144,8 @@ 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}"
Author	SHA1	Message	Date
Geoff Bourne	c8b23143b7	Auto-merging via docker-versions-create	2021-01-06 22:05:34 -06:00
Geoff Bourne	92e72bdeec	Auto-merging via docker-versions-create	2020-12-27 22:07:32 -06:00
Geoff Bourne	59f2f324e7	Auto-merging via docker-versions-create	2020-12-19 08:26:00 -06:00
Geoff Bourne	65fa25b3b3	Auto-merging via docker-versions-create	2020-12-15 14:00:18 -06:00
Geoff Bourne	46272296d2	revert: Should have been added to master	2020-12-07 10:53:47 -06:00
Geoff Bourne	008bbb3aff	ci: Added adopt15 branch releases	2020-12-07 10:52:37 -06:00
Bartosz Stefańczyk	882fe89caf	Java 15 support (#679 )	2020-12-07 10:51:10 -06:00