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

Update docker compose and update instructions

Browse source
This commit is contained in:
Erik Stambaugh 2025-10-25 16:33:27 -07:00
parent 3c1ae4d105
commit a82011fd90
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
UPDATE.md
View file

@ -28,6 +28,8 @@ Merge from the server into deploy
* git remote add localupstream ../mastodon-upstream ## 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 fetch localupstream
* git merge localupstream/4XX ## branch name from previous step * git merge localupstream/4XX ## branch name from previous step
* if there are a lot of conflicts:
git merge -X theirs localupstream/4XX ## this will clobber local changes! Beware!
* git push * git push

15
docker-compose.yml
View file

@ -63,8 +63,9 @@ services:
mastodon_web: mastodon_web:
container_name: mastodon_web container_name: mastodon_web
# You can uncomment the following line if you want to not use the prebuilt image, for example if you have local code changes # You can uncomment the following line if you want to not use the prebuilt image, for example if you have local code changes
# build: . build: .
image: ghcr.io/mastodon/mastodon:v4.4.8 #image: ghcr.io/mastodon/mastodon:v4.4.8
image: teh_mastodon
restart: always restart: always
env_file: .env.production env_file: .env.production
command: bundle exec puma -C config/puma.rb command: bundle exec puma -C config/puma.rb
@ -86,10 +87,11 @@ services:
mastodon_streaming: mastodon_streaming:
container_name: mastodon_streaming container_name: mastodon_streaming
# You can uncomment the following lines if you want to not use the prebuilt image, for example if you have local code changes # You can uncomment the following lines if you want to not use the prebuilt image, for example if you have local code changes
# build: build:
# dockerfile: ./streaming/Dockerfile # dockerfile: ./streaming/Dockerfile
# context: . # context: .
image: ghcr.io/mastodon/mastodon-streaming:v4.4.8 #image: ghcr.io/mastodon/mastodon-streaming:v4.4.8
image: teh_mastodon_streaming
restart: always restart: always
env_file: .env.production env_file: .env.production
command: node ./streaming/index.js command: node ./streaming/index.js
@ -107,8 +109,9 @@ services:
sidekiq: sidekiq:
# You can uncomment the following line if you want to not use the prebuilt image, for example if you have local code changes # You can uncomment the following line if you want to not use the prebuilt image, for example if you have local code changes
# build: . build: .
image: ghcr.io/mastodon/mastodon:v4.4.8 #image: ghcr.io/mastodon/mastodon:v4.4.8
image: teh_mastodon
restart: always restart: always
env_file: .env.production env_file: .env.production
environment: environment: