4 files changed, 15 insertions, 45 deletions
diff --git a/stacks/db/.gitignore b/stacks/db/.gitignore
deleted file mode 100644
index 13fed15..0000000
--- a/stacks/db/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*.env
-data/
-compose.test.yml
diff --git a/stacks/db/compose.yml b/stacks/db/compose.yml
index 9a44712..ccaf70e 100644
--- a/stacks/db/compose.yml
+++ b/stacks/db/compose.yml
@@ -1,10 +1,8 @@
-name: ${STACK}
-
 networks:
-  edge-net:
+  edge_net:
     name: ${EDGE_NET}
     external: true
-  db-net:
+  db_net:
     name: ${DB_NET}
     external: true
 
@@ -19,35 +17,38 @@ secrets:
 
 services:
   db:
-    container_name: ${DB_CONTAINER}
     image: postgres:16
     restart: unless-stopped
+    secrets: ['DB_USER', 'DB_PASSWORD']
     environment:
-      POSTGRES_USER: 'admin'
+      POSTGRES_USER_FILE: '/run/secrets/DB_USER'
+      POSTGRES_PASSWORD_FILE: /run/secrets/DB_PASSWORD
     env_file:
-      - .run.env # Runtime ENV
-      - .env # Compose ENV
+      - ${SECRETS}/env/db.env
     user: '${UID}:${GID}'
     volumes:
-      - ./data/:/var/lib/postgresql/data
+      - db-data:/var/lib/postgresql/data
     networks:
-      - db-net
+      - db_net
     expose:
       - 5432
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER}"]
       interval: 5s
       retries: 5
-  db-admin:
+  dba:
     container_name: ${DBA_CONTAINER}
     image: adminer:latest
+    environment:
+      ADMINER_DEFAULT_SERVER: db
+      ADMINER_DESIGN: galkaev
     env_file:
       - .run.env
       - .env
     depends_on:
-      - db-test
+      - db
     networks:
-      - edge-net
-      - db-net
+      - edge_net
+      - db_net
     expose:
       - 8080
diff --git a/stacks/db/env.template b/stacks/db/env.template
deleted file mode 100644
index cad7ccb..0000000
--- a/stacks/db/env.template
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-#
-# Stack Compose Variables
-
-# Namespace
-STACK=
-
-# Containers
-DB_CONTAINER=
-DBA_CONTAINER=
-
-# Networks
-EDGE_NET=
-DB_NET=
-
-# Volumes
-DB_CONTAINER=
diff --git a/stacks/db/run.env.template b/stacks/db/run.env.template
deleted file mode 100644
index b5f8727..0000000
--- a/stacks/db/run.env.template
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-#
-# Stack Runtime Variables
-
-# PostgreSQL
-POSTGRES_USER=
-POSTGRES_PASSWORD=
-
-# Adminer
-ADMINER_DEFAULT_SERVER=
-ADMINER_DESIGN=galkaev