Fix Dockerfile and compose.yml

Makefile

@@ -16,12 +16,16 @@ down:
 build:
 	docker compose build
 
+.PHONY: rebuild
+rebuild:
+	docker compose build --no-cache
+
 .PHONY: clean
 clean:
 	docker compose down --rmi all --volumes --remove-orphans
 
 .PHONY: test
-test:
+test: build
 	# Unit tests for backend
 	docker compose -f compose.yml -f compose.dev.yml run backend sh -c "yarn test"
 	# E2E tests for backend
@@ -32,9 +36,9 @@ e2e:
 	./test.sh
 
 .PHONY: dev
-dev:
+dev: build
 	docker compose -f compose.yml -f compose.dev.yml up -d
 
 .PHONY: prod
-prod: clean build
+prod: clean rebuild
 	docker compose -f compose.yml -f compose.prod.yml up -d

backend/.dockerignore

@@ -1,3 +1,2 @@
-node_modules
-Dockerfile
-dist
+**/node_modules
+**/dist

backend/Dockerfile

@@ -2,6 +2,10 @@ FROM node:20
 
 WORKDIR /app
 
+COPY package.json yarn.lock ./
+COPY prisma ./prisma/
+RUN yarn install && yarn prisma generate
+
 COPY . .
 
-RUN yarn install && yarn build
+RUN yarn build

compose.dev.yml

@@ -4,9 +4,14 @@ services:
       - ./web/html:/var/www/playground
       - ./web/nginx.conf:/etc/nginx/nginx.conf
   backend:
-    command: sh -c "yarn install && yarn build && yarn prisma migrate deploy && yarn start:dev"
     volumes:
       - ./backend:/app
+      - backend-node-modules:/app/node_modules
   frontend:
     volumes:
       - ./frontend:/app
+      - frontend-node-modules:/app/node_modules
+
+volumes:
+  frontend-node-modules:
+  backend-node-modules:

frontend/.dockerignore

@@ -1,2 +1,2 @@
-node_modules
-Dockerfile
+**/node_modules
+**/dist

frontend/Dockerfile

@@ -2,6 +2,7 @@ FROM node:20
 
 WORKDIR /app
 
-COPY . .
-
+COPY package.json ./
 RUN npm install
+
+COPY . .