From e781d0a11815dd0d6a335db5e786ff62493eb63a Mon Sep 17 00:00:00 2001
From: CJ_Clippy <cj@futureporn.net>
Date: Mon, 6 Oct 2025 05:15:37 -0800
Subject: [PATCH] use inline env var

---
 ansible/roles/our/tasks/stack.yml    | 6 ++++++
 services/our/compose.db.yaml         | 2 --
 services/our/compose.production.yaml | 4 ----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ansible/roles/our/tasks/stack.yml b/ansible/roles/our/tasks/stack.yml
index 7222a16..54234eb 100644
--- a/ansible/roles/our/tasks/stack.yml
+++ b/ansible/roles/our/tasks/stack.yml
@@ -50,6 +50,12 @@
     name: our-postgres
     compose:
       - /etc/futureporn/our/compose.db.yaml
+      - services:
+          postgres:
+            environment:
+              POSTGRES_USER: "{{ lookup('dotenv', 'POSTGRES_USER', file='../../../../.env.production') }}"
+              POSTGRES_PASSWORD: "{{ lookup('dotenv', 'POSTGRES_PASSWORD', file='../../../../.env.production') }}"
+              POSTGRES_DB: "{{ lookup('dotenv', 'POSTGRES_DB', file='../../../../.env.production') }}"
 
 - name: Deploy stack to green
   community.docker.docker_stack:
diff --git a/services/our/compose.db.yaml b/services/our/compose.db.yaml
index 4b1caf7..4ce5f3e 100644
--- a/services/our/compose.db.yaml
+++ b/services/our/compose.db.yaml
@@ -1,7 +1,6 @@
 services:
   # pgadmin:
   #   image: dpage/pgadmin4:latest
-  #   env_file: ./.env
   #   ports:
   #     - target: 5050
   #       published: 8095
@@ -10,7 +9,6 @@ services:
 
   postgres:
     image: postgres:17
-    env_file: ./.env
     volumes:
       - pgdata:/var/lib/postgresql/data
     healthcheck:
diff --git a/services/our/compose.production.yaml b/services/our/compose.production.yaml
index fe14e35..89329a6 100644
--- a/services/our/compose.production.yaml
+++ b/services/our/compose.production.yaml
@@ -1,8 +1,6 @@
 services:
   server:
     image: gitea.futureporn.net/futureporn/our:latest
-    depends_on:
-      - postgres
     init: true
     command: >
       sh -c "npx prisma migrate deploy && npm run start:server"
@@ -12,8 +10,6 @@ services:
 
   worker:
     image: gitea.futureporn.net/futureporn/our:latest
-    depends_on:
-      - postgres
     init: true
     entrypoint: >
       sh -c "npm run start:worker"