## 修改内容 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:
@@ -50,15 +50,14 @@ jobs:
|
|||||||
export TEST_JWT_SECRET="${{ secrets.TEST_JWT_SECRET }}"
|
export TEST_JWT_SECRET="${{ secrets.TEST_JWT_SECRET }}"
|
||||||
export ENCRYPTION_KEY="${{ secrets.ENCRYPTION_KEY }}"
|
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 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 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 up -d
|
|
||||||
docker image prune -f
|
docker image prune -f
|
||||||
|
|
||||||
echo "等待服务启动..."
|
echo "等待服务启动..."
|
||||||
sleep 10
|
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 "✅ 测试环境部署完成"
|
echo "✅ 测试环境部署完成"
|
||||||
|
|
||||||
- name: Deploy to production
|
- name: Deploy to production
|
||||||
@@ -71,13 +70,12 @@ jobs:
|
|||||||
export PROD_JWT_SECRET="${{ secrets.PROD_JWT_SECRET }}"
|
export PROD_JWT_SECRET="${{ secrets.PROD_JWT_SECRET }}"
|
||||||
export ENCRYPTION_KEY="${{ secrets.ENCRYPTION_KEY }}"
|
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 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 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 up -d
|
|
||||||
docker image prune -f
|
docker image prune -f
|
||||||
|
|
||||||
echo "等待服务启动..."
|
echo "等待服务启动..."
|
||||||
sleep 10
|
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 "✅ 生产环境部署完成"
|
echo "✅ 生产环境部署完成"
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ WORKDIR /app
|
|||||||
COPY pnpm-workspace.yaml pnpm-lock.yaml package.json ./
|
COPY pnpm-workspace.yaml pnpm-lock.yaml package.json ./
|
||||||
COPY packages/ ./packages/
|
COPY packages/ ./packages/
|
||||||
COPY apps/merchant-admin/ ./apps/merchant-admin/
|
COPY apps/merchant-admin/ ./apps/merchant-admin/
|
||||||
RUN npm install -g pnpm && pnpm install --frozen-lockfile
|
RUN npm install -g pnpm@8 && pnpm install --frozen-lockfile
|
||||||
RUN pnpm --filter @rent/shared-types build
|
RUN pnpm --filter @rent/shared-types build
|
||||||
RUN pnpm --filter @rent/shared-utils build
|
RUN pnpm --filter @rent/shared-utils build
|
||||||
RUN cd apps/merchant-admin && pnpm run build
|
RUN cd apps/merchant-admin && pnpm run build
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ WORKDIR /app
|
|||||||
COPY pnpm-workspace.yaml pnpm-lock.yaml package.json ./
|
COPY pnpm-workspace.yaml pnpm-lock.yaml package.json ./
|
||||||
COPY packages/ ./packages/
|
COPY packages/ ./packages/
|
||||||
COPY apps/platform-admin/ ./apps/platform-admin/
|
COPY apps/platform-admin/ ./apps/platform-admin/
|
||||||
RUN npm install -g pnpm && pnpm install --frozen-lockfile
|
RUN npm install -g pnpm@8 && pnpm install --frozen-lockfile
|
||||||
RUN pnpm --filter @rent/shared-types build
|
RUN pnpm --filter @rent/shared-types build
|
||||||
RUN pnpm --filter @rent/shared-utils build
|
RUN pnpm --filter @rent/shared-utils build
|
||||||
RUN cd apps/platform-admin && pnpm run build
|
RUN cd apps/platform-admin && pnpm run build
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ WORKDIR /app
|
|||||||
COPY pnpm-workspace.yaml pnpm-lock.yaml package.json ./
|
COPY pnpm-workspace.yaml pnpm-lock.yaml package.json ./
|
||||||
COPY packages/ ./packages/
|
COPY packages/ ./packages/
|
||||||
COPY apps/server/ ./apps/server/
|
COPY apps/server/ ./apps/server/
|
||||||
RUN npm install -g pnpm && pnpm install --frozen-lockfile
|
RUN npm install -g pnpm@8 && pnpm install --frozen-lockfile
|
||||||
RUN cd apps/server && pnpm run build
|
RUN cd apps/server && pnpm run build
|
||||||
|
|
||||||
FROM node:18-alpine AS server
|
FROM node:18-alpine AS server
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ WORKDIR /app
|
|||||||
COPY pnpm-workspace.yaml pnpm-lock.yaml package.json ./
|
COPY pnpm-workspace.yaml pnpm-lock.yaml package.json ./
|
||||||
COPY packages/ ./packages/
|
COPY packages/ ./packages/
|
||||||
COPY apps/official-website/ ./apps/official-website/
|
COPY apps/official-website/ ./apps/official-website/
|
||||||
RUN npm install -g pnpm && pnpm install --frozen-lockfile
|
RUN npm install -g pnpm@8 && pnpm install --frozen-lockfile
|
||||||
RUN cd apps/official-website && pnpm run build
|
RUN cd apps/official-website && pnpm run build
|
||||||
|
|
||||||
FROM nginx:alpine AS website
|
FROM nginx:alpine AS website
|
||||||
|
|||||||
Reference in New Issue
Block a user