Merge commit 'ffeb5da9912a3b7db0deb8aec429e661ef609c59' into glitch-soc/merge-upstream

This commit is contained in:
Claire
2025-08-05 15:46:33 +02:00
68 changed files with 192 additions and 24 deletions

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.4.2
image: ghcr.io/glitch-soc/mastodon:v4.4.3
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.4.2
image: ghcr.io/glitch-soc/mastodon-streaming:v4.4.3
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.4.2
image: ghcr.io/glitch-soc/mastodon:v4.4.3
restart: always
env_file: .env.production
command: bundle exec sidekiq