Merge pull request #62 from WildCodeSchool/fix/s06_all_fixes-pre-staging

environement variables in all docker compose for db
WildCodeSchool · Feb 6, 2025 · 4b41b6a · 4b41b6a
2 parents d0e7154 + dad4ffb
commit 4b41b6a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
@@ -30,11 +30,14 @@ services:
     shm_size: 128mb
     volumes:
       - ./db_data:/var/lib/postgresql/data
-    env_file:
-      - .env
     ports:
       - 5434:5432
     container_name: pawplanner-db-1
+    environment:
+      - POSTGRES_USER=${DBUSERNAME}
+      - POSTGRES_PASSWORD=${DBPASS}
+      - POSTGRES_DB=${DBNAME}
+
   adminer:
     image: adminer
     restart: unless-stopped

diff --git a/docker-compose.staging.yml b/docker-compose.staging.yml
@@ -30,11 +30,14 @@ services:
     shm_size: 128mb
     volumes:
       - ./db_data:/var/lib/postgresql/data
-    env_file:
-      - .env
     ports:
       - 5433:5432
     container_name: pawplanner-db-1
+    environment:
+      - POSTGRES_USER=${DBUSERNAME}
+      - POSTGRES_PASSWORD=${DBPASS}
+      - POSTGRES_DB=${DBNAME}
+
   adminer:
     image: adminer
     restart: unless-stopped

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -30,11 +30,13 @@ services:
     shm_size: 128mb
     volumes:
       - ./db_data:/var/lib/postgresql/data
-    env_file:
-      - .env
     ports:
       - 5433:5432
     container_name: pawplanner-db-1
+    environment:
+      - POSTGRES_USER=${DBUSERNAME}
+      - POSTGRES_PASSWORD=${DBPASS}
+      - POSTGRES_DB=${DBNAME}
 
   adminer:
     image: adminer