Skip to content

Commit

Permalink
fix: updated other usages of docker-compose.
Browse files Browse the repository at this point in the history
Standarize to the use of the docker compose plugin.
  • Loading branch information
ronoaldo committed Aug 25, 2024
1 parent db43f97 commit 99f6529
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 19 deletions.
28 changes: 14 additions & 14 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# Mercurio server build/management tool

INTERACTIVE=true
TEST_ARGS=--env-file /tmp/.env.test -f docker-compose.yml -f docker-compose.auto.yml
TEST_ARGS=--env-file /tmp/.env.test -f docker compose.yml -f docker compose.auto.yml
TEST_ENV= -e MERCURIO_AUTO_SHUTDOWN=true -e NO_LOOP=true

all: build

build:
docker-compose build
docker compose build

.minetest/world:
mkdir -p .minetest/world
Expand Down Expand Up @@ -35,42 +35,42 @@ rm-submodule:
git commit

test: volumes submodules
docker-compose down
docker-compose build --no-cache game
docker compose down
docker compose build --no-cache game
sed -e 's/AUTO_SHUTDOWN=.*/AUTO_SHUTDOWN=true/g' .env.sample > /tmp/.env.test
docker-compose $(TEST_ARGS) run -d db && sleep 5
docker-compose $(TEST_ARGS) run --user 0 -T game bash -c 'chown -R minetest:minetest /var/lib/mercurio /var/logs/minetest'
docker-compose $(TEST_ARGS) run $(TEST_ENV) game
docker-compose down
docker compose $(TEST_ARGS) run -d db && sleep 5
docker compose $(TEST_ARGS) run --user 0 -T game bash -c 'chown -R minetest:minetest /var/lib/mercurio /var/logs/minetest'
docker compose $(TEST_ARGS) run $(TEST_ENV) game
docker compose down
@echo ; echo "Mods not loaded by the server: "
grep "load.*false" /tmp/minetest/world/world.mt || true

run: volumes submodules
docker-compose down && docker-compose up --build --detach
docker compose down && docker compose up --build --detach
@echo "Server is running in background"
if [ x"$(INTERACTIVE)" = x"true" ] ; then docker-compose logs -f ; fi
if [ x"$(INTERACTIVE)" = x"true" ] ; then docker compose logs -f ; fi

run-client:
minetest --address jupiter.ronoaldo.dev.br --port 30000 \
--name ronoaldo --password-file ~/.config/mercurio-dev.pwd \
--go

stop:
docker-compose down || true
docker compose down || true

backup:
./scripts/backup.sh

shell:
docker-compose exec --user 0 game bash
docker compose exec --user 0 game bash

update:
git pull
git submodule init
git submodule update --init --recursive
docker pull ghcr.io/ronoaldo/mercurio:main
docker-compose pull
docker-compose up -d
docker compose pull
docker compose up -d

fix-perms:
sudo chown -R 30000:$$(id -g) .minetest/world .minetest/logs
Expand Down
3 changes: 1 addition & 2 deletions docker-compose.auto.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# Use this file in order to run a local/dev copy of the server.
# Rename it to docker-compose.override.yml
version: "3.3"
services:
db:
restart: "no"
Expand All @@ -25,4 +24,4 @@ services:
deploy:
resources:
limits:
memory: 3G
memory: 3G
3 changes: 1 addition & 2 deletions docker-compose.dev.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# Use this file in order to run a local/dev copy of the server.
# Rename it to docker-compose.override.yml
version: "3.3"
services:
db:
restart: "no"
Expand All @@ -15,4 +14,4 @@ services:
- "30000:30000/udp"
- "30000:30000/tcp"
mapserver:
restart: "no"
restart: "no"
1 change: 0 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: "3.3"
services:
game:
image: ghcr.io/ronoaldo/mercurio:main
Expand Down

0 comments on commit 99f6529

Please sign in to comment.