From 245b987db9469665acadecf0719b6c694916ea95 Mon Sep 17 00:00:00 2001
From: orosmatthew <orosmatthew@pm.me>
Date: Sat, 17 Feb 2024 14:02:30 -0500
Subject: [PATCH] [web] Refactor docker stuff

---
 web/.env.example                               |  4 +---
 web/.gitignore                                 |  1 -
 ...-compose.example.yml => docker-compose.yml} |  8 ++++----
 web/docker/dev-postgress/docker-compose.yml    | 18 ++++++++++++++++++
 4 files changed, 23 insertions(+), 8 deletions(-)
 rename web/{docker/docker-compose.example.yml => docker-compose.yml} (64%)
 create mode 100644 web/docker/dev-postgress/docker-compose.yml

diff --git a/web/.env.example b/web/.env.example
index 1f793f8..d3e8a5f 100644
--- a/web/.env.example
+++ b/web/.env.example
@@ -1,3 +1 @@
-DATABASE_PASSWORD="password"
-DATABASE_USER="user"
-DATABASE_DB="contest"
\ No newline at end of file
+DATABASE_URL=postgresql://bwcontest:password@127.0.0.1:5432/bwcontest
\ No newline at end of file
diff --git a/web/.gitignore b/web/.gitignore
index bbedb6b..51ced86 100644
--- a/web/.gitignore
+++ b/web/.gitignore
@@ -10,4 +10,3 @@ vite.config.js.timestamp-*
 vite.config.ts.timestamp-*
 temp
 db
-docker-compose.yml
diff --git a/web/docker/docker-compose.example.yml b/web/docker-compose.yml
similarity index 64%
rename from web/docker/docker-compose.example.yml
rename to web/docker-compose.yml
index a3b1138..7364cc7 100644
--- a/web/docker/docker-compose.example.yml
+++ b/web/docker-compose.yml
@@ -5,9 +5,9 @@ services:
     volumes:
       - ./db:/var/lib/postgresql/data
     environment:
-      - POSTGRES_PASSWORD=${DATABASE_PASSWORD}
-      - POSTGRES_USER=${DATABASE_USER}
-      - POSTGRES_DB=${DATABASE_DB}
+      - POSTGRES_PASSWORD=password
+      - POSTGRES_USER=bwcontest
+      - POSTGRES_DB=bwcontest
     restart: unless-stopped
   web:
     build: .
@@ -15,7 +15,7 @@ services:
       - 3000:3000
       - 7006:7006
     environment:
-      - DATABASE_URL=postgresql://${DATABASE_USER}:${DATABASE_PASSWORD}@db:5432/${DATABASE_DB}
+      - DATABASE_URL=postgresql://bwcontest:password@db:5432/bwcontest
       - GIT_PORT=7006
       - ORIGIN=http://127.0.0.1:3000
     volumes:
diff --git a/web/docker/dev-postgress/docker-compose.yml b/web/docker/dev-postgress/docker-compose.yml
new file mode 100644
index 0000000..9da0ad7
--- /dev/null
+++ b/web/docker/dev-postgress/docker-compose.yml
@@ -0,0 +1,18 @@
+version: '3'
+services:
+  db:
+    image: "postgres:latest"
+    container_name: 'bwcontest-postgres'
+    restart: unless-stopped
+    environment:
+      POSTGRES_DB: 'bwcontest'
+      POSTGRES_USER: 'bwcontest'
+      POSTGRES_PASSWORD: 'password'
+      TZ: America/New_York
+    ports:
+      - '5432:5432'
+    volumes:
+      - bwcontest-postgres-data:/var/lib/postgresql/data
+
+volumes:
+  bwcontest-postgres-data:
\ No newline at end of file