From 61099f99b843b0876e822bf46c25936ac516a0aa Mon Sep 17 00:00:00 2001
From: Charles Bochet <charlesBochet@users.noreply.github.com>
Date: Thu, 25 May 2023 16:58:33 +0200
Subject: [PATCH] Simplify setup again to run in vscode (#138)

---
 front/.vscode/extensions.json   | 5 -----
 infra/dev/docker-compose.yml    | 5 ++---
 infra/dev/twenty-dev/Dockerfile | 8 +++++---
 3 files changed, 7 insertions(+), 11 deletions(-)
 delete mode 100644 front/.vscode/extensions.json

diff --git a/front/.vscode/extensions.json b/front/.vscode/extensions.json
deleted file mode 100644
index 3433c01b0..000000000
--- a/front/.vscode/extensions.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "recommendations": [
-    "esbenp.prettier-vscode"
-  ]
-}
\ No newline at end of file
diff --git a/infra/dev/docker-compose.yml b/infra/dev/docker-compose.yml
index e8b25c70b..0f9518805 100644
--- a/infra/dev/docker-compose.yml
+++ b/infra/dev/docker-compose.yml
@@ -9,8 +9,7 @@ services:
       - "3001:3001"
       - "6006:6006"
     volumes:
-      - ../../front:/app/front
-      - ../../server:/app/server
+      - ../..:/app
       - twenty_node_modules_front:/app/front/node_modules
       - twenty_node_modules_server:/app/server/node_modules
     depends_on:
@@ -20,7 +19,7 @@ services:
       context: ../..
       dockerfile: ./infra/dev/twenty-docs/Dockerfile
     ports:
-      - "5001:3000"
+      - "5001:5001"
     volumes:
       - ../../docs:/app/docs
       - twenty_node_modules_docs:/app/docs/node_modules
diff --git a/infra/dev/twenty-dev/Dockerfile b/infra/dev/twenty-dev/Dockerfile
index e03f1abf3..5dce70a3e 100644
--- a/infra/dev/twenty-dev/Dockerfile
+++ b/infra/dev/twenty-dev/Dockerfile
@@ -13,15 +13,17 @@ COPY ../../front/package.json .
 COPY ../../front/package-lock.json .
 RUN npm install
 
-COPY ../../front .
-
 WORKDIR /app/server
 
 COPY ../../server/package.json .
 COPY ../../server/package-lock.json .
 RUN npm install
 
-COPY ../../server .
+WORKDIR /app
+
+COPY ../.. .
+
+WORKDIR /app/server
 RUN npx prisma generate
 
 WORKDIR /app