Revert "Add use-proxy support to health extra args (#2973)"

This reverts commit 11d8d917f2.

.github/workflows/build-multiarch.yml

@@ -11,7 +11,6 @@ on:
       - "docs/**"
       - "examples/**"
       - "notes/**"
-      - "kustomize/**"
 
 jobs:
   build:
@@ -133,13 +132,13 @@ jobs:
             org.opencontainers.image.authors=Geoff Bourne <itzgeoff@gmail.com>
 
       - name: Setup Docker Buildx
-        uses: docker/setup-buildx-action@v3.6.1
+        uses: docker/setup-buildx-action@v3.4.0
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3.2.0
+        uses: docker/setup-qemu-action@v3.1.0
 
       - name: Build for test
-        uses: docker/build-push-action@v6.7.0
+        uses: docker/build-push-action@v5.4.0
         with:
           platforms: linux/amd64
           tags: ${{ env.IMAGE_TO_TEST }}
@@ -162,14 +161,14 @@ jobs:
           tests/test.sh
 
       - name: Login to DockerHub
-        uses: docker/login-action@v3.3.0
+        uses: docker/login-action@v3.2.0
         if: env.HAS_IMAGE_REPO_ACCESS
         with:
           username: ${{ secrets.DOCKER_USER }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Login to GHCR
-        uses: docker/login-action@v3.3.0
+        uses: docker/login-action@v3.2.0
         if: env.HAS_IMAGE_REPO_ACCESS
         with:
           registry: ghcr.io
@@ -177,7 +176,7 @@ jobs:
           password: ${{ github.token }}
 
       - name: Build and push
-        uses: docker/build-push-action@v6.7.0
+        uses: docker/build-push-action@v5.4.0
         if: github.actor == github.repository_owner
         with:
           platforms: ${{ matrix.platforms }}

.github/workflows/verify-pr.yml

@@ -8,7 +8,6 @@ on:
       - "docs/**"
       - "examples/**"
       - "notes/**"
-      - "kustomize/**"
       - "docker-compose*.yml"
       - "mkdocs.yml"
 
@@ -53,10 +52,10 @@ jobs:
           fetch-depth: 0
 
       - name: Setup Docker Buildx
-        uses: docker/setup-buildx-action@v3.6.1
+        uses: docker/setup-buildx-action@v3.4.0
 
       - name: Confirm multi-arch build
-        uses: docker/build-push-action@v6.7.0
+        uses: docker/build-push-action@v5.4.0
         with:
           platforms: ${{ matrix.platforms }}
           # ensure latest base image is used
@@ -66,7 +65,7 @@ jobs:
           cache-from: type=gha,scope=${{ matrix.variant }}
 
       - name: Build for test
-        uses: docker/build-push-action@v6.7.0
+        uses: docker/build-push-action@v5.4.0
         with:
           # Only build single platform since loading multi-arch image into daemon fails with
           # "docker exporter does not currently support exporting manifest lists"

Dockerfile

@@ -1,3 +1,5 @@
+# syntax = docker/dockerfile:1.3
+
 ARG BASE_IMAGE=eclipse-temurin:21-jre
 FROM ${BASE_IMAGE}
 
@@ -21,21 +23,21 @@ EXPOSE 25565
 ARG APPS_REV=1
 ARG GITHUB_BASEURL=https://github.com
 
-ARG EASY_ADD_VERSION=0.8.7
+ARG EASY_ADD_VERSION=0.8.6
 ADD ${GITHUB_BASEURL}/itzg/easy-add/releases/download/${EASY_ADD_VERSION}/easy-add_${TARGETOS}_${TARGETARCH}${TARGETVARIANT} /usr/bin/easy-add
 RUN chmod +x /usr/bin/easy-add
 
-ARG RESTIFY_VERSION=1.7.4
+ARG RESTIFY_VERSION=1.7.3
 RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
   --var version=${RESTIFY_VERSION} --var app=restify --file {{.app}} \
   --from ${GITHUB_BASEURL}/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
 
-ARG RCON_CLI_VERSION=1.6.8
+ARG RCON_CLI_VERSION=1.6.7
 RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
   --var version=${RCON_CLI_VERSION} --var app=rcon-cli --file {{.app}} \
   --from ${GITHUB_BASEURL}/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
 
-ARG MC_MONITOR_VERSION=0.12.13
+ARG MC_MONITOR_VERSION=0.12.12
 RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
   --var version=${MC_MONITOR_VERSION} --var app=mc-monitor --file {{.app}} \
   --from ${GITHUB_BASEURL}/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
@@ -45,7 +47,7 @@ RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
   --var version=${MC_SERVER_RUNNER_VERSION} --var app=mc-server-runner --file {{.app}} \
   --from ${GITHUB_BASEURL}/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
 
-ARG MC_HELPER_VERSION=1.39.11
+ARG MC_HELPER_VERSION=1.39.3
 ARG MC_HELPER_BASE_URL=${GITHUB_BASEURL}/itzg/mc-image-helper/releases/download/${MC_HELPER_VERSION}
 # used for cache busting local copy of mc-image-helper
 ARG MC_HELPER_REV=1
@@ -72,4 +74,4 @@ RUN curl -fsSL -o /image/Log4jPatcher.jar https://github.com/CreeperHost/Log4jPa
 RUN dos2unix /start* /auto/*
 
 ENTRYPOINT [ "/start" ]
-HEALTHCHECK --start-period=30s --retries=24 --interval=60s CMD mc-health
+HEALTHCHECK --start-period=1m --interval=5s --retries=24 CMD mc-health

bin/rcon-cmds-daemon.sh

@@ -44,7 +44,7 @@ do
       if [[ "$RCON_CMDS_STARTUP" ]]; then
         while read -r cmd; do
           run_command "$cmd"
-        done <<< "$(echo -e "$RCON_CMDS_STARTUP")"
+        done <<< "$RCON_CMDS_STARTUP"
       fi
       if 
         [[ -z "$RCON_CMDS_ON_CONNECT" ]] && 
@@ -66,7 +66,7 @@ do
         logRcon "First Clients has Connected, running first connect cmds"
         while read -r cmd; do
           run_command "$cmd"
-        done <<< "$(echo -e "$RCON_CMDS_FIRST_CONNECT")"
+        done <<< "$RCON_CMDS_FIRST_CONNECT"
     fi
 
     # When a client joins
@@ -74,13 +74,13 @@ do
         logRcon "Clients have Connected, running connect cmds"
         while read -r cmd; do
           run_command "$cmd"
-        done <<< "$(echo -e "$RCON_CMDS_ON_CONNECT")"
+        done <<< "$RCON_CMDS_ON_CONNECT"
     # When a client leaves
     elif (( CURR_CLIENTCONNECTIONS < CLIENTCONNECTIONS )) && [[ "$RCON_CMDS_ON_DISCONNECT" ]]; then
         logRcon "Clients have Disconnected, running disconnect cmds"
         while read -r cmd; do
           run_command "$cmd"
-        done <<< "$(echo -e "$RCON_CMDS_ON_DISCONNECT")"
+        done <<< "$RCON_CMDS_ON_DISCONNECT"
     fi
 
     # Last client connection
@@ -89,7 +89,7 @@ do
         logRcon "ALL Clients have Disconnected, running last disconnect cmds"
         while read -r cmd; do
           run_command "$cmd"
-        done <<< "$(echo -e "$RCON_CMDS_LAST_DISCONNECT")"
+        done <<< "$RCON_CMDS_LAST_DISCONNECT"
     fi
     CLIENTCONNECTIONS=$CURR_CLIENTCONNECTIONS
     ;;

build/alpine/install-packages.sh

@@ -3,7 +3,6 @@
 set -e
 set -o pipefail
 
-# Install necessary packages
 apk add --no-cache -U \
     openssl \
     imagemagick \
@@ -15,8 +14,7 @@ apk add --no-cache -U \
     procps \
     shadow \
     bash \
-    curl \
-    iputils \
+    curl iputils \
     git \
     jq \
     mysql-client \
@@ -31,15 +29,11 @@ apk add --no-cache -U \
     libwebp \
     libcap
 
-# Download and install patched knockd
+# Patched knockd
 curl -fsSL -o /tmp/knock.tar.gz https://github.com/Metalcape/knock/releases/download/0.8.1/knock-0.8.1-alpine-amd64.tar.gz
 tar -xf /tmp/knock.tar.gz -C /usr/local/ && rm /tmp/knock.tar.gz
 ln -s /usr/local/sbin/knockd /usr/sbin/knockd
 setcap cap_net_raw=ep /usr/local/sbin/knockd
 
-# Set Git credentials globally
-cat <<EOF >> /etc/gitconfig
-[user]
-	name = Minecraft Server on Docker
-	email = server@example.com
-EOF
+# Set git credentials
+echo -e "[user]\n       name = Minecraft Server on Docker\n     email = server@example.com" >> /etc/gitconfig

build/ol/install-gosu.sh

@@ -1,22 +1,12 @@
 #!/bin/bash
 
-set -euo pipefail
-
-GOSU_VERSION="1.16"
-GOSU_BASE_URL="https://github.com/tianon/gosu/releases/download/$GOSU_VERSION"
-
-case $(uname -m) in
-    "aarch64")
-        GOSU_ARCH="gosu-arm64"
-        ;;
-    "x86_64")
-        GOSU_ARCH="gosu-amd64"
-        ;;
-    *)
-        echo "Architecture not supported!"
-        exit 1
-        ;;
-esac
-
-curl -sL -o /bin/gosu "${GOSU_BASE_URL}/${GOSU_ARCH}"
-chmod +x /bin/gosu
+if [[ $(uname -m) == "aarch64" ]]; then 
+    curl -sL -o /bin/gosu https://github.com/tianon/gosu/releases/download/1.16/gosu-arm64
+    chmod +x /bin/gosu
+elif [[ $(uname -m) == "x86_64" ]]; then 
+    curl -sL -o /bin/gosu https://github.com/tianon/gosu/releases/download/1.16/gosu-amd64
+    chmod +x /bin/gosu
+else
+    echo "Not supported!"
+    exit 1
+fi  

build/ol/install-packages.sh

@@ -4,25 +4,20 @@ export TARGET
 
 set -euo pipefail
 
-# Install and configure dnf
 microdnf install dnf -y
+
 dnf install 'dnf-command(config-manager)' -y
 dnf config-manager --set-enabled ol8_codeready_builder
-
-# Add EPEL repository
-tee /etc/yum.repos.d/ol8-epel.repo <<EOF
+tee /etc/yum.repos.d/ol8-epel.repo<<EOF
 [ol8_developer_EPEL]
-name=Oracle Linux \$releasever EPEL (\$basearch)
+name= Oracle Linux \$releasever EPEL (\$basearch)
 baseurl=https://yum.oracle.com/repo/OracleLinux/OL8/developer/EPEL/\$basearch/
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
 gpgcheck=1
 enabled=1
 EOF
-
-# Update system
 dnf update -y
 
-# Install necessary packages
 dnf install -y \
   ImageMagick \
   file \
@@ -31,6 +26,7 @@ dnf install -y \
   iputils \
   curl \
   git \
+  git-lfs \
   jq \
   dos2unix \
   mysql \
@@ -46,26 +42,18 @@ dnf install -y \
   findutils \
   which
 
-# Install Git LFS
 curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.rpm.sh | sudo bash
 dnf update -y
-dnf install -y git-lfs
+dnf install -y \
+  git-lfs
 
-# Clean up DNF when done
-dnf clean all
-
-# Install gosu (assuming the script /build/ol/install-gosu.sh exists and is executable)
 bash /build/ol/install-gosu.sh
 
-# Download and install patched knockd
+# Patched knockd
 curl -fsSL -o /tmp/knock.tar.gz https://github.com/Metalcape/knock/releases/download/0.8.1/knock-0.8.1-$TARGET.tar.gz
 tar -xf /tmp/knock.tar.gz -C /usr/local/ && rm /tmp/knock.tar.gz
 ln -s /usr/local/sbin/knockd /usr/sbin/knockd
 setcap cap_net_raw=ep /usr/local/sbin/knockd
 
-# Set git credentials globally
-cat <<EOF >> /etc/gitconfig
-[user]
-	name = Minecraft Server on Docker
-	email = server@example.com
-EOF
+# Set git credentials
+echo -e "[user]\n       name = Minecraft Server on Docker\n     email = server@example.com" >> /etc/gitconfig

build/ubuntu/install-packages.sh

@@ -4,8 +4,8 @@ export TARGET
 
 set -euo pipefail
 
-# Update and install packages
 apt-get update
+
 DEBIAN_FRONTEND=noninteractive \
 apt-get install -y \
   imagemagick \
@@ -26,26 +26,22 @@ apt-get install -y \
   zstd \
   lbzip2 \
   nfs-common \
-  libpcap0.8
+  libpcap0.8 \
+  webp
 
-# Install Git LFS
 curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | sudo bash
 apt-get update
-apt-get install -y git-lfs
+apt-get install -y \
+  git-lfs
 
-# Clean up APT when done
 apt-get clean
 
-# Download and install patched knockd
+# Patched knockd
 curl -fsSL -o /tmp/knock.tar.gz https://github.com/Metalcape/knock/releases/download/0.8.1/knock-0.8.1-$TARGET.tar.gz
 tar -xf /tmp/knock.tar.gz -C /usr/local/ && rm /tmp/knock.tar.gz
 ln -s /usr/local/sbin/knockd /usr/sbin/knockd
 setcap cap_net_raw=ep /usr/local/sbin/knockd
 find /usr/lib -name 'libpcap.so.0.8' -execdir cp '{}' libpcap.so.1 \;
 
-# Set git credentials globally
-cat <<EOF >> /etc/gitconfig
-[user]
-	name = Minecraft Server on Docker
-	email = server@example.com
-EOF
+# Set git credentials
+echo -e "[user]\n	name = Minecraft Server on Docker\n	email = server@example.com" >> /etc/gitconfig

build/ubuntu/setup-user.sh

@@ -2,9 +2,5 @@
 
 set -e
 
-if id ubuntu > /dev/null 2>&1; then
-  deluser ubuntu
-fi
-
 addgroup --gid 1000 minecraft
 adduser --system --shell /bin/false --uid 1000 --ingroup minecraft --home /data minecraft

docs/configuration/server-properties.md

@@ -128,7 +128,7 @@ When either is set, [whitelisting of connecting users](https://minecraft.wiki/w/
 
 To change the behavior when the whitelist file already exists, set the variable `EXISTING_WHITELIST_FILE` to one of the following options:
 
-`SKIP`
+`SKIP` (default)
 : Skip processing of the whitelist file when one is already present. This is the same as setting the legacy variable `OVERRIDE_WHITELIST` to "false".
 
 `SYNCHRONIZE`
@@ -137,7 +137,7 @@ To change the behavior when the whitelist file already exists, set the variable
 `MERGE`
 : Merge the list of users from `WHITELIST` into the existing file. `WHITELIST_FILE` cannot be used with this option.
 
-`SYNC_FILE_MERGE_LIST` (default)
+`SYNC_FILE_MERGE_LIST`
 : When `WHITELIST_FILE` is provided it will overwrite an existing whitelist file. Also, if `WHITELIST` is provided, then those users will be merged into the newly copied file.
 
 !!! note 
@@ -171,7 +171,7 @@ Similar to the whitelist, users can be provisioned as operators (aka administrat
 
 To change the behavior when the ops file already exists, set the variable `EXISTING_OPS_FILE` to one of the following options:
 
-`SKIP`
+`SKIP` (default)
 : Skip processing of the ops file when one is already present. This is the same as setting the legacy variable `OVERRIDE_OPS` to "false".
 
 `SYNCHRONIZE`
@@ -180,7 +180,7 @@ To change the behavior when the ops file already exists, set the variable `EXIST
 `MERGE`
 : Merge the list of users from `OPS` into the existing file. `OPS_FILE` cannot be used with this option.
 
-`SYNC_FILE_MERGE_LIST` (default)
+`SYNC_FILE_MERGE_LIST`
 : When `OPS_FILE` is provided it will overwrite an existing ops file. Also, if `OPS` is provided, then those users will be merged into the newly copied file.
 
 !!! note
@@ -495,11 +495,4 @@ When using `docker run` from a bash shell, the entries must be quoted with the `
 | SIMULATION_DISTANCE               | simulation-distance               |
 | SYNC_CHUNK_WRITES                 | sync-chunk-writes                 |
 | USE_NATIVE_TRANSPORT              | use-native-transport              |
-| HIDE_ONLINE_PLAYERS               | hide-online-players               |
-| RESOURCE_PACK_ID                  | resource-pack-id                  |
-| RESOURCE_PACK_PROMPT              | resource-pack-prompt              |
-| MAX_CHAINED_NEIGHBOR_UPDATES      | max-chained-neighbor-updates      |
-| LOG_IPS                           | log-ips                           |
-| REGION_FILE_COMPRESSION           | region-file-compression           |   
-| BUG_REPORT_LINK                   | bug-report-link                   |
-| PAUSE_WHEN_EMPTY_SECONDS          | pause-when-empty-seconds          |
+

docs/misc/autopause-autostop/autostop.md

@@ -2,7 +2,7 @@
 
 An option to stop the server after a specified time has been added for niche applications (e.g. billing saving on AWS Fargate). The function is incompatible with the Autopause functionality, as they basically cancel out each other.
 
-!!! note
+!!! note 
 
     the docker container variables have to be set accordingly (restart policy set to "no") and that the container has to be manually restarted.
 
@@ -25,6 +25,3 @@ The following environment variables define the behavior of auto-stopping:
   describes period of the daemonized state machine, that handles the stopping of the server
 
 > To troubleshoot, add `DEBUG_AUTOSTOP=true` to see additional output
-
-## Proxy Support
-If you make use of PROXY Protocol, i.e. through something like HAProxy or Fly.io, you will need to enable it in your variety of server's configuration, and then set the `USES_PROXY_PROTOCOL` envar to `true`. This lets Autostop monitor the server, where it otherwise wouldn't

docs/misc/examples.md

@@ -26,54 +26,6 @@ services:
 
 [Source](https://github.com/itzg/docker-minecraft-server/blob/master/examples/geyser/docker-compose.yml)
 
-## Lazymc - Put your Minecraft server to rest when idle
-
-With [lazymc-docker-proxy](https://github.com/joesturge/lazymc-docker-proxy) you are able to use [lazymc](https://github.com/timvisee/lazymc) with the minecraft container.
-
-```yaml
-services:
-  lazymc:
-    container_name: lazymc
-    image: ghcr.io/joesturge/lazymc-docker-proxy:latest
-    environment:
-      # Point to the service name of the Minecraft server
-      SERVER_ADDRESS: mc:25565
-      # Required to find the container to manage it
-      LAZYMC_GROUP: mc
-    restart: unless-stopped
-    volumes:
-      # you should mount the minecraft server dir under /server, using read only.
-      - data:/server:ro
-      # you need to supply the docker socket, so that the container can run docker command
-      - /var/run/docker.sock:/var/run/docker.sock:ro
-    ports:
-      # lazymc-docker-proxy acts as a proxy, so there is
-      # no need to expose the server port on the Minecraft container
-      - "25565:25565"
-
-  # Standard Docker Minecraft server, also works with other server types
-  mc:
-    image: itzg/minecraft-server:java21
-    container_name: minecraft-server
-    # We need to add a label here so that lazymc-docker-proxy knows which
-    # container to manage
-    labels:
-      - lazymc.group=mc
-    tty: true
-    stdin_open: true
-    # This container should be managed solely by the lazymc container
-    # so set restart to no, or else the container will start again...
-    restart: no
-    environment:
-      EULA: "TRUE"
-    volumes:
-      - data:/data
-
-volumes:
-  data:
-```
-[Source](https://github.com/joesturge/lazymc-docker-proxy/blob/master/docker-compose.yaml)
-
 ## Lazytainer - Stop Minecraft container based on traffic
 Monitors network traffic to the Minecraft containers. If there is traffic, the container runs, otherwise the container is stopped/paused.
 

docs/requirements.txt

@@ -1,6 +1,6 @@
-mkdocs-material == 9.5.34
-mkdocs-autorefs == 1.2.0
-mkdocstrings == 0.26.0
+mkdocs-material == 9.5.28
+mkdocs-autorefs == 1.0.1
+mkdocstrings == 0.25.1
 mkdocs-literate-nav == 0.6.1
 mdx-gh-links == 0.4
 mkdocs-click == 0.8.1

docs/types-and-platforms/server-types/hybrids.md

@@ -32,7 +32,7 @@ A [Ketting](https://github.com/kettingpowered/Ketting-1-20-x) server, which is a
 There are limited base versions supported, so you will also need to  set `VERSION`, such as "1.20.1" or later.
 
 `FORGE_VERSION` and `KETTING_VERSION` may be specified; however, they will be defaulted by the [Ketting launcher](https://github.com/kettingpowered/kettinglauncher) otherwise.
-Available Ketting Versions may be found at [https://reposilite.c0d3m4513r.com/#/Ketting-Server-Releases/org/kettingpowered/server/forge](https://reposilite.c0d3m4513r.com/#/Ketting-Server-Releases/org/kettingpowered/server/forge).
+Available Ketting Versions may be found at [https://github.com/kettingpowered/Ketting-1-20-x/packages/2041866/versions](https://github.com/kettingpowered/Ketting-1-20-x/packages/2041866/versions).
 The Version structure is `MinecraftVersion-ForgeVersion-KettingVersion` (e.g. `1.20.1-47.2.20-0.1.4` is for Minecraft `1.20.1`, Forge `47.2.20` and Ketting `0.1.4`).
 
 ### Mohist

docs/types-and-platforms/server-types/paper.md

@@ -16,14 +16,6 @@ To allow for the selection of experimental builds, set `PAPER_CHANNEL` to "exper
     docker run ... -e TYPE=PAPER -e PAPER_CHANNEL=experimental ... 
     ```
 
-!!! tip
-
-    If you see the following error, it likely means you need to set the env var `PAPER_CHANNEL` to "experimental"
-    
-    ```
-    No build found for version 1.21 with channel 'default'
-    ```
-
 If you are hosting your own copy of Paper you can override the download URL with `PAPER_DOWNLOAD_URL=<url>`.
 
 If you have attached a host directory to the `/data` volume, then you can install plugins via the `plugins` subdirectory. You can also [attach a `/plugins` volume](../../mods-and-plugins/index.md#optional-plugins-mods-and-config-attach-points). If you add plugins while the container is running, you'll need to restart it to pick those up.
@@ -65,19 +57,13 @@ Extra variables:
 
 ### Folia
 
-A [Folia server](https://papermc.io/software/folia) can be used by setting the environment variable `TYPE` to "FOLIA".
+Enable Folia server mode by adding a `-e TYPE=FOLIA` to your command-line.
 
-By default, the container will run the latest experimental build of [Folia server](https://papermc.io/downloads), but you can also choose to run a specific build with `-e FOLIABUILD=26`. The release channel can be changed with the variable `FOLIA_CHANNEL`; however, only experimental builds are available at this time.
+By default, the container will run the latest build of [Folia server](https://papermc.io/downloads), but you can also choose to run a specific build with `-e FOLIABUILD=26`.
 
-!!! example
-
-    Using `docker run`
-    
-    ```
     docker run -d -v /path/on/host:/data \
         -e TYPE=FOLIA \
         -p 25565:25565 -e EULA=TRUE --name mc itzg/minecraft-server
-    ```
 
 If you are hosting your own copy of Folia you can override the download URL with `FOLIA_DOWNLOAD_URL=<url>`.
 

examples/bmc4/docker-compose.yml

@@ -2,8 +2,11 @@ services:
   mc:
     image: itzg/minecraft-server:java17
     environment:
+      DEBUG: true
+      SETUP_ONLY: true
       EULA: true
       TYPE: MODRINTH
+      VERSION: 1.20.1
       MEMORY: 4G
       MODRINTH_MODPACK: better-mc-forge-bmc4
       MODRINTH_VERSION: v28

examples/lazymc/docker_compose.yml

@@ -1,40 +0,0 @@
-services:
-  lazymc:
-    container_name: lazymc
-    image: ghcr.io/joesturge/lazymc-docker-proxy:latest
-    environment:
-      # Point to the service name of the Minecraft server
-      SERVER_ADDRESS: mc:25565
-      # Required to find the container to manage it
-      LAZYMC_GROUP: mc
-    restart: unless-stopped
-    volumes:
-      # you should mount the minecraft server dir under /server, using read only.
-      - data:/server:ro
-      # you need to supply the docker socket, so that the container can run docker command
-      - /var/run/docker.sock:/var/run/docker.sock:ro
-    ports:
-      # lazymc-docker-proxy acts as a proxy, so there is
-      # no need to expose the server port on the Minecraft container
-      - "25565:25565"
-
-  # Standard Docker Minecraft server, also works with other server types
-  mc:
-    image: itzg/minecraft-server:java21
-    container_name: minecraft-server
-    # We need to add a label here so that lazymc-docker-proxy knows which
-    # container to manage
-    labels:
-      - lazymc.group=mc
-    tty: true
-    stdin_open: true
-    # This container should be managed solely by the lazymc container
-    # so set restart to no, or else the container will start again...
-    restart: no
-    environment:
-      EULA: "TRUE"
-    volumes:
-      - data:/data
-
-volumes:
-  data:

examples/simple-voice-chat/fabric-compose.yaml

@@ -1,21 +0,0 @@
-services:
-  mc:
-    image: itzg/minecraft-server
-    tty: true
-    stdin_open: true
-    ports:
-      # Game port
-      - "25565:25565/tcp"
-      # Voice chat port
-      - "24454:24454/udp"
-    environment:
-      EULA: "TRUE"
-      TYPE: "FABRIC"
-      VERSION: "1.21.1"
-      # This will select the latest version of simple voice chat for 1.21.1.
-      # You can specify a version by appending :versionID (e.g. simple-voice-chat:anabvqRL)
-      MODRINTH_PROJECTS: "simple-voice-chat"
-      MEMORY: 8G
-    volumes:
-      # attach the relative directory 'data' to the container's /data path
-      - ./data:/data

examples/simple-voice-chat/neoforge-compose.yaml

@@ -1,21 +0,0 @@
-services:
-  mc:
-    image: itzg/minecraft-server
-    tty: true
-    stdin_open: true
-    ports:
-      # Game port
-      - "25565:25565/tcp"
-      # Voice chat port
-      - "24454:24454/udp"
-    environment:
-      EULA: "TRUE"
-      TYPE: "NEOFORGE"
-      VERSION: "1.21.1"
-      # This will select the latest version of simple voice chat for 1.21.1.
-      # You can specify a version by appending :versionID (e.g. simple-voice-chat:anabvqRL)
-      MODRINTH_PROJECTS: "simple-voice-chat"
-      MEMORY: 8G
-    volumes:
-      # attach the relative directory 'data' to the container's /data path
-      - ./data:/data

examples/simple-voice-chat/paper-compose.yaml

@@ -1,21 +0,0 @@
-services:
-  mc:
-    image: itzg/minecraft-server
-    tty: true
-    stdin_open: true
-    ports:
-      # Game port
-      - "25565:25565/tcp"
-      # Voice chat port
-      - "24454:24454/udp"
-    environment:
-      EULA: "TRUE"
-      TYPE: "PAPER"
-      VERSION: "1.21.1"
-      # This will select the latest version of simple voice chat for 1.21.1.
-      # You can specify a version by appending :versionID (e.g. simple-voice-chat:anabvqRL)
-      MODRINTH_PROJECTS: "simple-voice-chat"
-      MEMORY: 8G
-    volumes:
-      # attach the relative directory 'data' to the container's /data path
-      - ./data:/data

files/auto/autopause-fcns.sh

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-# shellcheck source=../scripts/start-utils
-. "${SCRIPTS:-/}start-utils"
 current_uptime() {
   awk '{print $1}' /proc/uptime | cut -d . -f 1
 }
@@ -18,20 +16,14 @@ rcon_client_exists() {
   [[ -n "$(ps -ax -o comm | grep 'rcon-cli')" ]]
 }
 
-use_proxy() {
-  if isTrue "$USES_PROXY_PROTOCOL"; then
-    echo "--use-proxy"
-  fi
-}
-
 mc_server_listening() {
-  mc-monitor status $(use_proxy) --host "${SERVER_HOST:-localhost}" --port "$SERVER_PORT" --timeout 10s >&/dev/null
+  mc-monitor status --host "${SERVER_HOST:-localhost}" --port "$SERVER_PORT" --timeout 10s >& /dev/null
 }
 
 java_clients_connections() {
   local connections
-  if java_running; then
-    if ! connections=$(mc-monitor status $(use_proxy) --host "${SERVER_HOST:-localhost}" --port "$SERVER_PORT" --show-player-count); then
+  if java_running ; then
+    if ! connections=$(mc-monitor status --host "${SERVER_HOST:-localhost}" --port "$SERVER_PORT" --show-player-count); then
       # consider it a non-zero player count if the ping fails
       # otherwise a laggy server with players connected could get paused
       connections=1

files/cf-exclude-include.json

@@ -1,24 +1,22 @@
 {
   "globalExcludes": [
-    "ambience-music-mod",
     "ambientsounds",
+    "auudio-forge",
+    "ambience-music-mod",
     "appleskin",
     "armor-chroma",
     "armor-toughness-bar",
-    "auudio-forge",
     "beehivetooltips",
     "better-advancements",
+    "betterf3",
+    "betterfps",
     "better-foliage",
     "better-placement",
     "better-sprinting",
-    "better-third-person",
     "better-tips-nbt-tag",
-    "betterf3",
-    "betterfps",
+    "better-third-person",
     "biomeinfo",
     "block-drops-jei-addon",
-    "blur-forge",
-    "cartography",
     "cherished-worlds",
     "chunk-animator",
     "clickable-advancements",
@@ -29,15 +27,14 @@
     "defensive-measures",
     "ding",
     "drippy-loading-screen",
-    "dynamic-surroundings",
     "dynamiclights-reforged",
+    "dynamic-surroundings",
     "easiervillagertrading",
     "effective-forge",
     "embeddium",
     "embeddium-extension",
     "embeddium-extras",
     "enchantment-descriptions",
-    "enhancedvisuals",
     "entity-collision-fps-fix",
     "entity-texture-features-fabric",
     "entityculling",
@@ -48,49 +45,42 @@
     "fancymenu",
     "faster-ladder-climbing",
     "foamfix-optimization-mod",
-    "fps-reducer",
     "free-cam",
     "ftb-backups-2",
     "fullscreen-windowed-borderless-for-minecraft",
     "hwyla",
     "ignitioncoil",
     "inmisaddon",
-    "iris-flywheel-compat",
     "irisshaders",
+    "iris-flywheel-compat",
     "item-obliterator",
-    "itemphysic-lite",
     "itemzoom",
     "just-enough-harvestcraft",
     "just-enough-resources-jer",
-    "just-zoom",
-    "konkrete",
     "legendary-tooltips",
-    "loot-capacitor-tooltips",
     "lootbeams",
+    "loot-capacitor-tooltips",
     "magnesium-extras",
     "menumobs",
     "minecraft-rich-presence",
     "more-overlays",
     "mouse-tweaks",
     "neat",
+    "necronomicon",
     "nekos-enchanted-books",
-    "no-nv-flash",
     "no-recipe-book",
+    "no-nv-flash",
     "not-enough-animations",
     "oculus",
     "oldjavawarning",
     "overloaded-armor-bar",
     "packmodemenu",
     "reauth",
-    "reblured",
-    "reforgium",
     "resource-reloader",
     "rubidium",
     "rubidium-extra",
     "ryoamiclights",
     "schematica",
-    "seamless-loading-screen",
-    "seamless-loading-screen-forge",
     "searchables",
     "shulkerboxviewer",
     "skin-layers-3d",
@@ -98,7 +88,6 @@
     "smooth-font",
     "smoothwater",
     "sodium",
-    "sodium-rubidium-occlusion-culling-fix",
     "sound-filters",
     "sound-physics-remastered",
     "stellar-sky",

files/modrinth-exclude-include.json

@@ -1,79 +1,15 @@
 {
   "globalExcludes": [
     "3dskinlayers",
-    "ae2-emi-crafting",
-    "AmbientSounds",
-    "amecs",
-    "Animation_Overhaul",
-    "appleskin",
-    "auudio",
-    "axolotlbuckets",
-    "BadOptimizations",
-    "BetterAdvancements",
-    "betterbeds",
-    "BetterThirdPerson",
-    "BHMenu",
-    "blur",
-    "Boat-Item-View",
-    "bobby",
-    "cat_jam",
-    "chat_heads",
-    "chatanimation",
-    "cherishedworlds",
     "citresewn",
-    "clickadv",
     "connector",
-    "DisableCustomWorldsAdvice",
-    "drippyloadingscreen",
-    "eating-animation",
-    "emiffect",
-    "emitrades",
     "entity_model_features",
     "entity_texture_features",
-    "entityculling",
     "euphoriapatcher",
-    "fallingleaves",
-    "fancymenu",
-    "fast-ip-ping",
-    "FauxCustomEntityData",
-    "GeckoLibIrisCompat",
-    "gpumemleakfix",
-    "Highlighter",
-    "ImmediatelyFast",
-    "indium",
-    "iris",
-    "iris-flywheel",
-    "ItemBorders",
-    "ItemLocks",
-    "justzoom",
-    "language-reload",
-    "lazy-language-loader",
-    "LegendaryTooltips",
-    "loadmyresources",
-    "lootbeams",
-    "MindfulDarkness",
-    "MouseTweaks",
-    "nicer-skies",
     "notenoughanimations",
     "oculus",
-    "OverflowingBars",
-    "PickUpNotifier",
-    "PresenceFootsteps",
-    "Prism",
-    "reeses_sodium_options",
-    "ResourcePackOverrides",
     "ryoamiclights",
-    "Searchables",
-    "seasonhud",
-    "ShoulderSurfing",
-    "skinlayers3d",
-    "sodium",
-    "sorted_enchantments",
-    "visuality",
-    "VR-Combat",
-    "YeetusExperimentus",
-    "yungsmenutweaks",
-    "Zoomify"
+    "yungsmenutweaks"
   ],
   "globalForceIncludes": [],
   "modpacks": {}

files/property-definitions.json

@@ -1,66 +1,58 @@
 {
-  "allow-flight": {"env": "ALLOW_FLIGHT"},
-  "allow-nether": {"env": "ALLOW_NETHER"},
-  "bug-report-link": {"env": "BUG_REPORT_LINK"},
-  "announce-player-achievements": {"env": "ANNOUNCE_PLAYER_ACHIEVEMENTS"},
-  "broadcast-console-to-ops": {"env": "BROADCAST_CONSOLE_TO_OPS"},
-  "broadcast-rcon-to-ops": {"env": "BROADCAST_RCON_TO_OPS"},
-  "difficulty": {"env": "DIFFICULTY"},
-  "enable-command-block": {"env": "ENABLE_COMMAND_BLOCK"},
-  "enable-jmx-monitoring": {"env": "ENABLE_JMX"},
-  "enable-query": {"env": "ENABLE_QUERY"},
-  "enable-rcon": {"env": "ENABLE_RCON"},
-  "enable-status": {"env": "ENABLE_STATUS"},
-  "enforce-secure-profile": {"env": "ENFORCE_SECURE_PROFILE"},
-  "enforce-whitelist": {"env": "ENFORCE_WHITELIST"},
-  "entity-broadcast-range-percentage": {"env": "ENTITY_BROADCAST_RANGE_PERCENTAGE"},
-  "force-gamemode": {"env": "FORCE_GAMEMODE"},
-  "function-permission-level": {"env": "FUNCTION_PERMISSION_LEVEL"},
-  "gamemode": {"env": "MODE"},
-  "generate-structures": {"env": "GENERATE_STRUCTURES"},
-  "generator-settings": {"env": "GENERATOR_SETTINGS"},
-  "hardcore": {"env": "HARDCORE"},
-  "hide-online-players": {"env": "HIDE_ONLINE_PLAYERS"},
-  "initial-disabled-packs": {"env": "INITIAL_DISABLED_PACKS"},
-  "initial-enabled-packs": {"env": "INITIAL_ENABLED_PACKS"},
-  "level-name": {"env": "LEVEL"},
-  "level-seed": {"env": "SEED"},
-  "level-type": {"env": "LEVEL_TYPE"},
-  "log-ips": {"env": "LOG_IPS"},
-  "max-build-height": {"env": "MAX_BUILD_HEIGHT"},
-  "max-chained-neighbor-updates": {"env": "MAX_CHAINED_NEIGHBOR_UPDATES"},
-  "max-players": {"env": "MAX_PLAYERS"},
-  "max-tick-time": {"env": "MAX_TICK_TIME"},
-  "max-world-size": {"env": "MAX_WORLD_SIZE"},
   "motd": {"env": "MOTD"},
-  "network-compression-threshold": {"env": "NETWORK_COMPRESSION_THRESHOLD"},
-  "online-mode": {"env": "ONLINE_MODE"},
-  "op-permission-level": {"env": "OP_PERMISSION_LEVEL"},
-  "pause-when-empty-seconds": {"env": "PAUSE_WHEN_EMPTY_SECONDS"},
-  "player-idle-timeout": {"env": "PLAYER_IDLE_TIMEOUT"},
-  "prevent-proxy-connections": {"env": "PREVENT_PROXY_CONNECTIONS"},
-  "previews-chat": {"env": "PREVIEWS_CHAT"},
-  "pvp": {"env": "PVP"},
-  "query.port": {"env": "QUERY_PORT"},
-  "rcon.password": {"env": "RCON_PASSWORD"},
-  "rcon.port": {"env": "RCON_PORT"},
-  "region-file-compression": {"env": "REGION_FILE_COMPRESSION"},
-  "resource-pack": {"env": "RESOURCE_PACK"},
-  "resource-pack-id": {"env": "RESOURCE_PACK_ID"},
-  "resource-pack-prompt": {"env": "RESOURCE_PACK_PROMPT"},
-  "resource-pack-sha1": {"env": "RESOURCE_PACK_SHA1"},
-  "require-resource-pack": {"env": "RESOURCE_PACK_ENFORCE"},
-  "server-ip": {"env": "SERVER_IP"},
+  "gamemode": {"env": "MODE"},
+  "difficulty": {"env": "DIFFICULTY"},
+  "white-list": {"env": "WHITELIST_PROP"},
+  "enforce-whitelist": {"env": "ENFORCE_WHITELIST"},
+  "level-type": {"env": "LEVEL_TYPE"},
   "server-name": {"env": "SERVER_NAME"},
+  "server-ip": {"env": "SERVER_IP"},
   "server-port": {"env": "SERVER_PORT"},
-  "simulation-distance": {"env": "SIMULATION_DISTANCE"},
-  "snooper-enabled": {"env": "SNOOPER_ENABLED"},
+  "allow-nether": {"env": "ALLOW_NETHER"},
+  "announce-player-achievements": {"env": "ANNOUNCE_PLAYER_ACHIEVEMENTS"},
+  "enable-command-block": {"env": "ENABLE_COMMAND_BLOCK"},
   "spawn-animals": {"env": "SPAWN_ANIMALS"},
   "spawn-monsters": {"env": "SPAWN_MONSTERS"},
   "spawn-npcs": {"env": "SPAWN_NPCS"},
   "spawn-protection": {"env": "SPAWN_PROTECTION"},
-  "sync-chunk-writes": {"env": "SYNC_CHUNK_WRITES"},
-  "use-native-transport": {"env": "USE_NATIVE_TRANSPORT"},
+  "generate-structures": {"env": "GENERATE_STRUCTURES"},
   "view-distance": {"env": "VIEW_DISTANCE"},
-  "white-list": {"env": "WHITELIST_PROP"}
+  "hardcore": {"env": "HARDCORE"},
+  "snooper-enabled": {"env": "SNOOPER_ENABLED"},
+  "max-build-height": {"env": "MAX_BUILD_HEIGHT"},
+  "force-gamemode": {"env": "FORCE_GAMEMODE"},
+  "max-tick-time": {"env": "MAX_TICK_TIME"},
+  "enable-query": {"env": "ENABLE_QUERY"},
+  "query.port": {"env": "QUERY_PORT"},
+  "enable-rcon": {"env": "ENABLE_RCON"},
+  "rcon.password": {"env": "RCON_PASSWORD"},
+  "rcon.port": {"env": "RCON_PORT"},
+  "max-players": {"env": "MAX_PLAYERS"},
+  "max-world-size": {"env": "MAX_WORLD_SIZE"},
+  "level-name": {"env": "LEVEL"},
+  "level-seed": {"env": "SEED"},
+  "pvp": {"env": "PVP"},
+  "generator-settings": {"env": "GENERATOR_SETTINGS"},
+  "online-mode": {"env": "ONLINE_MODE"},
+  "allow-flight": {"env": "ALLOW_FLIGHT"},
+  "resource-pack": {"env": "RESOURCE_PACK"},
+  "resource-pack-sha1": {"env": "RESOURCE_PACK_SHA1"},
+  "require-resource-pack": {"env": "RESOURCE_PACK_ENFORCE"},
+  "player-idle-timeout": {"env": "PLAYER_IDLE_TIMEOUT"},
+  "broadcast-console-to-ops": {"env": "BROADCAST_CONSOLE_TO_OPS"},
+  "broadcast-rcon-to-ops": {"env": "BROADCAST_RCON_TO_OPS"},
+  "enable-jmx-monitoring": {"env": "ENABLE_JMX"},
+  "sync-chunk-writes": {"env": "SYNC_CHUNK_WRITES"},
+  "enable-status": {"env": "ENABLE_STATUS"},
+  "entity-broadcast-range-percentage": {"env": "ENTITY_BROADCAST_RANGE_PERCENTAGE"},
+  "function-permission-level": {"env": "FUNCTION_PERMISSION_LEVEL"},
+  "network-compression-threshold": {"env": "NETWORK_COMPRESSION_THRESHOLD"},
+  "op-permission-level": {"env": "OP_PERMISSION_LEVEL"},
+  "prevent-proxy-connections": {"env": "PREVENT_PROXY_CONNECTIONS"},
+  "use-native-transport": {"env": "USE_NATIVE_TRANSPORT"},
+  "simulation-distance": {"env": "SIMULATION_DISTANCE"},
+  "previews-chat": {"env": "PREVIEWS_CHAT"},
+  "enforce-secure-profile": {"env": "ENFORCE_SECURE_PROFILE"},
+  "initial-enabled-packs": {"env": "INITIAL_ENABLED_PACKS"},
+  "initial-disabled-packs": {"env": "INITIAL_DISABLED_PACKS"}
 }

kustomize/README.md

@@ -13,24 +13,10 @@ configMapGenerator:
   - name: mc
     envs:
       - mc.env
-patches:
-  # Example of using a patch to set external service name for mc-router to pick up
-  - path: set-external-servername.yml
 ```
 
 ### mc.env
 ```
 EULA=true
 TYPE=FORGE
-```
-
-###
-
-```yaml
-apiVersion: v1
-kind: Service
-metadata:
-  name: mc
-  annotations:
-    mc-router.itzg.me/externalServerName: forge.example.com
 ```

scripts/start-deployFolia

@@ -1,12 +1,5 @@
 #!/bin/bash
 
-: "${FOLIA_CHANNEL:=experimental}"
-
-# shellcheck source=start-utils
-. "${SCRIPTS:-/}start-utils"
-set -o pipefail
-handleDebugMode
-
 if [[ $FOLIA_DOWNLOAD_URL ]]; then
   export PAPER_DOWNLOAD_URL="$FOLIA_DOWNLOAD_URL"
 fi
@@ -15,7 +8,4 @@ if [[ $FOLIABUILD ]]; then
   export PAPERBUILD="$FOLIABUILD"
 fi
 
-PAPER_PROJECT="folia" \
-PAPER_NAME="FoliaMC" \
-PAPER_CHANNEL="${FOLIA_CHANNEL}" \
-  exec "${SCRIPTS:-/}start-deployPaper" "$@"
+PAPER_PROJECT="folia" PAPER_NAME="FoliaMC" exec "${SCRIPTS:-/}start-deployPaper" "$@"

scripts/start-deployPaper

@@ -52,12 +52,6 @@ else
 
 fi
 
-# Download default configs to allow for consistent patching
-for c in paper-global.yml paper-world-defaults.yml spigot.yml; do
-  DOWNLOAD_DEFAULT_CONFIGS+=",${PAPER_CONFIG_DEFAULTS_REPO}/${VERSION}/$c"
-done
-export DOWNLOAD_DEFAULT_CONFIGS
-
 # Normalize on Spigot for downstream operations
 export FAMILY=SPIGOT
 

scripts/start-finalExec

@@ -64,9 +64,6 @@ patchLog4jConfig() {
   canUseRollingLogs=false
 }
 
-# Temporarily disable debugging output
-oldState=$(shopt -po xtrace || true)
-shopt -u -o xtrace
 # Patch Log4j remote code execution vulnerability
 # See https://www.minecraft.net/en-us/article/important-message--security-vulnerability-java-edition
 if versionLessThan 1.7; then
@@ -83,7 +80,6 @@ elif isType PURPUR && versionLessThan 1.18.1; then
 elif versionLessThan 1.18.1; then
   useFallbackJvmFlag=true
 fi
-eval "$oldState"
 
 if ${useFallbackJvmFlag}; then
   JVM_OPTS="-Dlog4j2.formatMsgNoLookups=true ${JVM_OPTS}"
@@ -231,12 +227,6 @@ MC_HEALTH_EXTRA_ARGS=(
   --use-server-list-ping
 )
   " > /data/.mc-health.env
-elif isTrue "$USES_PROXY_PROTOCOL"; then
-  echo "
-MC_HEALTH_EXTRA_ARGS=(
-  --use-proxy
-)
-  " > /data/.mc-health.env
 else
   rm -f /data/.mc-health.env
 fi

scripts/start-setupEnvVariables

@@ -4,7 +4,6 @@
 . "${SCRIPTS:-/}start-utils"
 
 set -e
-handleDebugMode
 
 : "${REPLACE_ENV_IN_PLACE:=${REPLACE_ENV_VARIABLES:-false}}"
 : "${REPLACE_ENV_PATHS:=/data}"
@@ -14,7 +13,6 @@ handleDebugMode
 : "${REPLACE_ENV_VARIABLES_EXCLUDE_PATHS:=}"
 : "${PATCH_DEFINITIONS:=}"
 : "${DEBUG:=false}"
-: "${DOWNLOAD_DEFAULT_CONFIGS:=}"
 
 if isTrue "${REPLACE_ENV_IN_PLACE}"; then
   log "Replacing env variables in ${REPLACE_ENV_PATHS} that match the prefix '$REPLACE_ENV_VARIABLE_PREFIX' ..."
@@ -27,16 +25,6 @@ if isTrue "${REPLACE_ENV_IN_PLACE}"; then
     "${REPLACE_ENV_PATHS[@]}"
 fi
 
-if [[ $DOWNLOAD_DEFAULT_CONFIGS ]]; then
-  log "Downloading default configs, if needed"
-  if ! mc-image-helper mcopy \
-    --to /data/config \
-    --skip-existing --skip-up-to-date=false \
-    "$DOWNLOAD_DEFAULT_CONFIGS" 2> /dev/null; then
-    log "WARN: one or more default config files were not available from $DOWNLOAD_DEFAULT_CONFIGS"
-  fi
-fi
-
 if [[ ${PATCH_DEFINITIONS} ]]; then
   log "Applying patch definitions from ${PATCH_DEFINITIONS}"
   mc-image-helper patch \

scripts/start-setupRbac

@@ -2,8 +2,8 @@
 set -euo pipefail
 IFS=$'\n\t'
 
-: "${EXISTING_OPS_FILE:=SYNC_FILE_MERGE_LIST}"
-: "${EXISTING_WHITELIST_FILE:=SYNC_FILE_MERGE_LIST}"
+: "${EXISTING_OPS_FILE:=SKIP}"
+: "${EXISTING_WHITELIST_FILE:=SKIP}"
 
 # shellcheck source=start-utils
 . "${SCRIPTS:-/}start-utils"

scripts/start-utils

@@ -161,121 +161,11 @@ function normalizeMemSize() {
   echo $((val * scale))
 }
 
-function compare_version() {
-    local left_version=$1
-    local comparison=$2
-    local right_version=$3
-
-    if [[ -z "$left_version" ]]; then
-        echo "Left version is required"
-        return 1
-    fi
-
-    if [[ -z "$right_version" ]]; then
-        echo "Right version is required"
-        return 1
-    fi
-
-    # Handle version channels ('a', 'b', or numeric)
-    if [[ $left_version == a* || $left_version == b* ]]; then
-        left_version=${left_version:1}
-    fi
-    
-    if [[ $right_version == a* || $right_version == b* ]]; then
-        right_version=${right_version:1}
-    fi
-
-
-    local left_version_channel=${left_version:0:1}
-    if [[ $left_version_channel =~ [0-9] ]]; then
-        left_version_channel='r'
-    fi
-
-    local right_version_channel=${right_version:0:1}
-    if [[ $right_version_channel =~ [0-9] ]]; then
-        right_version_channel='r'
-    fi
-
-    if [[ $comparison == "lt" && $left_version_channel < $right_version_channel ]]; then
-        return 0
-    elif [[ $comparison == "lt" && $left_version_channel > $right_version_channel ]]; then
-        return 1
-    elif [[ $comparison == "gt" && $left_version_channel > $right_version_channel ]]; then
-        return 0
-    elif [[ $comparison == "gt" && $left_version_channel < $right_version_channel ]]; then
-        return 1
-    elif [[ $comparison == "le" && $left_version_channel < $right_version_channel ]]; then
-        return 0
-    elif [[ $comparison == "le" && $left_version_channel == $right_version_channel ]]; then
-        return 0
-    elif [[ $comparison == "ge" && $left_version_channel > $right_version_channel ]]; then
-        return 0
-    elif [[ $comparison == "ge" && $left_version_channel == $right_version_channel ]]; then
-        return 0
-    elif [[ $comparison == "eq" && $left_version_channel == $right_version_channel ]]; then
-        return 0
-    fi
-
-    # Compare the versions using sort -V
-    local result
-
-    case $comparison in
-        "lt")
-            if [[ $(echo -e "$left_version\n$right_version" | sort -V | head -n1) == "$left_version" && "$left_version" != "$right_version" ]]; then
-                result=0
-            else
-                result=1
-            fi
-            ;;
-        "le")
-            if [[ $(echo -e "$left_version\n$right_version" | sort -V | head -n1) == "$left_version" ]]; then
-                result=0
-            else
-                result=1
-            fi
-            ;;
-        "eq")
-            if [[ "$left_version" == "$right_version" ]]; then
-                result=0
-            else
-                result=1
-            fi
-            ;;
-        "ge")
-            if [[ $(echo -e "$left_version\n$right_version" | sort -V | tail -n1) == "$left_version" ]]; then
-                result=0
-            else
-                result=1
-            fi
-            ;;
-        "gt")
-            if [[ $(echo -e "$left_version\n$right_version" | sort -V | tail -n1) == "$left_version" && "$left_version" != "$right_version" ]]; then
-                result=0
-            else
-                result=1
-            fi
-            ;;
-        *)
-            echo "Unsupported comparison operator: $comparison"
-            return 1
-            ;;
-    esac
-
-    return $result
-}
-
 function versionLessThan() {
-  local oldState
-  # The  return  status  when listing options is zero if all optnames are enabled, non- zero otherwise.
-  oldState=$(shopt -po xtrace || true)
-  shopt -u -o xtrace
-
   # Use if-else since strict mode might be enabled
-  if compare_version "${VERSION}" "lt" "${1?}"; then
-    eval "$oldState"
+  if mc-image-helper compare-versions "${VERSION}" lt "${1?}"; then
     return 0
   else
-    eval "$oldState"
     return 1
   fi
 }
@@ -452,7 +342,7 @@ function ensureRemoveAllModsOff() {
   reason=${1?}
 
   if isTrue "${REMOVE_OLD_MODS:-false}"; then
-    log "WARNING using REMOVE_OLD_MODS interferes with $reason -- it is now disabled"
+    log "WARNING using REMOVE_OLDS_MODS interferes with $reason -- it is now disabled"
     REMOVE_OLD_MODS=false
   fi
 }