teh/mastodon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 11

Update update

Browse source
This commit is contained in:
Erik Stambaugh 2025-09-25 09:50:19 -07:00
parent 0626248efe
commit 52437fbc96
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
UPDATE.md
View file

@ -25,7 +25,7 @@ Merge from the server into deploy
* cd ../mastodon-deploy
* git pull # grab any updates from the first step
* git remote add localupstream ../mastodon-deploy ## only if we started fresh otherwise it's still here
* git remote add localupstream ../mastodon-upstream ## only if we started fresh otherwise it's still here
* git fetch localupstream
* git merge localupstream/4XX ## branch name from previous step
* git push
@ -46,7 +46,11 @@ Now it's time to update the live server
* ## DOUBLE CHECK THE RELEASE INSTRUCTIONS FOR SPECIAL STEPS
* <https://github.com/mastodon/mastodon/releases>
* docker compose build
* it might be necessary to do `docker-compose build --pull --no-cache` if compose is being too aggressive with old images
* docker compose up -d
* don't forget to restart nginx!
* cd /srv/nginx
* docker compose up -d --force-recreate
Once satisfied, do some cleanup