Skip to content

Commit d89170c

Browse files
authored
Simplify and fix docker test
1 parent 9bd1f24 commit d89170c

File tree

2 files changed

+3
-10
lines changed

2 files changed

+3
-10
lines changed

utils/test/run.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ trap 'rm -rf "$world" || :' EXIT
44

55
[ -f game.conf ] || { echo "Must be run in game root folder." >&2; exit 1; }
66

7-
cp -v utils/test/world.mt "$world/"
8-
chmod -R a+rwX "$world" # needed because server runs as unprivileged user inside container
7+
chmod -R 777 "$world" # container uses unprivileged user inside
98

109
vol=(
1110
-v "$PWD/utils/test/minetest.conf":/etc/minetest/minetest.conf
@@ -14,6 +13,7 @@ vol=(
1413
-v "$world":/var/lib/minetest/.minetest/world
1514
)
1615
[ -z "$DOCKER_IMAGE" ] && DOCKER_IMAGE="ghcr.io/minetest/minetest:master"
17-
docker run --rm -i "${vol[@]}" "$DOCKER_IMAGE"
16+
docker run --rm -i "${vol[@]}" "$DOCKER_IMAGE" --config /etc/minetest/minetest.conf --gameid minetest
1817

18+
test -f "$world/map.sqlite" || exit 1
1919
exit 0

utils/test/world.mt

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)