From 45b58da72187a7b1ed4d75fc25bf5dd59a86a9c4 Mon Sep 17 00:00:00 2001
From: Freya Murphy <freya@freyacat.org>
Date: Mon, 23 Dec 2024 22:14:44 -0500
Subject: rework tooling to make environement loading easier

---
 docker/docker-compose.base.yml | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

(limited to 'docker/docker-compose.base.yml')

diff --git a/docker/docker-compose.base.yml b/docker/docker-compose.base.yml
index 3dcc7b8..066545d 100644
--- a/docker/docker-compose.base.yml
+++ b/docker/docker-compose.base.yml
@@ -30,15 +30,14 @@ services:
     #
     # HTTP_PORT and HTTP_BIND sets what the external listen address will be for
     # the entire crimson stack.
-    build: ../build/nginx
+    build: ${CRIMSON_ROOT}/build/nginx
     restart: unless-stopped
-    environment:
-      - API_ENABLED
+    env_file: DOCKER_ENV_FILES
     ports:
       - ${HTTP_BIND}:${HTTP_PORT}:8080
     volumes:
-      - ${SOURCE}:/opt/site:ro
-      - ../src:/opt/crimson:ro
+      - ${PROJECT_SOURCE}:/opt/site:ro
+      - ${CRIMSON_ROOT}/src:/opt/crimson:ro
     depends_on:
       php:
         condition: service_started
@@ -47,16 +46,13 @@ services:
     # There exists some crimson functionaly that MAY be used which requires a
     # stamp.php file to be auto generated. This is done in `init`, this `init`
     # is an added dependency.
-    build: ../build/php
+    build: ${CRIMSON_ROOT}/build/php
     restart: unless-stopped
-    environment:
-      - POSTGRES_DB
-      - POSTGRES_USER
-      - POSTGRES_PASSWORD
+    env_file: DOCKER_ENV_FILES
     volumes:
-      - ${SOURCE}:/opt/site:ro
-      - ../src:/opt/crimson:ro
-      - ${DATA}/crimson:/var/run/crimson
+      - ${PROJECT_SOURCE}:/opt/site:ro
+      - ${CRIMSON_ROOT}/src:/opt/crimson:ro
+      - ${PROJECT_DATA}/crimson:/var/run/crimson
     depends_on:
       init:
         condition: service_completed_successfully
@@ -65,8 +61,9 @@ services:
     # Initalizes required files for php. Currently init only generates stamp.php.
     # This file hols all file stamps for all public assets, which is used in
     # crimsons `asset_stamp` controller function.
-    build: ../build/init
+    build: ${CRIMSON_ROOT}/build/init
     restart: no
+    env_file: DOCKER_ENV_FILES
     volumes:
-      - ${SOURCE}:/opt/site
-      - ${DATA}/crimson:/var/run/crimson
+      - ${PROJECT_SOURCE}:/opt/site
+      - ${PROJECT_DATA}/crimson:/var/run/crimson
-- 
cgit v1.2.3-freya