From b1e6604093a99c597988161c3974fdf23c1b628d Mon Sep 17 00:00:00 2001
From: Kris Lamoureux <kris@lamoureux.io>
Date: Sun, 26 May 2024 23:07:25 -0400
Subject: [PATCH] Default bStats configuration to false (opt-in)

- Pre-create bStats config with `enabled: false` by default
- Apply changes to CraftBukkit, Spigot, and Paper Dockerfiles
- Consistent with existing implementation in Velocity proxy image
---
 dockerfiles/Dockerfile.bukkit | 11 ++++++++++-
 dockerfiles/Dockerfile.paper  | 11 ++++++++++-
 entrypoint.sh                 |  2 +-
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/dockerfiles/Dockerfile.bukkit b/dockerfiles/Dockerfile.bukkit
index 4954d29..f303739 100644
--- a/dockerfiles/Dockerfile.bukkit
+++ b/dockerfiles/Dockerfile.bukkit
@@ -14,6 +14,10 @@ ARG PREFIX="PLUGIN_"
 ARG BASE_URL="https://hub.spigotmc.org/jenkins/job/BuildTools/"
 ARG ARTIFACT_PATH="lastSuccessfulBuild/artifact/target/BuildTools.jar"
 
+# Consider turning bStats (https://bStats.org) on but I'm turning it off by
+# default because it collects information
+ARG BSTATS_ENABLED=false
+
 # Build in common container location
 WORKDIR /build
 
@@ -108,7 +112,12 @@ COPY --from=build /build/server.jar /app/server.jar
 COPY --from=build /plugins/ /app/plugins/
 
 # Generate initial settings
-RUN java -jar server.jar --initSettings --nogui
+RUN java -jar server.jar --initSettings --nogui && \
+  # Disable bStats by default
+  if [ "$BSTATS_ENABLED" = "false" ]; then \
+    mkdir -p /app/plugins/bStats/ && \
+    echo "enabled: false" > /app/plugins/bStats/config.yml; \
+  fi
 
 # Back to root to copy the entrypoint in
 USER root
diff --git a/dockerfiles/Dockerfile.paper b/dockerfiles/Dockerfile.paper
index 6887780..b607b8b 100644
--- a/dockerfiles/Dockerfile.paper
+++ b/dockerfiles/Dockerfile.paper
@@ -9,6 +9,10 @@ ARG PREFIX="PLUGIN_"
 # PaperMC base URL
 ARG BASE_URL="https://api.papermc.io/v2/projects/paper/versions/${VERSION}"
 
+# Consider turning bStats (https://bStats.org) on but I'm turning it off by
+# default because it collects information
+ARG BSTATS_ENABLED=false
+
 # Download files
 USER root
 WORKDIR /app
@@ -95,7 +99,12 @@ RUN set -eux && \
 # Generate initial settings
 USER minecraft
 WORKDIR /app
-RUN java -jar server.jar --initSettings --nogui
+RUN java -jar server.jar --initSettings --nogui && \
+  # Disable bStats by default
+  if [ "$BSTATS_ENABLED" = "false" ]; then \
+    mkdir -p /app/plugins/bStats/ && \
+    echo "enabled: false" > /app/plugins/bStats/config.yml; \
+  fi
 
 # Back to root to copy the entrypoint in
 USER root
diff --git a/entrypoint.sh b/entrypoint.sh
index 7141d47..bd93773 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-set -eux
+set -eu
 
 # Set eula value in eula.txt
 set_eula() {