chore: merge conflicts

docker-compose.yml

@@ -18,6 +18,15 @@ services:
       POSTGRES_PASSWORD: postgres
       POSTGRES_DB: school
       TZ: Europe/Paris
+  
+  docuseal:
+    image: docuseal/docuseal:latest
+    depends_on:
+    - database
+    ports:
+      - 3001:3000
+    environment:
+      - DATABASE_URL=postgresql://postgres:postgres@database:5432/docuseal
 
   backend:
     build:
@@ -37,19 +46,20 @@ services:
     depends_on:
       - redis
       - database
+      - docuseal
     command: python start.py
 
-  frontend:
-    build:
-      context: ./Front-End
-      args:
-        - BUILD_MODE=development
-    ports:
-      - 3000:3000
-    volumes:
-      - ./Front-End:/app
-    environment:
-      - TZ=Europe/Paris
-    depends_on:
-      - backend
+  # frontend:
+  #   build:
+  #     context: ./Front-End
+  #     args:
+  #       - BUILD_MODE=development
+  #   ports:
+  #     - 3000:3000
+  #   volumes:
+  #     - ./Front-End:/app
+  #   environment:
+  #     - TZ=Europe/Paris
+  #   depends_on:
+  #     - backend