From 7846746050122cbfce7d7553e08dc50fa91b4d9e Mon Sep 17 00:00:00 2001
From: notplants <mfowler.email@protonmail.com>
Date: Thu, 6 Nov 2025 14:25:27 -0500
Subject: [PATCH] working other than minio_root_password_file

---
 compose.yml  | 17 ++++-------------
 pg_backup.sh |  3 +--
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/compose.yml b/compose.yml
index 540227a..17900d4 100644
--- a/compose.yml
+++ b/compose.yml
@@ -76,7 +76,9 @@ x-yprovider-env: &yprovider-env
 
 x-minio-env: &minio-env
   MINIO_ROOT_USER: user
-  MINIO_ROOT_PASSWORD_FILE: /run/secrets/minio_rp
+  # 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
 
 services:
   app:
@@ -179,8 +181,6 @@ services:
       PGDATA: var/lib/postgresql/data/pgdata
     volumes:
       - postgres:/var/lib/postgresql/data/pgdata
-    command: ["postgres"]
-    entrypoint: ["/abra-entrypoint.sh", "docker-entrypoint.sh"]
     deploy:
       labels:
         backupbot.backup: "${ENABLE_BACKUPS:-true}"
@@ -191,15 +191,7 @@ services:
         - source: pg_backup
           target: /pg_backup.sh
           mode: 0555
-        - source: abra_entrypoint
-          target: /abra-entrypoint.sh
-          mode: 0555
     secrets:
-      - django_sk
-      - django_sp
-      - oidc_rpcs
-      - collab_ss
-      - minio_rp
       - postgres_p
 
   redis:
@@ -212,8 +204,7 @@ services:
     image: minio/mc:RELEASE.2025-05-21T01-59-54Z
     environment: *minio-env
     networks:
-      - backend 
-#    entrypoint: ["/abra-entrypoint.sh"]
+      - backend
     entrypoint: >
       sh -c "MINIO_ROOT_PASSWORD=\"\$$(cat /run/secrets/minio_rp)\" &&
       /usr/bin/mc alias set docs http://minio:9000 \$${MINIO_ROOT_USER} \"\$${MINIO_ROOT_PASSWORD}\" &&
diff --git a/pg_backup.sh b/pg_backup.sh
index 2ab1ea2..1fb7892 100644
--- a/pg_backup.sh
+++ b/pg_backup.sh
@@ -5,8 +5,7 @@ set -e
 BACKUP_FILE='/var/lib/postgresql/data/pgdata/backup.sql'
 
 function backup {
-  # export PGPASSWORD=$(cat $POSTGRES_PASSWORD_FILE)
-  export PGPASSWORD="$POSTGRES_PASSWORD"
+  export PGPASSWORD=$(cat $POSTGRES_PASSWORD_FILE)
   pg_dump -U ${POSTGRES_USER} ${POSTGRES_DB} > $BACKUP_FILE
 }