Env var cleanup (#152)

* Have docker postgres get configuration from secrets file * Fix secrets file git handling
FragSoc · Aug 8, 2021 · 6f09ad3 · 6f09ad3
1 parent 06fa0e0
commit 6f09ad3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/.env b/.env
@@ -0,0 +1 @@
+secrets.env
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,6 @@
-*.env
 **/__pycache__
 test-file.py
 /src/cogs/TestCog.py
 .vscode
-.idea
+.idea
+secrets.env
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -3,7 +3,9 @@ version: "3"
 services:
   db:
     environment:
-      - POSTGRES_PASSWORD=Pass2020!
+      - POSTGRES_USER=${PG_USER}
+      - POSTGRES_PASSWORD=${PG_PWD}
+      - POSTGRES_DB=${PG_DATABASE}
     image: "postgres:11"
     restart: unless-stopped
     volumes:
@@ -16,11 +18,6 @@ services:
     env_file: secrets.env
     environment:
       - PG_HOST=db
-      - PG_DATABASE=esportsbot
-      - PG_USER=postgres
-      - PG_PWD=Pass2020!
-      - ENABLE_TWITTER=False
-      - ENABLE_TWITCH=False
     restart: unless-stopped
 
   pg_admin: