Merge pull request #34 from atlp-rwanda/revert-30-ft-user-logout-#187…

…984515

Revert "User: this pr enables user to logout from one's session #187984515"

docker-compose.yml

@@ -1,21 +1,26 @@
 version: '3.1'
 
 services:
-  # Backend Service
+  web:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    container_name: eagle-ec-fe-container
+    image: mugemanebertin/eagle-ec-fe
+    ports:
+      - "5173:5173"
+    env_file:
+      - .env
+
   backend:
     image: mugemanebertin/eagle_ec_be:latest
-    container_name: express-server-container
+    container_name: eagle-ec-be-container
     ports:
-      - "${PORT}:${PORT}"
-    volumes:
-      - ./backend:/usr/src/app
-      - /usr/src/app/node_modules
-    command: sh -c "npm run migrate && npm run seed || true && npm run dev"
+      - "499:499"
+    command: sh -c "npm run migrate && (npm run seed || true) && npm run dev"
     depends_on:
-      - postgres_db
+      - db
       - redis
-    env_file:
-      - ./.env   
     environment:
       - DB_CONNECTION=${DOCKER_DB_CONNECTION}
       - JWT_SECRET=${JWT_SECRET}
@@ -30,14 +35,12 @@ services:
       - GOOGLE_CLIENT_ID=${GOOGLE_CLIENT_ID}
       - GOOGLE_CLIENT_SECRET=${GOOGLE_CLIENT_SECRET}
       - GOOGLE_CALLBACK_URL=${GOOGLE_CALLBACK_URL}
-      - FE_URL=${FE_URL}
-    networks:
-      - eagle-ec
+      - REDIS_HOST=redis
+      - REDIS_PORT=6379
 
-  # PostgreSQL Database Service
-  postgres_db:
+  db:
     image: postgres:latest
-    container_name: postgres-db-container
+    container_name: eagle-ec-db-container
     ports:
       - "5433:5432"
     environment:
@@ -46,41 +49,11 @@ services:
       - POSTGRES_DB=${POSTGRES_DB}
     volumes:
       - postgres_data:/var/lib/postgresql/data
-    networks:
-      - eagle-ec
 
-  # Redis Service
   redis:
     image: redis:latest
-    container_name: redis-container
     ports:
       - "6379:6379"
-    networks:
-      - eagle-ec
-
-  # Web Frontend Service
-  frontend:
-    build:
-      context: .
-      dockerfile: Dockerfile
-    container_name: eagle-ec-fe-container
-    image: mugemanebertin/eagle-ec-fe
-    ports:
-      - "5173:5173"
-    env_file:
-      - ./.env
-    volumes:
-      - ./frontend:/app
-      - /app/node_modules
-    networks:
-      - eagle-ec
-    command: npm run dev -- --host
-    depends_on:
-      - backend
 
 volumes:
-  postgres_data:
-
-networks:
-  eagle-ec:
-    driver: bridge
+  postgres_data: