tarrien/Mastodon
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit '9fe14a30724e18425aedaba59ca63c63d8b14083' into glitch-soc/merge-upstream

Browse Source
This commit is contained in:
Claire committed 2026-01-07 14:53:51 +01:00
2 parents 5e6b813e7d 9fe14a3072
commit aa6ec435d2
8 files changed
+83 -12
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

docker-compose.yml
+3 -3
View File
@@ -59,7 +59,7 @@ services:
web:
# You can uncomment the following line if you want to not use the prebuilt image, for example if you have local code changes
# build: .
image: ghcr.io/glitch-soc/mastodon:v4.5.3
image: ghcr.io/glitch-soc/mastodon:v4.5.4
restart: always
env_file: .env.production
command: bundle exec puma -C config/puma.rb
@@ -83,7 +83,7 @@ services:
# build:
# dockerfile: ./streaming/Dockerfile
# context: .
image: ghcr.io/glitch-soc/mastodon-streaming:v4.5.3
image: ghcr.io/glitch-soc/mastodon-streaming:v4.5.4
restart: always
env_file: .env.production
command: node ./streaming/index.js
@@ -102,7 +102,7 @@ services:
sidekiq:
# You can uncomment the following line if you want to not use the prebuilt image, for example if you have local code changes
# build: .
image: ghcr.io/glitch-soc/mastodon:v4.5.3
image: ghcr.io/glitch-soc/mastodon:v4.5.4
restart: always
env_file: .env.production
command: bundle exec sidekiq