Skip to content

Commit abef7bc

Browse files
authored
Merge pull request #44 from rancher/build-for-arch
(fix) build with target platforms
2 parents 63efaf5 + f53b240 commit abef7bc

File tree

2 files changed

+5
-10
lines changed

2 files changed

+5
-10
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ clean: ## clean up project.
2323
build-image: buildx-machine ## build (and load) the container image targeting the current platform.
2424
$(IMAGE_BUILDER) build -f package/Dockerfile \
2525
--builder $(MACHINE) $(IMAGE_ARGS) \
26-
--build-arg VERSION=$(VERSION) -t "$(FULL_IMAGE_TAG)" $(BUILD_ACTION) .
26+
--build-arg VERSION=$(VERSION) --platform=$(TARGET_PLATFORMS) -t "$(FULL_IMAGE_TAG)" $(BUILD_ACTION) .
2727
@echo "Built $(FULL_IMAGE_TAG)"
2828

2929
push-image: buildx-machine ## build the container image targeting all platforms defined by TARGET_PLATFORMS and push to a registry.

hack/make/deps.mk

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,20 @@
1-
KUBECTL1_VERSION := v1.29.12
1+
KUBECTL1_VERSION := v1.30.8
22
KUBECTL1_SUM_arm64 ?= $(shell curl -L "https://dl.k8s.io/release/$(KUBECTL1_VERSION)/bin/linux/arm64/kubectl.sha256")
33
KUBECTL1_SUM_amd64 ?= $(shell curl -L "https://dl.k8s.io/release/$(KUBECTL1_VERSION)/bin/linux/amd64/kubectl.sha256")
44

5-
KUBECTL2_VERSION := v1.30.8
5+
KUBECTL2_VERSION := v1.31.4
66
KUBECTL2_SUM_arm64 ?= $(shell curl -L "https://dl.k8s.io/release/$(KUBECTL2_VERSION)/bin/linux/arm64/kubectl.sha256")
77
KUBECTL2_SUM_amd64 ?= $(shell curl -L "https://dl.k8s.io/release/$(KUBECTL2_VERSION)/bin/linux/amd64/kubectl.sha256")
88

9-
KUBECTL3_VERSION := v1.31.4
9+
KUBECTL3_VERSION := v1.32.0
1010
KUBECTL3_SUM_arm64 ?= $(shell curl -L "https://dl.k8s.io/release/$(KUBECTL3_VERSION)/bin/linux/arm64/kubectl.sha256")
1111
KUBECTL3_SUM_amd64 ?= $(shell curl -L "https://dl.k8s.io/release/$(KUBECTL3_VERSION)/bin/linux/amd64/kubectl.sha256")
1212

13-
KUBECTL4_VERSION := v1.32.0
14-
KUBECTL4_SUM_arm64 ?= $(shell curl -L "https://dl.k8s.io/release/$(KUBECTL4_VERSION)/bin/linux/arm64/kubectl.sha256")
15-
KUBECTL4_SUM_amd64 ?= $(shell curl -L "https://dl.k8s.io/release/$(KUBECTL4_VERSION)/bin/linux/amd64/kubectl.sha256")
16-
1713
KUBECTL1 := "$(KUBECTL1_VERSION):$(KUBECTL1_SUM_arm64):$(KUBECTL1_SUM_amd64)"
1814
KUBECTL2 := "$(KUBECTL2_VERSION):$(KUBECTL2_SUM_arm64):$(KUBECTL2_SUM_amd64)"
1915
KUBECTL3 := "$(KUBECTL3_VERSION):$(KUBECTL3_SUM_arm64):$(KUBECTL3_SUM_amd64)"
20-
KUBECTL4 := "$(KUBECTL4_VERSION):$(KUBECTL4_SUM_arm64):$(KUBECTL4_SUM_amd64)"
2116

22-
KUBECTL_VERSION_INFO := "$(KUBECTL1) $(KUBECTL2) $(KUBECTL3) $(KUBECTL4)"
17+
KUBECTL_VERSION_INFO := "$(KUBECTL1) $(KUBECTL2) $(KUBECTL3)"
2318

2419
# Reduces the code duplication on Makefile by keeping all args into a single variable.
2520
IMAGE_ARGS := --build-arg KUBECTL_VERSION_INFO=$(KUBECTL_VERSION_INFO)

0 commit comments

Comments
 (0)