From c1dcc6bfc62d9250c1566c400c7b67a79eb29a10 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?= Date: Wed, 9 Oct 2024 12:15:59 +0900 Subject: [PATCH] =?UTF-8?q?Fix:=20#484=20`docker-compose.yml`=E3=82=92?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20(#868)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 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..d7958cedfd 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:16.0-dev 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:16.0-dev 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:16.0-dev restart: always env_file: .env.production command: bundle exec sidekiq diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb index df032f0a67..f14f72dbdb 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 16 end