update dockerfile and .gitignore

.gitignore

@@ -81,3 +81,4 @@ phanpy
 
 *storybook.log
 storybook-static
+backup

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
 
 

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:
-    #   dockerfile: ./streaming/Dockerfile
-    #   context: .
-    image: ghcr.io/mastodon/mastodon-streaming:v4.4.8
+    build:
+       dockerfile: ./streaming/Dockerfile
+       context: .
+    #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: