From bba8c592acced070579236d4ef1964491d78b3ae Mon Sep 17 00:00:00 2001
From: Sammy Teillet <sammy.teillet@gmail.com>
Date: Tue, 18 Apr 2023 16:17:01 +0200
Subject: [PATCH] chore: fix build command and improve installation steps

---
 infra/dev/Makefile          | 5 ++++-
 infra/dev/front/Dockerfile  | 7 +++++--
 infra/dev/server/Dockerfile | 8 ++++++--
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/infra/dev/Makefile b/infra/dev/Makefile
index 5568250e0..8dc8bd6a5 100644
--- a/infra/dev/Makefile
+++ b/infra/dev/Makefile
@@ -1,5 +1,8 @@
 build: ##
-	@docker-compose up --build --force-recreate
+	@docker-compose down 
+	docker volume rm dev_twenty_node_modules_front || true
+	docker volume rm dev_twenty_node_modules_server || true
+	docker-compose build
 
 up: ## 
 	@docker-compose up -d
diff --git a/infra/dev/front/Dockerfile b/infra/dev/front/Dockerfile
index 971cf9994..b7d807523 100644
--- a/infra/dev/front/Dockerfile
+++ b/infra/dev/front/Dockerfile
@@ -5,9 +5,12 @@ RUN apk update && apk upgrade && \
     apk add libc6-compat
 
 WORKDIR /app/front
-COPY ../../front .
 
-RUN export $(xargs <.env)
+COPY ../../front/package.json .
+COPY ../../front/package-lock.json .
+COPY ../../front/.npmrc .
 RUN npm install
 
+COPY ../../front .
+
 CMD ["npm", "run", "start"]
diff --git a/infra/dev/server/Dockerfile b/infra/dev/server/Dockerfile
index 20e36ccec..774fc3352 100644
--- a/infra/dev/server/Dockerfile
+++ b/infra/dev/server/Dockerfile
@@ -5,8 +5,12 @@ RUN apk update && apk upgrade && \
     apk add libc6-compat
 
 WORKDIR /app/server
-COPY ../../server .
 
+COPY ../../server/package.json .
+COPY ../../server/package-lock.json .
 RUN npm install
 
-CMD ["npm", "run", "start"]
+COPY ../../server .
+
+
+CMD ["npm", "run", "start"]
\ No newline at end of file