From 423e7709efb92879b6ca9fdff035697cab1e6e51 Mon Sep 17 00:00:00 2001
From: Elian Loraux <elian.loraux@tetras-libre.fr>
Date: Wed, 27 Nov 2024 16:34:38 +0100
Subject: [PATCH] Explicite les variable d'environnement

---
 docker-compose.yml | 50 +++++++++++++++++++++-------------------------
 1 file changed, 23 insertions(+), 27 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index bf9c083..078adb7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,28 +4,26 @@ services:
 
   peertube:
     image: chocobozzz/peertube:production-bookworm
-    # environment:
-      # # General configuration
-      # - PEERTUBE_SECRET=${PEERTUBE_SECRET}
-      # - PEERTUBE_WEBSERVER_HOSTNAME=${PEERTUBE_WEBSERVER_HOSTNAME}
-      # - PEERTUBE_TRUST_PROXY=["127.0.0.1", "loopback", "172.18.0.0/16"]
-      # - PEERTUBE_WEBSERVER_PORT=80
-      # - PEERTUBE_WEBSERVER_HTTPS=false
-      # # Data base configuration
-      # - PEERTUBE_DB_USERNAME=${POSTGRES_USER}
-      # - PEERTUBE_DB_PASSWORD=${POSTGRES_PASSWORD}
-      # - PEERTUBE_DB_HOSTNAME=${PEERTUBE_DB_HOSTNAME}
-      # - PEERTUBE_DB_SSL=false
-      # # Email configuration
-      # - PEERTUBE_SMTP_HOSTNAME=${PEERTUBE_SMTP_HOSTNAME}
-      # - PEERTUBE_SMTP_PORT=${PEERTUBE_SMTP_PORT}
-      # - PEERTUBE_SMTP_FROM=${PEERTUBE_SMTP_FROM}
-      # - PEERTUBE_SMTP_TLS=${PEERTUBE_SMTP_TLS}
-      # - PEERTUBE_SMTP_DISABLE_STARTTLS=${PEERTUBE_SMTP_DISABLE_STARTTLS}
-      # - PEERTUBE_ADMIN_EMAIL=${PEERTUBE_ADMIN_EMAIL}
+    environment:
+      # General configuration
+      - PEERTUBE_SECRET=${PEERTUBE_SECRET}
+      - PEERTUBE_WEBSERVER_HOSTNAME=${PEERTUBE_WEBSERVER_HOSTNAME}
+      - PEERTUBE_TRUST_PROXY=["127.0.0.1", "loopback", "172.18.0.0/16"]
+      - PEERTUBE_WEBSERVER_PORT=80
+      - PEERTUBE_WEBSERVER_HTTPS=false
+      # Data base configuration
+      - PEERTUBE_DB_USERNAME=${POSTGRES_USER}
+      - PEERTUBE_DB_PASSWORD=${POSTGRES_PASSWORD}
+      - PEERTUBE_DB_HOSTNAME=${PEERTUBE_DB_HOSTNAME}
+      - PEERTUBE_DB_SSL=false
+      # Email configuration
+      - PEERTUBE_SMTP_HOSTNAME=${PEERTUBE_SMTP_HOSTNAME}
+      - PEERTUBE_SMTP_PORT=${PEERTUBE_SMTP_PORT}
+      - PEERTUBE_SMTP_FROM=${PEERTUBE_SMTP_FROM}
+      - PEERTUBE_SMTP_TLS=${PEERTUBE_SMTP_TLS}
+      - PEERTUBE_SMTP_DISABLE_STARTTLS=${PEERTUBE_SMTP_DISABLE_STARTTLS}
+      - PEERTUBE_ADMIN_EMAIL=${PEERTUBE_ADMIN_EMAIL}
 
-    env_file:
-      - .env
     volumes:
       - assets:/app/client/dist
       - ./docker-volume/data:/data
@@ -39,12 +37,10 @@ services:
 
   postgres:
     image: postgres:13-alpine
-    # environment:
-    #   - POSTGRES_USER=${POSTGRES_USER}
-    #   - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
-    #   - POSTGRES_DB=${POSTGRES_DB}
-    env_file:
-      - .env
+    environment:
+      - POSTGRES_USER=${POSTGRES_USER}
+      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
+      - POSTGRES_DB=${POSTGRES_DB}
     volumes:
       - ./docker-volume/db:/var/lib/postgresql/data
     restart: "always"
-- 
GitLab