update docker-compose, readme, .env

.env.sample

@@ -1,6 +1,6 @@
-POSTGRES_USER=mydb
-POSTGRES_PASSWORD=changeme
-POSTGRES_DB=mydb
+POSTGRES_USER=postgres
+POSTGRES_PASSWORD=postgres
+POSTGRES_DB=postgres
 DATABASE_URL="postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@127.0.0.1:5432/${POSTGRES_DB}"
 REDIS_URL="redis://127.0.0.1:6379/"
 JWT_SECRET="ITS A SECRET"

.gitignore

@@ -19,6 +19,8 @@ data/
 .env.development.local
 .env.test.local
 .env.production.local
+# include sample
+!.env.sample
 
 npm-debug.log*
 yarn-debug.log*

README.md

@@ -31,7 +31,11 @@ Holdem Solver is an free to use, open source web-application similar to FlopZill
 
 `git clone https://github.com/kmurf1999/HoldemSolver`
 
-2. Start the development server
+2. Setup environment variables
+
+`mv .env.sample .env.dev`
+
+3. Start the development server
 
 `docker-compose -f docker.compose.dev.yml up`
 

docker-compose.dev.yml

@@ -17,12 +17,14 @@ services:
       dockerfile: Dockerfile.dev
     volumes:
       - ./api:/api
-    environment:
-      RUST_LOG: info
-      DATABASE_URL: postgres://mydb:changeme@db:5432/mydb
-      REDIS_URL: redis://cache:6379/
-      JWT_SECRET: ITS A SECRET
-      ARGON_SECRET: ITS ANOTHER SECRET
+    env_file:
+      - ./.env.dev
+    # environment:
+    #   RUST_LOG: info
+    #   DATABASE_URL: postgres://mydb:changeme@db:5432/mydb
+    #   REDIS_URL: redis://cache:6379/
+    #   JWT_SECRET: ITS A SECRET
+    #   ARGON_SECRET: ITS ANOTHER SECRET
     ports:
       - 3535:3535
     depends_on:
@@ -36,10 +38,12 @@ services:
       - 5432:5432
     volumes:
       - ./data:/var/lib/postgresql/data
-    environment:
-      - POSTGRES_DB=postgres
-      - POSTGRES_USER=postgres
-      - POSTGRES_PASSWORD=postgres
+    env_file:
+      - ./.env.dev
+    # environment:
+    #   - POSTGRES_DB=postgres
+    #   - POSTGRES_USER=postgres
+    #   - POSTGRES_PASSWORD=postgres
     restart: always
 
   cache: