mention the merge conflict that happens every single time

This commit is contained in:
Erik Stambaugh 2024-02-14 17:16:50 -08:00
parent f907efc290
commit 9d2628a46b

View file

@ -37,6 +37,7 @@ Now it's time to update the live server
* cd /srv/mastodon
* DOUBLE CHECK THE DOCKER COMPOSE FILE! Upstream might have given a public image name and we don't want that
* git pull
* resolve the merge conflicts: don't let upstream change docker-compose.yml to use official images!
* ## CHECK THE DISK SPACE!!! need plenty of disk free (20%?) on `/` otherwise it will fall on its face
* low hanging disk fruit: go around doing `docker compose up -d --force-recreate` in various non-mastodon places to
purge some logs and other shit