From fb9c74cbdbe401032ee190931202374fdf37342f Mon Sep 17 00:00:00 2001
From: Chloe Jung <chloe@onesandzeros.nz>
Date: Wed, 1 Feb 2023 11:10:35 +1300
Subject: [PATCH] Add a "Caddyfile_docker" file. Update docker-compose.yml file

---
 .env.example       |  5 +----
 Caddyfile_docker   |  2 ++
 docker-compose.yml | 10 +++++-----
 3 files changed, 8 insertions(+), 9 deletions(-)
 create mode 100644 Caddyfile_docker

diff --git a/.env.example b/.env.example
index 5d282c1..775f70b 100644
--- a/.env.example
+++ b/.env.example
@@ -1,4 +1 @@
-DB_PORT=5432
-DB_USER=cardapp
-DB_PASSWORD=password
-DB_NAME=card_db
\ No newline at end of file
+DB_PASSWORD=password
\ No newline at end of file
diff --git a/Caddyfile_docker b/Caddyfile_docker
new file mode 100644
index 0000000..e32ab53
--- /dev/null
+++ b/Caddyfile_docker
@@ -0,0 +1,2 @@
+https://card.yourdomain.com
+reverse_proxy boltcard_main:9000
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 03cbd30..4c4e39a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,10 +11,10 @@ services:
     environment:
       - LOG_LEVEL=DEBUG
       - DB_HOST=db
-      - DB_USER=${DB_USER}      
+      - DB_USER=cardapp
       - DB_PASSWORD=${DB_PASSWORD}
       - DB_PORT=5432    
-      - DB_NAME=${DB_NAME}
+      - DB_NAME=card_db
     ports: 
       - 9000:9000
     volumes:
@@ -27,9 +27,9 @@ services:
     container_name: boltcard_db
     restart: unless-stopped
     environment:
-      - POSTGRES_USER=${DB_USER}
+      - POSTGRES_USER=cardapp
       - POSTGRES_PASSWORD=${DB_PASSWORD}
-      - POSTGRES_DB=${DB_NAME}
+      - POSTGRES_DB=card_db
       - PGDATA=/var/lib/postgresql/data/pgdata
     volumes:
       - db-data:/var/lib/postgresql/data
@@ -48,7 +48,7 @@ services:
       - "443:443"
       - "443:443/udp"
     volumes:
-      - ${PWD}/Caddyfile:/etc/caddy/Caddyfile
+      - ${PWD}/Caddyfile_docker:/etc/caddy/Caddyfile
       - caddy_data:/data
       - caddy_config:/config
 networks: