amorfo77/docker-minecraft-server
1
0
Fork 0
mirror of https://github.com/itzg/docker-minecraft-server.git synced 2026-02-17 07:03:57 +00:00
Code Issues Projects Releases Wiki Activity

Remove all use of sudoers file (#3477)

Browse Source
This commit is contained in:
Geoff Bourne
2025-06-01 10:04:37 -05:00
committed by GitHub
parent 3616847e8e
commit 85648d5916
5 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@@ -19,8 +19,6 @@ RUN --mount=target=/build,source=build \
RUN --mount=target=/build,source=build \ RUN --mount=target=/build,source=build \
/build/run.sh setup-user /build/run.sh setup-user
COPY --chmod=644 files/sudoers* /etc/sudoers.d
EXPOSE 25565 EXPOSE 25565
ARG APPS_REV=1 ARG APPS_REV=1

5
bin/mc-send-to-console
View File

@@ -17,8 +17,9 @@ if [ ! -p "${CONSOLE_IN_NAMED_PIPE}" ]; then
exit 1 exit 1
fi fi
if [ "$(id -u)" = 0 -a $UID != 0 ]; then if [[ "$(id -u)" = 0 ]] && [[ $UID != 0 ]]; then
exec $(getSudoFromDistro) minecraft bash -c "echo '$*' > '${CONSOLE_IN_NAMED_PIPE}'" error "Exec needs to be run with user ID $UID"
exit 2
else else
echo "$@" >"${CONSOLE_IN_NAMED_PIPE}" echo "$@" >"${CONSOLE_IN_NAMED_PIPE}"
fi fi

2
docs/commands.md
View File

@@ -24,7 +24,7 @@ _The `-i` is not needed in this case._
If rcon is disabled you can send commands by passing them as arguments to the packaged `mc-send-to-console` script after setting the env var `CREATE_CONSOLE_IN_PIPE` to "true". For example, a player can be op'ed in the container `mc` with: If rcon is disabled you can send commands by passing them as arguments to the packaged `mc-send-to-console` script after setting the env var `CREATE_CONSOLE_IN_PIPE` to "true". For example, a player can be op'ed in the container `mc` with:
```shell ```shell
docker exec mc mc-send-to-console op player docker exec --user 1000 mc mc-send-to-console op player
| | | |
+- container name +- Minecraft commands start here +- container name +- Minecraft commands start here
``` ```

7
files/auto/stop.sh
View File

@@ -6,8 +6,5 @@ if isTrue "${DEBUG_AUTOSTOP}"; then
fi fi
logAutostopAction "Stopping Java process" logAutostopAction "Stopping Java process"
if isTrue "${AUTOSTOP_PKILL_USE_SUDO:-false}"; then pkill -f --signal SIGTERM mc-server-runner
sudo pkill -f --signal SIGTERM mc-server-runner
else
pkill -f --signal SIGTERM mc-server-runner
fi

1
files/sudoers-mc
View File

@@ -1 +0,0 @@
minecraft ALL=(ALL) NOPASSWD:/usr/bin/pkill