Skip to content

Commit 09cab8f

Browse files
committed
use local GOPROXY; support IMAGE_REGISTRY to override local build image
1 parent 211a0ef commit 09cab8f

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
ARG BASE_IMAGE=gcr.io/distroless/static:nonroot
22
ARG BUILDER_IMAGE=golang:1.23.0
3+
ARG GOPROXY=direct
34

45
# Build the manager binary
56
FROM ${BUILDER_IMAGE} AS builder
67
ARG TARGETOS=linux
78
ARG TARGETARCH=amd64
89
ARG CGO_ENABLED=0
10+
ENV GOPROXY=${GOPROXY}
911

1012
WORKDIR /workspace
1113
# Copy the Go Modules manifests

Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,11 @@ BASE_IMAGE ?= gcr.io/distroless/static:nonroot
6262
DOCKER_BUILDX_CMD ?= docker buildx
6363
IMAGE_BUILD_CMD ?= $(DOCKER_BUILDX_CMD) build
6464
IMAGE_BUILD_EXTRA_OPTS ?=
65-
IMAGE_REGISTRY ?= inftyai
65+
IMAGE_REGISTRY ?= $(IMAGE_REGISTRY:-inftyai)
6666
IMAGE_NAME ?= llmaz
6767
IMAGE_REPO := $(IMAGE_REGISTRY)/$(IMAGE_NAME)
6868
GIT_TAG ?= $(shell git describe --tags --dirty --always)
69+
GOPROXY=${GOPROXY:-""}
6970
IMG ?= $(IMAGE_REPO):$(GIT_TAG)
7071
BUILDER_IMAGE ?= golang:$(GO_VERSION)
7172
KIND_CLUSTER_NAME ?= kind
@@ -176,6 +177,7 @@ run: manifests generate fmt vet ## Run a controller from your host.
176177
PLATFORMS ?= linux/arm64,linux/amd64,linux/s390x,linux/ppc64le
177178
.PHONY: docker-buildx
178179
docker-buildx: ## Build and push docker image for the manager for cross-platform support
180+
export GOPROXY=$(GOPROXY)
179181
# copy existing Dockerfile and insert --platform=${BUILDPLATFORM} into Dockerfile.cross, and preserve the original Dockerfile
180182
sed -e '1 s/\(^FROM\)/FROM --platform=\$$\{BUILDPLATFORM\}/; t' -e ' 1,// s//FROM --platform=\$$\{BUILDPLATFORM\}/' Dockerfile > Dockerfile.cross
181183
- $(CONTAINER_TOOL) buildx create --name project-v3-builder

0 commit comments

Comments
 (0)