From 087e631dd8f7f5f3186f3f4d2ac6f247c40817d7 Mon Sep 17 00:00:00 2001
From: Athurg Gooth <athurg@gooth.org>
Date: Sat, 7 Oct 2023 21:24:53 +0800
Subject: [PATCH] chore: optmize docker-compose.dev.yml (#2347)

Optmize docker-compose.dev.yml
---
 docker-compose.dev.yaml | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/docker-compose.dev.yaml b/docker-compose.dev.yaml
index 5bcad493..7830ec97 100644
--- a/docker-compose.dev.yaml
+++ b/docker-compose.dev.yaml
@@ -1,36 +1,26 @@
-# 1.Prepare your workspace by:
-#     docker compose -f docker-compose.dev.yaml run api go install github.com/cosmtrek/air@latest
-#     docker compose -f docker-compose.dev.yaml run web npm install
-#
-# 2. Start you work by:
-#     docker compose up -d
-#
-# 3. Check logs by:
-#     docker compose logs -f
-#
 services:
   db:
     image: mysql
     volumes:
       - ./.air/mysql:/var/lib/mysql
   api:
-    image: golang:1.21-alpine
+    image: cosmtrek/air
     working_dir: /work
-    command: air -c ./scripts/.air.toml
+    command: ["-c", "./scripts/.air.toml"]
     environment:
       - "MEMOS_DSN=root@tcp(db)/memos"
       - "MEMOS_DRIVER=mysql"
     volumes:
-      - $HOME/go/pkg/:/go/pkg/ # Cache for go mod shared with the host
-      - ./.air/bin/:/go/bin/ # Cache for binary used only in container, such as *air*
       - .:/work/
+      - $HOME/go/pkg/:/go/pkg/ # Cache for go mod shared with the host
   web:
     image: node:18-alpine
     working_dir: /work
     depends_on: ["api"]
     ports: ["3001:3001"]
     environment: ["DEV_PROXY_SERVER=http://api:8081/"]
-    command: npm run dev
+    entrypoint: ["/bin/sh", "-c"]
+    command: ["corepack enable && pnpm install && pnpm dev"]
     volumes:
       - ./web:/work
       - ./.air/node_modules/:/work/node_modules/ # Cache for Node Modules