From c712424cdbc0b7306994d8b752e982e247d342f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?KMY=EF=BC=88=E9=9B=AA=E3=81=82=E3=81=99=E3=81=8B=EF=BC=89?=
 <tt@kmycode.net>
Date: Wed, 9 Oct 2024 12:16:06 +0900
Subject: [PATCH] =?UTF-8?q?Fix:=20#484=20`docker-compose.yml`=E3=82=92?=
 =?UTF-8?q?=E3=83=95=E3=82=A9=E3=83=BC=E3=82=AF=E3=81=A7=E3=82=82=E5=88=A9?=
 =?UTF-8?q?=E7=94=A8=E3=81=A7=E3=81=8D=E3=82=8B=E3=82=88=E3=81=86=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3=20(#867)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fix: #484 `docker-compose.yml`をフォークでも利用できるよう修正

* イメージ名を設定
---
 docker-compose.yml      | 14 +++++++-------
 lib/mastodon/version.rb |  2 ++
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 41876d26f9..ad9bd2be61 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -58,8 +58,8 @@ 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/mastodon/mastodon:v4.3.0-rc.1
+    build: .
+    image: kmyblue:15.0-lts
     restart: always
     env_file: .env.production
     command: bundle exec puma -C config/puma.rb
@@ -80,10 +80,10 @@ services:
 
   streaming:
     # You can uncomment the following lines if you want to not use the prebuilt image, for example if you have local code changes
-    # build:
-    #   dockerfile: ./streaming/Dockerfile
-    #   context: .
-    image: ghcr.io/mastodon/mastodon-streaming:v4.3.0-rc.1
+    build:
+      dockerfile: ./streaming/Dockerfile
+      context: .
+    image: kmyblue-streaming:15.0-lts
     restart: always
     env_file: .env.production
     command: node ./streaming/index.js
@@ -101,7 +101,7 @@ services:
 
   sidekiq:
     build: .
-    image: ghcr.io/mastodon/mastodon:v4.3.0-rc.1
+    image: kmyblue:15.0-lts
     restart: always
     env_file: .env.production
     command: bundle exec sidekiq
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 9753be02a0..a3b92a9081 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -6,6 +6,8 @@ module Mastodon
 
     module_function
 
+    # If you change the version number, also change the image version in docker-compose.yml.
+
     def kmyblue_major
       15
     end