nev/minecraft-backup
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #30 from rainbowdashlabs/feature/docker-minecraft-support

Browse source 
Feature/docker minecraft support
This commit is contained in:
Nicolas Chan 2024-08-11 01:50:04 -07:00 • committed by GitHub
commit 2428e9e940
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
README.md
View file

@ -44,6 +44,9 @@ docker run \
-v /home/user/server/world:/mnt/server \ -v /home/user/server/world:/mnt/server \
-v /mnt/storage/backups:/mnt/backups \ -v /mnt/storage/backups:/mnt/backups \
ghcr.io/nicolaschan/minecraft-backup -c -i /mnt/server -o /mnt/backups -s server-host:25575:secret -w rcon ghcr.io/nicolaschan/minecraft-backup -c -i /mnt/server -o /mnt/backups -s server-host:25575:secret -w rcon
# Using itzg/docker-minecraft-server container and rcon cli
./backup.sh -c -i /home/user/server/world -o /mnt/storage/backups -s container-name -w docker-rcon
``` ```
This will show chat messages (`-c`) and save a backup of `/home/user/server/world` into `/mnt/storage/backups` using the default thinning deletion policy for old backups. This will show chat messages (`-c`) and save a backup of `/home/user/server/world` into `/mnt/storage/backups` using the default thinning deletion policy for old backups.
@ -64,7 +67,7 @@ Command line options:
-p Prefix that shows in Minecraft chat (default: Backup) -p Prefix that shows in Minecraft chat (default: Backup)
-q Suppress warnings -q Suppress warnings
-r Restic repo name (if using restic) -r Restic repo name (if using restic)
-s Screen name, tmux session name, or hostname:port:password for RCON -s Screen name, tmux session name, hostname:port:password for RCON or [container name](https://github.com/itzg/docker-minecraft-server) for docker-rcon
-t Enable lock file (lock file not used by default) -t Enable lock file (lock file not used by default)
-u Lock file timeout seconds (empty = unlimited) -u Lock file timeout seconds (empty = unlimited)
-v Verbose mode -v Verbose mode

2
backup.sh
View file

@ -266,6 +266,8 @@ execute-command () {
;; ;;
"RCON"|"rcon") rcon-command "$SCREEN_NAME" "$COMMAND" "RCON"|"rcon") rcon-command "$SCREEN_NAME" "$COMMAND"
;; ;;
"docker-rcon") docker exec "$SCREEN_NAME" rcon-cli "$COMMAND"
;;
esac esac
fi fi
} }

14
test/test.sh
View file

@ -379,6 +379,20 @@ test-rcon-interface-not-running () {
assertContains "$OUTPUT" "Could not connect" assertContains "$OUTPUT" "Could not connect"
} }
test-docker-rcon () {
CONTAINER="$(docker run -d -e EULA=TRUE docker.io/itzg/minecraft-server)"
while ! docker exec "$CONTAINER" grep 'RCON running on 0.0.0.0:25575' /data/logs/latest.log; do
sleep 0.1
done
TIMESTAMP="$(date +%F_%H-%M-%S --date="2021-01-01")"
./backup.sh -w docker-rcon -i "$TEST_TMP/server/world" -o "$TEST_TMP/backups" -s "$CONTAINER" -f "$TIMESTAMP"
OUTPUT="$(docker exec "$CONTAINER" cat /data/logs/latest.log)"
docker rm -f "$CONTAINER"
assertContains "$OUTPUT" "[Rcon: Automatic saving is now disabled]"
assertContains "$OUTPUT" "[Rcon: Automatic saving is now enabled]"
assertContains "$OUTPUT" "[Rcon: Saved the game]"
}
test-sequential-delete () { test-sequential-delete () {
for i in $(seq 0 20); do for i in $(seq 0 20); do
TIMESTAMP="$(date +%F_%H-%M-%S --date="2021-01-01 +$i hour")" TIMESTAMP="$(date +%F_%H-%M-%S --date="2021-01-01 +$i hour")"