nettoyage

dockers/mastodon/docker-compose.yml

@@ -1,6 +1,3 @@
-# This file is designed for production server deployment, not local development work
-# For a containerized local dev environment, see: https://github.com/mastodon/mastodon/blob/main/docs/DEVELOPMENT.md#docker
-
 services:
   db:
     container_name: ${mastodonDBName}
@@ -13,8 +10,6 @@ services:
       test: ['CMD', 'pg_isready', '-U', 'postgres']
     volumes:
       - postgres:/var/lib/postgresql/data
-    # environment:
-    #   - 'POSTGRES_HOST_AUTH_METHOD=trust'
     env_file:
       - ../../secret/env-mastodonDB
 
@@ -61,16 +56,11 @@ services:
   #     - '127.0.0.1:9200:9200'
 
   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: .
     container_name: ${mastodonServName}
     image: ghcr.io/mastodon/mastodon:v4.5.1
     restart: ${restartPolicy}
     environment:
       - LOCAL_DOMAIN=${mastodonHost}.${domain}
-      - SMTP_SERVER=smtp.${domain}
-      - SMTP_LOGIN=admin@${domain}
-      - SMTP_FROM_ADDRESS=admin@${domain}
     env_file:
       - env-config
       - ../../secret/env-mastodonServ
@@ -96,23 +86,16 @@ services:
       - "traefik.http.services.mastodon.loadbalancer.server.port=3000"
       - "traefik.docker.network=mastodonNet"
 
-
   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: .
     container_name: ${mastodonStreamingName}
     image: ghcr.io/mastodon/mastodon-streaming:v4.5.1
     restart: ${restartPolicy}
     environment:
       - LOCAL_DOMAIN=${mastodonHost}.${domain}
-      - SMTP_SERVER=smtp.${domain}
-      - SMTP_LOGIN=admin@${domain}
-      - SMTP_FROM_ADDRESS=admin@${domain}
     env_file:
       - env-config
       - ../../secret/env-mastodonServ
+      - ../../secret/env-mastodonDB
     command: node ./streaming/index.js
     networks:
       - mastodonNet
@@ -131,19 +114,15 @@ services:
       - "traefik.docker.network=mastodonNet"
 
   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: .
     container_name: ${mastodonSidekiqName}
     image: ghcr.io/mastodon/mastodon:v4.5.1
     restart: ${restartPolicy}
     environment:
       - LOCAL_DOMAIN=${mastodonHost}.${domain}
-      - SMTP_SERVER=smtp.${domain}
-      - SMTP_LOGIN=admin@${domain}
-      - SMTP_FROM_ADDRESS=admin@${domain}
     env_file:
       - env-config
       - ../../secret/env-mastodonServ
+      - ../../secret/env-mastodonDB
     command: bundle exec sidekiq
     depends_on:
       - db