diff --git a/Dockerfile b/Dockerfile index 78e292d..7860d67 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,14 +4,11 @@ FROM node:20-alpine as build-stage # 设置工作目录 WORKDIR /app -# # 设置 npm 淘宝镜像源 -# RUN npm config set registry http://mirrors.cloud.tencent.com/npm/ - # 复制package.json和package-lock.json COPY package*.json ./ -# 安装依赖 -RUN npm install +# 安装依赖,处理rollup问题 +RUN npm ci --legacy-peer-deps || npm install --legacy-peer-deps # 复制项目文件 COPY . . diff --git a/docker-compose.yml b/docker-compose.yml index f95505a..0ab53f7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,11 +1,9 @@ -version: '3' - services: app: build: context: . dockerfile: Dockerfile - image: tradus-web:1.3.33 + image: tradus-web:1.3.34 container_name: tradus-web ports: - '6000:80' diff --git a/package.json b/package.json index 0145b38..ed78008 100644 --- a/package.json +++ b/package.json @@ -14,6 +14,9 @@ "lint": "eslint . --fix", "format": "prettier --write src/" }, + "overrides": { + "rollup": "^4.0.0" + }, "dependencies": { "marked": "^15.0.11", "mermaid": "^11.6.0",