xiaoquan/rent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修复 pnpm 版本和 docker compose 命令
Deploy / deploy (push) Failing after 1m36s
Details

Browse Source 
## 修改内容
1. 所有 Dockerfile 中指定 pnpm@8（兼容 lockfileVersion 6.0）
2. 工作流使用 docker compose（V2）而不是 docker-compose

## 修复的问题
- pnpm-lock.yaml 版本不兼容
- 容器中缺少 docker-compose 命令

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
xiaoquan
2026-06-10 19:42:53 +08:00
parent ab7ff9a59b
commit 85547d7043
5 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitea/workflows/deploy.yml
+8 -10
View File
@@ -50,15 +50,14 @@ jobs:
export TEST_JWT_SECRET="${{ secrets.TEST_JWT_SECRET }}"
export ENCRYPTION_KEY="${{ secrets.ENCRYPTION_KEY }}"
# 使用 docker compose（V2 版本，空格分隔）
docker compose -f docker-compose.test.yml down --remove-orphans || docker-compose -f docker-compose.test.yml down --remove-orphans
docker compose -f docker-compose.test.yml build --parallel || docker-compose -f docker-compose.test.yml build --parallel
docker compose -f docker-compose.test.yml up -d || docker-compose -f docker-compose.test.yml up -d
docker compose -f docker-compose.test.yml down --remove-orphans
docker compose -f docker-compose.test.yml build --parallel
docker compose -f docker-compose.test.yml up -d
docker image prune -f
echo "等待服务启动..."
sleep 10
docker compose -f docker-compose.test.yml ps || docker-compose -f docker-compose.test.yml ps
docker compose -f docker-compose.test.yml ps
echo "✅ 测试环境部署完成"
- name: Deploy to production
@@ -71,13 +70,12 @@ jobs:
export PROD_JWT_SECRET="${{ secrets.PROD_JWT_SECRET }}"
export ENCRYPTION_KEY="${{ secrets.ENCRYPTION_KEY }}"
# 使用 docker compose（V2 版本，空格分隔）
docker compose -f docker-compose.prod.yml down --remove-orphans || docker-compose -f docker-compose.prod.yml down --remove-orphans
docker compose -f docker-compose.prod.yml build --parallel || docker-compose -f docker-compose.prod.yml build --parallel
docker compose -f docker-compose.prod.yml up -d || docker-compose -f docker-compose.prod.yml up -d
docker compose -f docker-compose.prod.yml down --remove-orphans
docker compose -f docker-compose.prod.yml build --parallel
docker compose -f docker-compose.prod.yml up -d
docker image prune -f
echo "等待服务启动..."
sleep 10
docker compose -f docker-compose.prod.yml ps || docker-compose -f docker-compose.prod.yml ps
docker compose -f docker-compose.prod.yml ps
echo "✅ 生产环境部署完成"