chore: 修改docker编译配置

.github/workflows/build.yml

@@ -16,7 +16,4 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: 20
-      - run: npm install -g pnpm
-      - run: pnpm install
-      - run: pnpm run build
-      - run: node ./dist/index.js
+      - run: make install && make all

.github/workflows/cloudflare.yml

@@ -19,9 +19,7 @@ jobs:
           cat << 'EOF' > wrangler.toml
           ${{secrets.WRANGLER_TOML}} 
           EOF
-      - run: npm install -g pnpm
-      - run: pnpm install
-      - run: pnpm run build
+      - run: make install && make workers
       - run: CLOUDFLARE_API_TOKEN=${{ secrets.CF_API_TOKEN }} pnpm run wrangler deploy --config=wrangler.toml > /dev/null
 
       - name: Check CF_WORKERS_DOMAIN exists

Dockerfile

@@ -1,15 +1,15 @@
 FROM node:alpine AS build
 WORKDIR /app
-COPY package.json tsconfig.json vite.config.ts ./
-RUN npm install
-COPY packages src
-RUN npm run build:local
+COPY package.json pnpm-lock.yaml pnpm-workspace.yaml ./
+RUN npm install && npm install -g pnpm
+COPY . .
+RUN pnpm install && pnpm -r run build
 
 
 FROM node:alpine AS production
 WORKDIR /app
-COPY package.json ./
-RUN npm install --omit=dev
-COPY --from=build /app/dist ./dist
+COPY packages/apps/local/package.docker.json package.json
+RUN npm install
+COPY --from=build /app/packages/apps/local/dist/index.js index.js
 EXPOSE 8787
-CMD ["npm", "run", "start:dist"]
+CMD ["npm", "run", "start"]

Makefile

@@ -0,0 +1,53 @@
+export PATH := $(shell pwd)/node_modules/.bin:$(PATH)
+SHELL := /bin/bash
+
+.PHONY: init
+init:
+	npm install -g pnpm
+	pnpm install
+
+.PHONY: version
+version:
+	pnpm run version
+
+.PHONY: core
+core: version
+	pnpm run --filter @chatgpt-telegram-workers/core build
+
+.PHONY: next
+next: core
+	pnpm run --filter @chatgpt-telegram-workers/next build
+
+.PHONY: local
+local: next
+	pnpm run --filter @chatgpt-telegram-workers/local build
+
+.PHONY: vercel
+vercel: core
+	pnpm run --filter @chatgpt-telegram-workers/vercel build
+
+.PHONY: workers
+workers: core
+	pnpm run --filter @chatgpt-telegram-workers/workers build
+	cp -r packages/apps/workers/dist/* dist/
+
+.PHONY: workers-next
+workers-next: next
+	pnpm run --filter @chatgpt-telegram-workers/workers build
+
+.PHONY: all
+all:
+	pnpm -r run build
+
+.PHONY: docker
+docker:
+	docker build -t chatgpt-telegram-workers:latest .
+
+.PHONY: docker-all
+docker-all:
+	docker build --platform linux/amd64,linux/arm64 -t tbxark/chatgpt-telegram-workers:latest --push .
+
+.PHONY: deploy-workers
+deploy-workers: workers
+	wrangler deploy --config=wrangler.toml
+

docker-compose.yaml

@@ -7,5 +7,4 @@ services:
     volumes:
       - ./config.json:/app/config.json:ro # change `./config.json` to your local path
       - ./wrangler.toml:/app/wrangler.toml:ro # change `./wrangler.toml` to your local path
-    network_mode: "host" # If you access the proxy port based on the host
-    entrypoint: ["npm", "run", "start:dist"]
+    network_mode: "host" # If you access the proxy port based on the host

package.json

@@ -9,9 +9,13 @@
     "scripts": {
         "lint": "eslint --fix *.js *.ts packages plugins scripts",
         "version": "tsx scripts/gen-version.ts",
-        "build": "pnpm run version && pnpm -r run build && cp packages/apps/workers/dist/index.js dist/index.js",
-        "deploy:dist": "wrangler deploy",
-        "deploy:build": "pnpm run build && wrangler deploy",
+        "build:core": "make core",
+        "build:next": "make next",
+        "build:local": "make local",
+        "build:vercel": "make vercel",
+        "build:workers": "make workers",
+        "build:workers-next": "make workers-next",
+        "build:all": "make all",
         "wrangler": "wrangler"
     },
     "workspaces": [

packages/apps/local/package.docker.json

@@ -0,0 +1,11 @@
+{
+  "name": "@chatgpt-telegram-workers/local",
+  "type": "module",
+  "version": "1.10.2",
+  "scripts": {
+    "start": "node index.js"
+  },
+  "dependencies": {
+    "cloudflare-worker-adapter": "^1.3.3"
+  }
+}

vercel.json

@@ -0,0 +1,9 @@
+{
+    "buildCommand": "pnpm run build",
+    "builds": [
+        { "src": "packages/apps/vercel/dist//**", "use": "@vercel/node" }
+    ],
+    "routes": [
+        { "src": "/(.*)", "dest": "/packages/apps/vercel/dist/**" }
+    ]
+}