Updated DAViS container template

5 files changed, 38 insertions, 35 deletions

diff --git a/stacks/dav/.db.env.template b/stacks/dav/.db.env.template
deleted file mode 100644
index bd9bc9e..0000000
--- a/stacks/dav/.db.env.template
+++ /dev/null
@@ -1,3 +0,0 @@
-POSTGRES_PASSWORD=${DB_PASSWORD}
-POSTGRES_DB=${DB_DATABASE}
-POSTGRES_USER=${DB_USER}
diff --git a/stacks/dav/.env.template b/stacks/dav/.env.template
index 2183497..d84f2b0 100644
--- a/stacks/dav/.env.template
+++ b/stacks/dav/.env.template
@@ -2,13 +2,16 @@
 #
 # Stack Compose Variables
 
-# Namespace
-_STACK=
-_CONTAINER=
-_DB_CONTAINER=
+# Namespaces
+_STACK_0=
 
-# Network
-_NET=
+# Containers
+_CONTAINER_0=
+_CONTAINER_1=
+
+# Networks
+_NET_0=
+_NET_1=
 
 # Volumes
-# _DB_VOLUME=
+_VOLUME_0=
diff --git a/stacks/dav/.gitignore b/stacks/dav/.gitignore
index 375a3dd..e6c78b8 100644
--- a/stacks/dav/.gitignore
+++ b/stacks/dav/.gitignore
@@ -2,4 +2,4 @@
 *.env
 .database/
 .database/**
-compose.local.yml
+compose.test.yml
diff --git a/stacks/dav/.davis.env.template b/stacks/dav/.run.env.template
index 67d9a7e..6ef4bc3 100644
--- a/stacks/dav/.davis.env.template
+++ b/stacks/dav/.run.env.template
@@ -13,10 +13,13 @@ APP_TIMEZONE=America/New_York
 LOG_FILE_PATH="%kernel.logs_dir%/%kernel.environment%.log"
 
 # Database
+POSTGRES_PASSWORD=
+POSTGRES_DB=
+POSTGRES_USER=
 DATABASE_DRIVER=postgresql
-DB_DATABASE=davis
-DB_USER=davis_user
-DB_PASSWORD=davis_password
+DB_DATABASE=${POSTGRES_DB}
+DB_USER=${POSTGRES_USER}
+DB_PASSWORD=${POSTGRES_PASSWORD}
 DATABASE_URL=${DATABASE_DRIVER}://${DB_USER}:${DB_PASSWORD}@${_DB_CONTAINER}:5432/${DB_DATABASE}?serverVersion=15&charset=UTF-8
 
 # For the Davis admin interface
diff --git a/stacks/dav/compose.yml b/stacks/dav/compose.yml
index fdc5b23..42d254f 100644
--- a/stacks/dav/compose.yml
+++ b/stacks/dav/compose.yml
@@ -1,34 +1,23 @@
-name: ${_STACK}
+name: ${_STACK_0}
 
 networks:
-  net:
-    name: ${_NET}
+  edge-net:
+    name: ${_NET_0}
     external: true
-  intra:
+  db-net:
+    name: ${_NET_1}
 
 volumes:
-  data:
-    name: ${_DB_DATA_VOLUME}
+  dav-db:
+    name: ${_VOLUME_0}
     external: true
 
 services:
-  db:
-    container_name: ${_DB_CONTAINER} # Required for now.
-    image: postgres:16-alpine
-    networks:
-      - intra
-    env_file:
-      - .env
-      - .davis.env
-      - .db.env
-    volumes:
-      - data:/var/lib/postgresql/data
-
-  davis:
-    container_name: ${_CONTAINER}
+  dav:
+    container_name: ${_CONTAINER_0}
     image: ghcr.io/tchapi/davis-standalone:latest
     env_file:
-      - .davis.env
+      - .run.env
       - .env
     networks:
       - net
@@ -37,3 +26,14 @@ services:
       - 9000
     depends_on:
       - db
+  dav-db:
+    container_name: ${_CONTAINER_1} # Required for now.
+    image: postgres:16
+    networks:
+      - edge-net
+      - db-net
+    env_file:
+      - .run.env
+      - .env
+    volumes:
+      - dav-db:/var/lib/postgresql/data