From dd59fdb75cbe3dac00bcfdf4d765f6f86ca3d360 Mon Sep 17 00:00:00 2001
From: msnie <msnie@dtu.dk>
Date: Fri, 31 Jan 2025 14:44:28 +0100
Subject: [PATCH] adding mastodon

---
 mastodon/docker-compose.yml | 31 +++++++++++++++++++++++++------
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/mastodon/docker-compose.yml b/mastodon/docker-compose.yml
index 49478ca..2ccd901 100644
--- a/mastodon/docker-compose.yml
+++ b/mastodon/docker-compose.yml
@@ -10,7 +10,10 @@ services:
       - /srv/mastodon/postgres14:/var/lib/postgresql/data
     # added from the default, otherwise you'll need to manually create a `mastodon` db and user/role
     # env_file: db.env  
-    env_file: .env.production
+    env_file:
+      - .env
+      - .env.production
+      - db.env
     environment:
       - 'POSTGRES_HOST_AUTH_METHOD=trust'
       - 'POSTGRES_USER=postgres'
@@ -34,7 +37,10 @@ services:
     # env_file:
     #   - .env
     #   - db.env
-    env_file: .env.production
+    env_file:
+      - .env
+      - .env.production
+      - db.env
     ports:
       - 3344:3000
     command: bash -c "rm -f /mastodon/tmp/pids/server.pid; bundle exec rails s -p 3000"
@@ -62,7 +68,10 @@ services:
     # env_file:
     #   - .env
     #   - db.env
-    env_file: .env.production
+    env_file:
+      - .env
+      - .env.production
+      - db.env
     command: node ./streaming
     environment:
       - 'REDIS_URL=redis://redis:6379'
@@ -90,6 +99,7 @@ services:
     restart: always
     env_file:
       - .env
+      - .env.production
       - db.env
     command: bundle exec sidekiq
     depends_on:
@@ -177,7 +187,10 @@ networks:
 #     # build: .
 #     image: ghcr.io/mastodon/mastodon:v4.3.3
 #     restart: always
-#     env_file: .env.production
+#       env_file:
+      - .env
+      - .env.production
+      - db.env
 #     command: bundle exec puma -C config/puma.rb
 #     networks:
 #       - traefik
@@ -201,7 +214,10 @@ networks:
 #     #   context: .
 #     image: ghcr.io/mastodon/mastodon-streaming:v4.3.3
 #     restart: always
-#     env_file: .env.production
+#       env_file:
+      - .env
+      - .env.production
+      - db.env
 #     command: node ./streaming/index.js
 #     networks:
 #       - traefik
@@ -220,7 +236,10 @@ networks:
 #     # build: .
 #     image: ghcr.io/mastodon/mastodon:v4.3.3
 #     restart: always
-#     env_file: .env.production
+#       env_file:
+      - .env
+      - .env.production
+      - db.env
 #     command: bundle exec sidekiq
 #     depends_on:
 #       - db