nice try

Signed-off-by: Vince Prignano <[email protected]>
kubernetes-sigs · Apr 5, 2024 · 6582eb0 · 6582eb0
1 parent 2899f77
commit 6582eb0
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/.github/workflows/tools-releases.yml b/.github/workflows/tools-releases.yml
@@ -47,7 +47,7 @@ jobs:
         with:
           context: .
           file: ./hack/tools/envtest/${{matrix.os}}/Dockerfile
-          platforms: "{{matrix.os}}/{{matrix.arch}}"
+          platforms: "${{matrix.os}}/${{matrix.arch}}"
           build-args: |
             KUBERNETES_VERSION=v${{env.KUBERNETES_VERSION}}
           push: true

diff --git a/hack/tools/envtest/darwin/Dockerfile b/hack/tools/envtest/darwin/Dockerfile
@@ -22,6 +22,8 @@ FROM golang:1.21 as builder
 # Version and platform args.
 ARG KUBERNETES_VERSION
 ARG ETCD_VERSION=v3.5.13
+ARG TARGETOS
+ARG TARGETARCH
 
 # Tools path.
 ENV DEST=/usr/local/kubebuilder/bin/

diff --git a/hack/tools/envtest/linux/Dockerfile b/hack/tools/envtest/linux/Dockerfile
@@ -23,8 +23,8 @@ FROM alpine:3.19 as builder
 # Version and platform args.
 ARG KUBERNETES_VERSION
 ARG ETCD_VERSION=v3.5.13
-ARG OS=linux
-ARG ARCH
+ARG TARGETOS
+ARG TARGETARCH
 
 # Tools path.
 ENV DEST=/usr/local/kubebuilder/bin/

diff --git a/hack/tools/envtest/windows/Dockerfile b/hack/tools/envtest/windows/Dockerfile
@@ -22,8 +22,8 @@ FROM golang:1.21 as builder
 # Version and platform args.
 ARG KUBERNETES_VERSION
 ARG ETCD_VERSION=v3.5.13
-ARG OS=windows
-ARG ARCH
+ARG TARGETOS
+ARG TARGETARCH
 
 # Tools path.
 ENV DEST=/usr/local/kubebuilder/bin/