From ca4c0710f6d1d70255bb2412ec1961698b67a507 Mon Sep 17 00:00:00 2001
From: Akumatic <git@akumatic.eu>
Date: Thu, 17 Apr 2025 20:10:40 +0200
Subject: [PATCH] Change secrets that support _FILE

---
 docker-compose.yml | 68 +++++++++++++++++++++++-----------------------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 8dd6888..fd57102 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -18,17 +18,18 @@ services:
       - internal
       - proxy
     environment:
-      # Not working with secrets right now
-      POSTGRES_DB: ${DATABASE}
-      POSTGRES_USER: ${DATABASE_USER}
-      POSTGRES_PASSWORD: ${DATABASE_PASS}
-      # Backend ENV Variables
+      POSTGRES_DB_FILE: /run/secrets/db_name
+      POSTGRES_USER_FILE: /run/secrets/db_user
+      POSTGRES_PASSWORD_FILE: /run/secrets/db_pass
       DB_ENGINE: postgres
       POSTGRES_SERVER: db_pg17
       POSTGRES_PORT: 5432
       ALLOW_SIGNUP: False
       TZ: Europe/Berlin
+      SMTP_HOST_FILE: /run/secrets/smtp_host
       SMTP_PORT: 587
+      SMTP_USER_FILE: /run/secrets/smtp_user
+      SMTP_PASSWORD_FILE: /run/secrets/smtp_pass
       SMTP_FROM_NAME: Mealie
       SMTP_AUTH_STRATEGY: TLS
       OIDC_AUTH_ENABLED: True
@@ -37,20 +38,23 @@ services:
       OIDC_REMEMBER_ME: True
       OIDC_USER_CLAIM: email
       OIDC_NAME_CLAIM: name
+      OIDC_USER_GROUP: mealie_user
+      OIDC_ADMIN_GROUP: mealie_admin
+      OIDC_CLIENT_SECRET_FILE: /run/secrets/oidc_client_secret
+      OIDC_CLIENT_ID_FILE: /run/secrets/oidc_client_id
+      OIDC_CONFIGURATION_URL_FILE: /run/secrets/oidc_url
     secrets:
-      - POSTGRES_DB
-      - POSTGRES_USER
-      - POSTGRES_PASSWORD
+      - db_name
+      - db_user
+      - db_pass
       - BASE_URL
-      - SMTP_HOST
+      - smtp_host
       - SMTP_FROM_EMAIL
-      - SMTP_USER
-      - SMTP_PASSWORD
-      - OIDC_CONFIGURATION_URL
-      - OIDC_CLIENT_ID
-      - OIDC_CLIENT_SECRET
-      - OIDC_USER_GROUP
-      - OIDC_ADMIN_GROUP
+      - smtp_user
+      - smtp_pass
+      - oidc_url
+      - oidc_client_id
+      - oidc_client_secret
 
   db_pg17:
     image: postgres:17.4
@@ -67,13 +71,13 @@ services:
     networks:
       - internal
     environment:
-      - POSTGRES_DB_FILE=/run/secrets/POSTGRES_DB
-      - POSTGRES_USER_FILE=/run/secrets/POSTGRES_USER
+      - POSTGRES_DB_FILE=/run/secrets/db_name
+      - POSTGRES_USER_FILE=/run/secrets/db_user
       - POSTGRES_PASSWORD_FILE=/run/secrets/POSTGRES_PASSWORD
     secrets:
-      - POSTGRES_DB
-      - POSTGRES_USER
-      - POSTGRES_PASSWORD
+      - db_name
+      - db_user
+      - db_pass
 
 volumes:
   data:
@@ -89,29 +93,25 @@ networks:
       external: true
 
 secrets:
-  POSTGRES_DB:
+  db_name:
     file: /srv/docker/secrets/mealie/db/name.txt
-  POSTGRES_USER:
+  db_user:
     file: /srv/docker/secrets/mealie/db/user.txt
-  POSTGRES_PASSWORD:
+  db_pass:
     file: /srv/docker/secrets/mealie/db/pass.key
   BASE_URL:
     file: /srv/docker/secrets/mealie/base_url.txt
   SMTP_FROM_EMAIL:
     file: /srv/docker/secrets/mealie/mail_from.txt
-  SMTP_HOST:
+  smtp_host:
     file: /srv/docker/secrets/mail/host.txt
-  SMTP_USER:
+  smtp_user:
     file: /srv/docker/secrets/mail/user.txt
-  SMTP_PASSWORD:
+  smtp_pass:
     file: /srv/docker/secrets/mail/pass.key
-  OIDC_CONFIGURATION_URL:
+  oidc_url:
     file: /srv/docker/secrets/mealie/oidc/url.txt
-  OIDC_CLIENT_ID:
+  oidc_client_id:
     file: /srv/docker/secrets/mealie/oidc/client_id.txt
-  OIDC_CLIENT_SECRET:
+  oidc_client_secret:
     file: /srv/docker/secrets/mealie/oidc/client_secret.key
-  OIDC_USER_GROUP:
-    file: /srv/docker/secrets/mealie/oidc/group_user.txt
-  OIDC_ADMIN_GROUP:
-    file: /srv/docker/secrets/mealie/oidc/group_admin.txt
\ No newline at end of file