Simplify local dev (#137)

infra/dev/Makefile

@@ -1,32 +1,39 @@
-build: ##
+build:
 	@docker-compose down 
-	docker volume rm dev_twenty_node_modules_front || true
-	docker volume rm dev_twenty_node_modules_server || true
-	docker volume rm dev_twenty_node_modules_docs || true
-	docker-compose build
+	@docker volume rm dev_twenty_node_modules_front > /dev/null 2>&1 || true
+	@docker volume rm dev_twenty_node_modules_server > /dev/null 2>&1 || true
+	@docker volume rm dev_twenty_node_modules_docs > /dev/null 2>&1 || true
+	@docker-compose build
 
-up: ## 
+up:
 	@docker-compose up -d
 
-down: ##
+down:
 	@docker-compose down
 
-## Front
+sh:
+	@docker-compose exec twenty-dev sh
 
-front-logs: ## 
-	@docker-compose logs twenty-front -f
+front-start:
+	@docker-compose exec twenty-dev sh -c "cd /app/front && npm run start"
 
-front-sh: ## 
-	@docker-compose exec twenty-front sh
+front-test:
+	@docker-compose exec twenty-dev sh -c "cd /app/front && npm run test"
 
-front-test: ## 
-	@docker-compose exec twenty-front sh -c "npm run test"
+front-graphql-generate:
+	@docker-compose exec twenty-dev sh -c "cd /app/server && npm run "
 
-front-coverage: ## 
-	@docker-compose exec twenty-front sh -c "npm run coverage"
+front-storybook:
+	@docker-compose exec twenty-dev sh -c "cd /app/front && npm run storybook"
 
-front-storybook: ## 
-	@docker-compose exec twenty-front sh -c "npm run storybook"
+server-start:
+	@docker-compose exec twenty-dev sh -c "cd /app/server && npm run start"
 
-front-graphql-generate: ## 
-	@docker-compose exec twenty-front sh -c "npm run graphql-generate"
+server-prisma-generate:
+	@docker-compose exec twenty-dev sh -c "cd /app/server && npm run prisma:generate"
+
+server-prisma-migrate:
+	@docker-compose exec twenty-dev sh -c "cd /app/server && npm run prisma:migrate"
+
+server-prisma-seed:
+	@docker-compose exec twenty-dev sh -c "cd /app/server && npm run prisma:seed"

infra/dev/docker-compose.yml

@@ -1,32 +1,24 @@
 version: "3.9"
 services:
-  twenty-front:
+  twenty-dev:
     build: 
       context: ../..
-      dockerfile: ./infra/dev/front/Dockerfile
+      dockerfile: ./infra/dev/twenty-dev/Dockerfile
     ports:
+      - "3000:3000"
       - "3001:3001"
       - "6006:6006"
     volumes:
       - ../../front:/app/front
-      - twenty_node_modules_front:/app/front/node_modules
-    depends_on:
-      - postgres
-  twenty-server:
-    build:
-      context: ../..
-      dockerfile: ./infra/dev/server/Dockerfile
-    ports:
-      - "3000:3000"
-    volumes:
       - ../../server:/app/server
+      - twenty_node_modules_front:/app/front/node_modules
       - twenty_node_modules_server:/app/server/node_modules
     depends_on:
       - postgres
   twenty-docs:
     build:
       context: ../..
-      dockerfile: ./infra/dev/docs/Dockerfile
+      dockerfile: ./infra/dev/twenty-docs/Dockerfile
     ports:
       - "5001:3000"
     volumes:

infra/dev/server/Dockerfile

@@ -1,19 +0,0 @@
-FROM node:18.16.0-alpine as server
-
-RUN apk update && apk upgrade && \
-    apk add --no-cache bash git openssh && \
-    apk add libc6-compat
-
-WORKDIR /app/server
-
-COPY ../../server/package.json .
-COPY ../../server/package-lock.json .
-RUN npm install
-
-COPY ../../server/src/database/schema.prisma ./src/database/schema.prisma
-RUN npx prisma generate
-
-COPY ../../server .
-
-
-CMD ["npm", "run", "start:dev"]

infra/dev/twenty-dev/Dockerfile

@@ -15,4 +15,15 @@ RUN npm install
 
 COPY ../../front .
 
-CMD ["npm", "run", "start"]
+WORKDIR /app/server
+
+COPY ../../server/package.json .
+COPY ../../server/package-lock.json .
+RUN npm install
+
+COPY ../../server .
+RUN npx prisma generate
+
+WORKDIR /app
+
+CMD ["tail", "-f", "/dev/null"]