mention the merge conflict that happens every single time
This commit is contained in:
parent
f907efc290
commit
9d2628a46b
1 changed files with 1 additions and 0 deletions
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue