From ad40d86b69a0edd5f47d9f91a99b42fb39eca939 Mon Sep 17 00:00:00 2001
From: Kuba Orlik <kontakt@kuba-orlik.name>
Date: Mon, 24 Aug 2026 12:08:47 +0200
Subject: [PATCH] Run sidekiq and streaming from the same mastodon version

---
 defaults/main.yml               | 1 +
 templates/Dockerfile            | 2 +-
 templates/docker-compose.yml.j2 | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index a68619a..4db7da5 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -24,3 +24,4 @@ mastodon_docker_smtp:
 mastodon_docker_web_port: 3008
 mastodon_docker_streaming_port: 3009
 mastodon_docker_media_cleanup_days: 3
+mastodon_version: 4.7
diff --git a/templates/Dockerfile b/templates/Dockerfile
index 44d8e74..d18d08d 100644
--- a/templates/Dockerfile
+++ b/templates/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/mastodon/mastodon:v4.7
+FROM ghcr.io/mastodon/mastodon:v{{ mastodon_version }}
 
 USER root
 
diff --git a/templates/docker-compose.yml.j2 b/templates/docker-compose.yml.j2
index be4a7fa..cda2661 100644
--- a/templates/docker-compose.yml.j2
+++ b/templates/docker-compose.yml.j2
@@ -84,7 +84,7 @@ services:
       - "{{ mastodon_docker_cache_storage }}:/opt/mastodon/public/system/cache"
 
   streaming:
-    image: ghcr.io/mastodon/mastodon-streaming:v4.5.9
+    image: ghcr.io/mastodon/mastodon-streaming:v{{ mastodon_version }}
     restart: always
     env_file: env
     command: node ./streaming/index.js
@@ -101,7 +101,7 @@ services:
       - redis
 
   sidekiq:
-    image: ghcr.io/mastodon/mastodon:v4.5.9
+    image: ghcr.io/mastodon/mastodon:v{{ mastodon_version }}
     restart: always
     env_file: env
     command: bundle exec sidekiq