From 4547ce7fed6f4d8dc7c0f7cc1fc0fa6a861832a1 Mon Sep 17 00:00:00 2001 From: Chever John Date: Wed, 17 Jun 2026 10:17:39 +0800 Subject: [PATCH] fix: use Harbor base images and Chinese Go proxy for CI builds Docker Hub and proxy.golang.org unreachable from k3s cluster (GFW). Switch Dockerfiles to Harbor base images and goproxy.cn. Co-Authored-By: Claude --- deploy/Dockerfile.gateway | 6 ++++-- deploy/Dockerfile.inventory | 6 ++++-- deploy/Dockerfile.system | 6 ++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/deploy/Dockerfile.gateway b/deploy/Dockerfile.gateway index d2f88be..fc85a72 100644 --- a/deploy/Dockerfile.gateway +++ b/deploy/Dockerfile.gateway @@ -1,4 +1,6 @@ -FROM golang:1.24-alpine AS builder +ARG BASE_REGISTRY=harbor-in-k3s.cheverjohn.me/library +FROM ${BASE_REGISTRY}/golang:1.24-alpine AS builder +ENV GOPROXY=https://goproxy.cn,direct RUN apk add --no-cache git WORKDIR /app COPY go.mod go.sum ./ @@ -6,7 +8,7 @@ RUN go mod download COPY . . RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o /server ./gateway/gateway.go -FROM alpine:3.20 +FROM ${BASE_REGISTRY}/alpine:3.20 RUN apk add --no-cache ca-certificates tzdata WORKDIR /app COPY --from=builder /server ./gateway diff --git a/deploy/Dockerfile.inventory b/deploy/Dockerfile.inventory index a056444..61f6c64 100644 --- a/deploy/Dockerfile.inventory +++ b/deploy/Dockerfile.inventory @@ -1,4 +1,6 @@ -FROM golang:1.24-alpine AS builder +ARG BASE_REGISTRY=harbor-in-k3s.cheverjohn.me/library +FROM ${BASE_REGISTRY}/golang:1.24-alpine AS builder +ENV GOPROXY=https://goproxy.cn,direct RUN apk add --no-cache git WORKDIR /app COPY go.mod go.sum ./ @@ -6,7 +8,7 @@ RUN go mod download COPY . . RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o /server ./rpc/inventory/inventory.go -FROM alpine:3.20 +FROM ${BASE_REGISTRY}/alpine:3.20 RUN apk add --no-cache ca-certificates tzdata WORKDIR /app COPY --from=builder /server ./inventory diff --git a/deploy/Dockerfile.system b/deploy/Dockerfile.system index b939a03..875f181 100644 --- a/deploy/Dockerfile.system +++ b/deploy/Dockerfile.system @@ -1,4 +1,6 @@ -FROM golang:1.24-alpine AS builder +ARG BASE_REGISTRY=harbor-in-k3s.cheverjohn.me/library +FROM ${BASE_REGISTRY}/golang:1.24-alpine AS builder +ENV GOPROXY=https://goproxy.cn,direct RUN apk add --no-cache git WORKDIR /app COPY go.mod go.sum ./ @@ -6,7 +8,7 @@ RUN go mod download COPY . . RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o /server ./rpc/system/system.go -FROM alpine:3.20 +FROM ${BASE_REGISTRY}/alpine:3.20 RUN apk add --no-cache ca-certificates tzdata WORKDIR /app COPY --from=builder /server ./system