Allow overriding server.properties (re. # 327) (#353)

OASIS-learn-study · Apr 13, 2022 · 3c65975 · 3c65975
1 parent ce4c730
commit 3c65975
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -14,7 +14,9 @@ COPY minecraft-server/* /data-init/
 
 ENV EULA=TRUE
 ENV TYPE=SPONGEVANILLA
-ENV SKIP_SERVER_PROPERTIES=true
+ENV OVERRIDE_SERVER_PROPERTIES=true
+ENV ENABLE_RCON=false
+ENV MOTD="\u00A7a\u00A7l/make\u00A7r your \u00A7bown\u00A7r Plugins/Mods, \u00A7l\u00A76with Scratch\!"
 EXPOSE 25565 25575 7070 8080
 ENTRYPOINT [ "/data-init/start-custom" ]
 

diff --git a/Dockerfile-local b/Dockerfile-local
@@ -10,7 +10,9 @@ COPY minecraft-server/* /data-init/
 
 ENV EULA=TRUE
 ENV TYPE=SPONGEVANILLA
-ENV SKIP_SERVER_PROPERTIES=true
+ENV OVERRIDE_SERVER_PROPERTIES=true
+ENV ENABLE_RCON=false
+ENV MOTD="\u00A7a\u00A7l/make\u00A7r your \u00A7bown\u00A7r Plugins/Mods, \u00A7l\u00A76with Scratch\!"
 EXPOSE 25565 25575 7070 8080
 ENTRYPOINT [ "/data-init/start-custom" ]
 

diff --git a/minecraft-server/server.properties b/minecraft-server/server.properties
@@ -45,5 +45,3 @@ level-seed=
 prevent-proxy-connections=false
 use-native-transport=true
 enable-jmx-monitoring=false
-enable-rcon=true
-motd=\u00A7a\u00A7l/make\u00A7r your \u00A7bown\u00A7r Plugins/Mods, \u00A7l\u00A76with Scratch\!
diff --git a/test b/test
@@ -4,10 +4,14 @@ set -euox pipefail
 # https://github.com/OASIS-learn-study/minecraft-storeys-maker#build-it
 ./gradlew build
 podman build -f Dockerfile-local -t minecraft-storeys-maker .
-podman run -it --rm --name storeys -e OPS=73551f35-7acb-45c0-bc65-8083c53eec69,fb79c1a9-72bd-34dc-9775-c2ac868d7ccf \
+podman run -it --rm --name storeys \
+    -e OPS=73551f35-7acb-45c0-bc65-8083c53eec69,fb79c1a9-72bd-34dc-9775-c2ac868d7ccf \
     -v $PWD/minecraft-server-test-data:/data:Z -e UID=0 -e GID=0 \
     -p 25565:25565 -p 8080:8080 -p 7070:7070 minecraft-storeys-maker
 
+# TODO for PR #348 with mineflayer: -e ONLINE_MODE=FALSE \
+# BUT this requires LuckPerms integration first (because OPS won't work anymore, nor Mineflayer)
+
 # The `OPS` with your Minecraft ID is required because the command requires permission;
 # alternatively [use permissions](https://github.com/OASIS-learn-study/minecraft-storeys-maker/issues/276).