Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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" ]

Expand Down
4 changes: 3 additions & 1 deletion Dockerfile-local
Original file line number Diff line number Diff line change
Expand Up @@ -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" ]

Expand Down
2 changes: 0 additions & 2 deletions minecraft-server/server.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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\!
6 changes: 5 additions & 1 deletion test
Original file line number Diff line number Diff line change
Expand Up @@ -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).

Expand Down