diff --git a/app/Dockerfile b/app/Dockerfile index 836bec5..ada19b1 100644 --- a/app/Dockerfile +++ b/app/Dockerfile @@ -2,7 +2,11 @@ # Example: # docker build -f Dockerfile -t iotlcm-app-web:latest . -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 WORKDIR /build/app @@ -23,7 +27,7 @@ COPY src ./src COPY vite-plugins ./vite-plugins ARG VITE_SERVER_BASEURL=/app/api/v1 -ARG VITE_MP_SERVER_BASEURL=http://yznw2.xiujie.cn:8010/api/v1 +ARG VITE_MP_SERVER_BASEURL=/app/api/v1 ARG VITE_APP_PUBLIC_BASE=/app/ RUN printf '%s\n' \ @@ -35,7 +39,7 @@ RUN printf '%s\n' \ RUN pnpm init-baseFiles RUN CI=true pnpm build:h5:prod -FROM crpi-svwhn8x8nvask31h.cn-beijing.personal.cr.aliyuncs.com/xjzlpublic/nginx:1.30.0-alpine AS runtime +FROM ${BASE_REGISTRY}/nginx:1.30-alpine AS runtime COPY --from=builder /build/app/dist/build/h5 /usr/share/nginx/html diff --git a/server/Dockerfile b/server/Dockerfile index 73114aa..a3e8c4c 100644 --- a/server/Dockerfile +++ b/server/Dockerfile @@ -2,10 +2,13 @@ # Example: # docker build -f Dockerfile -t iotlcm-app-server:latest . -FROM crpi-svwhn8x8nvask31h.cn-beijing.personal.cr.aliyuncs.com/xjzlpublic/golangalpine:1.25.7-alpine3.23 AS builder +# 基础镜像仓库。默认使用 Docker Hub 官方镜像;内网环境可替换为自己的仓库: +# docker build --build-arg BASE_REGISTRY=harbor.example.com/library ... +ARG BASE_REGISTRY=docker.io/library + +FROM ${BASE_REGISTRY}/golang:1.25-alpine AS builder ENV GIT_TERMINAL_PROMPT=0 -ENV GOPRIVATE=git.xiujie.cn ENV GOPROXY=https://goproxy.cn,direct ENV TZ=Asia/Shanghai @@ -24,7 +27,7 @@ RUN go build -v -o /out/iotlcm-app-server \ -ldflags "-X main.BuildVersion=${BuildVersion} -X main.CommitID=${CommitID} -X main.BuildTime=${BuildTime}" \ . -FROM crpi-svwhn8x8nvask31h.cn-beijing.personal.cr.aliyuncs.com/xjzlpublic/alpine AS runtime +FROM ${BASE_REGISTRY}/alpine:3.23 AS runtime ENV TZ=Asia/Shanghai ENV APP_UPLOAD_DIR=/data/app/iotlcmadmin-web-svc/upload