From 41ad58f47dfc7c7afb285cc246ab34855097d66b Mon Sep 17 00:00:00 2001
From: notplants <mfowler.email@protonmail.com>
Date: Thu, 6 Nov 2025 14:59:24 -0500
Subject: [PATCH] trying to use minio_root_pass_file

---
 .env.sample | 2 ++
 compose.yml | 8 ++------
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/.env.sample b/.env.sample
index c01fe08..600c819 100644
--- a/.env.sample
+++ b/.env.sample
@@ -19,6 +19,8 @@ SECRET_OIDC_RPCS_VERSION=v1
 SECRET_DJANGO_SP_VERSION=v1
 # MINIO_ROOT_PASSWORD
 SECRET_MINIO_RP_VERSION=v1
+# MINIO_ROOT_USER
+SECRET_MINIO_RU_VERSION=v1
 # COLLABORATION_SERVER_SECRET
 SECRET_COLLAB_SS_VERSION=v1
 # POSTGRES_PASSWORD
diff --git a/compose.yml b/compose.yml
index 35a2bd3..f1613df 100644
--- a/compose.yml
+++ b/compose.yml
@@ -75,10 +75,6 @@ x-yprovider-env: &yprovider-env
   COLLABORATION_WS_URL: wss://${DOMAIN}/collaboration/ws/
 
 x-minio-env: &minio-env
-  #  MINIO_ROOT_USER: user
-  # MINIO_ROOT_PASSWORD supplied by secrets
-  # TODO: switch to using password_file (currently only works with env var)
-  # MINIO_ROOT_PASSWORD_FILE: /run/secrets/minio_rp
   MINIO_ROOT_USER_FILE: /run/secrets/minio_ru
   MINIO_ROOT_PASSWORD_FILE: /run/secrets/minio_rp
 
@@ -209,8 +205,8 @@ services:
       - backend
     entrypoint: >
       sh -c "
-      MINIO_ROOT_USER=$(cat /run/secrets/minio_ru) &&
-      MINIO_ROOT_PASSWORD=$(cat /run/secrets/minio_rp) &&
+      MINIO_ROOT_USER=\"\$$(cat /run/secrets/minio_ru)\" &&   
+      MINIO_ROOT_PASSWORD=\"\$$(cat /run/secrets/minio_rp)\" &&   
       /usr/bin/mc alias set docs http://minio:9000 \$${MINIO_ROOT_USER} \"\$${MINIO_ROOT_PASSWORD}\" &&
       /usr/bin/mc mb --ignore-existing docs/docs-media-storage &&
       /usr/bin/mc version enable docs/docs-media-storage &&