From f754b27ac250d36482c52baad42199d86592ede6 Mon Sep 17 00:00:00 2001 From: MiFaZhan Date: Thu, 29 Oct 2026 13:33:25 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20Dockerfile=20=E5=9F=BA=E7=A1=80=E9=95=9C?= =?UTF-8?q?=E5=83=8F=E6=94=B9=E4=B8=BA=E5=85=AC=E5=85=B1=E4=BB=93=E5=BA=93?= =?UTF-8?q?=EF=BC=8C=E7=A7=BB=E9=99=A4=E7=A7=81=E6=9C=89=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - FROM 改为 ${BASE_REGISTRY}/<镜像>:<版本>,默认 docker.io/library 内网可传 --build-arg BASE_REGISTRY=<自有仓库>/library 覆盖 - iotlcm-app: 删除 ENV GOPRIVATE=git.xiujie.cn - iotlcm-app: VITE_MP_SERVER_BASEURL 默认值由内网域名改为 /app/api/v1 - Alpine 基础镜像固定到 3.23(原来未锁版本) --- vue/build/Dockerfile | 8 ++++++-- vue/build/DockerfileNoBuild | 6 +++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/vue/build/Dockerfile b/vue/build/Dockerfile index c24c17f..d58fafc 100644 --- a/vue/build/Dockerfile +++ b/vue/build/Dockerfile @@ -1,4 +1,8 @@ -FROM crpi-svwhn8x8nvask31h.cn-beijing.personal.cr.aliyuncs.com/xjzlpublic/node:24-alpine AS builder +# 基础镜像仓库。默认使用 Docker Hub 官方镜像;内网环境可替换为自己的仓库: +# docker build --build-arg BASE_REGISTRY=harbor.example.com/library ... +ARG BASE_REGISTRY=docker.io/library + +FROM ${BASE_REGISTRY}/node:24-alpine AS builder LABEL stage=gobuilder @@ -17,7 +21,7 @@ RUN npm config set registry https://registry.npmmirror.com/ && \ RUN CI=true pnpm install --frozen-lockfile RUN CI=true pnpm build -FROM crpi-svwhn8x8nvask31h.cn-beijing.personal.cr.aliyuncs.com/xjzlpublic/nginx:1.30.0-alpine AS alpine +FROM ${BASE_REGISTRY}/nginx:1.30-alpine AS alpine COPY --from=builder /build/vue/apps/web-antd/dist /usr/share/nginx/html COPY vue/build/nginx.conf /etc/nginx/conf.d/default.conf diff --git a/vue/build/DockerfileNoBuild b/vue/build/DockerfileNoBuild index ccdc07e..6006856 100644 --- a/vue/build/DockerfileNoBuild +++ b/vue/build/DockerfileNoBuild @@ -1,4 +1,8 @@ -FROM crpi-svwhn8x8nvask31h.cn-beijing.personal.cr.aliyuncs.com/xjzlpublic/nginx:1.30.0-alpine AS alpine +# 基础镜像仓库。默认使用 Docker Hub 官方镜像;内网环境可替换为自己的仓库: +# docker build --build-arg BASE_REGISTRY=harbor.example.com/library ... +ARG BASE_REGISTRY=docker.io/library + +FROM ${BASE_REGISTRY}/nginx:1.30-alpine AS alpine COPY vue/apps/web-antd/dist /usr/share/nginx/html COPY vue/build/nginx.conf /etc/nginx/conf.d/default.conf