From e27dc7b52c8531ae348a63ce3cd218f5d4c02601 Mon Sep 17 00:00:00 2001
From: Simon Pasquier <spasquie@redhat.com>
Date: Mon, 4 Nov 2024 15:34:23 +0100
Subject: [PATCH] fix: pass the GOARCH variable to the build command

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
---
 Dockerfile                                | 4 +++-
 cmd/admission-webhook/Dockerfile          | 4 +++-
 cmd/prometheus-config-reloader/Dockerfile | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ffb80cf8a..fa4decac5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,13 +2,15 @@ ARG ARCH=amd64
 ARG OS=linux
 ARG GOLANG_BUILDER=1.23
 ARG GOARCH=
-FROM quay.io/prometheus/golang-builder:${GOLANG_BUILDER}-base as builder
+FROM quay.io/prometheus/golang-builder:${GOLANG_BUILDER}-base AS builder
 WORKDIR /workspace
 
 # Copy source files
 COPY . .
 
 # Build
+ENV GOOS=${OS}
+ENV GOARCH=${GOARCH}
 RUN make operator
 
 FROM quay.io/prometheus/busybox-${OS}-${ARCH}:latest
diff --git a/cmd/admission-webhook/Dockerfile b/cmd/admission-webhook/Dockerfile
index c0377a144..3470bda11 100644
--- a/cmd/admission-webhook/Dockerfile
+++ b/cmd/admission-webhook/Dockerfile
@@ -2,13 +2,15 @@ ARG ARCH=amd64
 ARG OS=linux
 ARG GOLANG_BUILDER=1.23
 ARG GOARCH=
-FROM quay.io/prometheus/golang-builder:${GOLANG_BUILDER}-base as builder
+FROM quay.io/prometheus/golang-builder:${GOLANG_BUILDER}-base AS builder
 WORKDIR /workspace
 
 # Copy source files
 COPY . .
 
 # Build
+ENV GOOS=${OS}
+ENV GOARCH=${GOARCH}
 RUN make admission-webhook
 
 FROM quay.io/prometheus/busybox-${OS}-${ARCH}:latest
diff --git a/cmd/prometheus-config-reloader/Dockerfile b/cmd/prometheus-config-reloader/Dockerfile
index f7f0fe59e..ed03e3954 100644
--- a/cmd/prometheus-config-reloader/Dockerfile
+++ b/cmd/prometheus-config-reloader/Dockerfile
@@ -2,13 +2,15 @@ ARG ARCH=amd64
 ARG OS=linux
 ARG GOLANG_BUILDER=1.23
 ARG GOARCH=
-FROM quay.io/prometheus/golang-builder:${GOLANG_BUILDER}-base as builder
+FROM quay.io/prometheus/golang-builder:${GOLANG_BUILDER}-base AS builder
 WORKDIR /workspace
 
 # Copy source files
 COPY . .
 
 # Build
+ENV GOOS=${OS}
+ENV GOARCH=${GOARCH}
 RUN make prometheus-config-reloader
 
 FROM quay.io/prometheus/busybox-${OS}-${ARCH}:latest