From a82011fd90b1d51ae50e92b5445b7b04212cbd84 Mon Sep 17 00:00:00 2001
From: Erik Stambaugh <erik@erikstambaugh.com>
Date: Sat, 25 Oct 2025 16:33:27 -0700
Subject: [PATCH] Update docker compose and update instructions

---
 UPDATE.md          |  2 ++
 docker-compose.yml | 15 +++++++++------
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/UPDATE.md b/UPDATE.md
index fe5dc92ca..2c51e5a94 100644
--- a/UPDATE.md
+++ b/UPDATE.md
@@ -28,6 +28,8 @@ Merge from the server into deploy
 * git remote add localupstream ../mastodon-upstream  ## only if we started fresh otherwise it's still here
 * git fetch localupstream
 * git merge localupstream/4XX                      ## branch name from previous step
+  * if there are a lot of conflicts:
+    git merge -X theirs localupstream/4XX          ## this will clobber local changes!  Beware!
 * git push
 
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 928ec6777..039b49076 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -63,8 +63,9 @@ services:
   mastodon_web:
     container_name: mastodon_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.4.8
+    build: .
+      #image: ghcr.io/mastodon/mastodon:v4.4.8
+    image: teh_mastodon
     restart: always
     env_file: .env.production
     command: bundle exec puma -C config/puma.rb
@@ -86,10 +87,11 @@ services:
   mastodon_streaming:
     container_name: mastodon_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:
+    build:
     #   dockerfile: ./streaming/Dockerfile
     #   context: .
-    image: ghcr.io/mastodon/mastodon-streaming:v4.4.8
+    #image: ghcr.io/mastodon/mastodon-streaming:v4.4.8
+    image: teh_mastodon_streaming
     restart: always
     env_file: .env.production
     command: node ./streaming/index.js
@@ -107,8 +109,9 @@ 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/mastodon/mastodon:v4.4.8
+    build: .
+    #image: ghcr.io/mastodon/mastodon:v4.4.8
+    image: teh_mastodon
     restart: always
     env_file: .env.production
     environment: