From 7aa2a95fac5bb463ad6e989f1583928d51aed704 Mon Sep 17 00:00:00 2001 From: zhouyonggao <1971162852@qq.com> Date: Tue, 2 Dec 2025 16:38:35 +0800 Subject: [PATCH] =?UTF-8?q?build(docker):=20=E6=B7=BB=E5=8A=A0=20BASE=5FRE?= =?UTF-8?q?GISTRY=20=E5=8F=82=E6=95=B0=E4=BB=A5=E6=94=AF=E6=8C=81=E8=87=AA?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=E5=9F=BA=E7=A1=80=E9=95=9C=E5=83=8F=E4=BB=93?= =?UTF-8?q?=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 允许通过 BASE_REGISTRY 参数指定基础镜像仓库地址,提高部署灵活性 --- Dockerfile | 6 ++++-- scripts/deploy_docker.sh | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6914713..7847f82 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,5 @@ -FROM golang:1.21-alpine AS build +ARG BASE_REGISTRY=docker.io +FROM ${BASE_REGISTRY}/library/golang:1.21-alpine AS build ARG ALPINE_MIRROR=mirrors.aliyun.com RUN sed -i "s/dl-cdn.alpinelinux.org/${ALPINE_MIRROR}/g" /etc/apk/repositories || true ARG GOPROXY=https://goproxy.cn,direct @@ -10,7 +11,8 @@ COPY web/ ./web/ WORKDIR /app/server RUN go env -w GOPROXY=$GOPROXY && go build -o /app/bin/marketing-data-server ./cmd/server -FROM alpine:3.19 +ARG BASE_REGISTRY=docker.io +FROM ${BASE_REGISTRY}/library/alpine:3.19 ARG ALPINE_MIRROR=mirrors.aliyun.com RUN sed -i "s/dl-cdn.alpinelinux.org/${ALPINE_MIRROR}/g" /etc/apk/repositories || true WORKDIR /app diff --git a/scripts/deploy_docker.sh b/scripts/deploy_docker.sh index fde7363..1e04079 100644 --- a/scripts/deploy_docker.sh +++ b/scripts/deploy_docker.sh @@ -12,6 +12,7 @@ if docker image inspect "$IMAGE:$TAG" >/dev/null 2>&1; then --build-arg BUILDKIT_INLINE_CACHE=1 \ --build-arg GOPROXY="${GOPROXY:-https://goproxy.cn,direct}" \ --build-arg ALPINE_MIRROR="${ALPINE_MIRROR:-mirrors.aliyun.com}" \ + --build-arg BASE_REGISTRY="${BASE_REGISTRY:-docker.io}" \ --cache-from "$IMAGE:$TAG" -t "$IMAGE:$TAG" -f Dockerfile . else echo "镜像不存在,开始构建: $IMAGE:$TAG" @@ -19,6 +20,7 @@ else --build-arg BUILDKIT_INLINE_CACHE=1 \ --build-arg GOPROXY="${GOPROXY:-https://goproxy.cn,direct}" \ --build-arg ALPINE_MIRROR="${ALPINE_MIRROR:-mirrors.aliyun.com}" \ + --build-arg BASE_REGISTRY="${BASE_REGISTRY:-docker.io}" \ -t "$IMAGE:$TAG" -f Dockerfile . fi mkdir -p log storage/export