From 94df215108ac7f38b37db9cb60950236f1e5bf60 Mon Sep 17 00:00:00 2001
From: Kouhai <devkouhai@gmail.com>
Date: Sat, 18 Mar 2023 01:54:21 -0700
Subject: [PATCH] th: compose out of the box, more-or-less

---
 .env.production.sample |  9 +++++----
 docker-compose.yml     | 16 ++++++++++------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/.env.production.sample b/.env.production.sample
index 7bcce0f7e5..bd72ee0b41 100644
--- a/.env.production.sample
+++ b/.env.production.sample
@@ -14,7 +14,7 @@
 # ----------
 # This identifies your server and cannot be changed safely later
 # ----------
-LOCAL_DOMAIN=example.com
+LOCAL_DOMAIN=localhost
 
 # Use this only if you need to run mastodon on a different domain than the one used for federation.
 # You can read more about this option on https://docs.joinmastodon.org/admin/config/#web-domain
@@ -25,6 +25,7 @@ LOCAL_DOMAIN=example.com
 # handler@example2.com etc. for the same user. LOCAL_DOMAIN should not
 # be added. Comma separated values
 # ALTERNATE_DOMAINS=example1.com,example2.com
+ALTERNATE_DOMAINS=mastodon.internal
 
 # Use HTTP proxy for outgoing request (optional)
 # http_proxy=http://gateway.local:8118
@@ -43,14 +44,14 @@ LOCAL_DOMAIN=example.com
 
 # Redis
 # -----
-REDIS_HOST=localhost
+REDIS_HOST=redis
 REDIS_PORT=6379
 
 
 # PostgreSQL
 # ----------
-DB_HOST=/var/run/postgresql
-DB_USER=mastodon
+DB_HOST=db
+DB_USER=postgres
 DB_NAME=mastodon_production
 DB_PASS=
 DB_PORT=5432
diff --git a/docker-compose.yml b/docker-compose.yml
index 9d0f7e4751..01ccab7e14 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,16 +2,17 @@ version: '3'
 services:
   db:
     restart: always
-    image: postgres:14-alpine
+    image: postgres:15-alpine
     shm_size: 256mb
     networks:
       - internal_network
     healthcheck:
       test: ['CMD', 'pg_isready', '-U', 'postgres']
     volumes:
-      - ./postgres14:/var/lib/postgresql/data
+      - ./data/postgres.15:/var/lib/postgresql/data
     environment:
       - 'POSTGRES_HOST_AUTH_METHOD=trust'
+      - 'POSTGRES_USER=mastodon'
 
   redis:
     restart: always
@@ -21,7 +22,7 @@ services:
     healthcheck:
       test: ['CMD', 'redis-cli', 'ping']
     volumes:
-      - ./redis:/data
+      - ./data/redis:/data
 
   # es:
   #   restart: always
@@ -56,7 +57,7 @@ services:
 
   web:
     build: .
-    image: tootsuite/mastodon
+    image: gitea.treehouse.systems/treehouse/mastodon:latest
     restart: always
     env_file: .env.production
     command: bash -c "rm -f /mastodon/tmp/pids/server.pid; bundle exec rails s -p 3000"
@@ -68,6 +69,8 @@ services:
       test: ['CMD-SHELL', 'wget -q --spider --proxy=off localhost:3000/health || exit 1']
     expose:
       - 3000
+    ports:
+      - 3000:3000
     labels:
       - traefik.enable=true
       - traefik.http.routers.web.rule=Host(`social-dev.treehouse.systems`)
@@ -82,10 +85,11 @@ services:
       # - es
     volumes:
       - ./public/system:/mastodon/public/system
+      # - ./data/postgres:/var/lib/postgresql/data
 
   streaming:
     build: .
-    image: tootsuite/mastodon
+    image: gitea.treehouse.systems/treehouse/mastodon:latest
     restart: always
     env_file: .env.production
     command: node ./streaming
@@ -111,7 +115,7 @@ services:
 
   sidekiq:
     build: .
-    image: tootsuite/mastodon
+    image: gitea.treehouse.systems/treehouse/mastodon:latest
     restart: always
     env_file: .env.production
     command: bundle exec sidekiq