From 8433e55811d643e84ece8a7186866fba6a497881 Mon Sep 17 00:00:00 2001 From: Tiger Kaovilai Date: Mon, 12 Aug 2024 17:44:49 -0400 Subject: [PATCH] ubi: BUILDPLATFORM to build stage to enable cross compile. (#336) Signed-off-by: Tiger Kaovilai --- Dockerfile-velero-restore-helper.ubi | 3 ++- Dockerfile.ubi | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Dockerfile-velero-restore-helper.ubi b/Dockerfile-velero-restore-helper.ubi index 7c168c05ed..9470ed75db 100644 --- a/Dockerfile-velero-restore-helper.ubi +++ b/Dockerfile-velero-restore-helper.ubi @@ -1,4 +1,5 @@ -FROM quay.io/konveyor/builder:ubi9-latest AS builder +FROM --platform=$BUILDPLATFORM quay.io/konveyor/builder:ubi9-latest AS builder +ARG BUILDPLATFORM ARG TARGETOS ARG TARGETARCH diff --git a/Dockerfile.ubi b/Dockerfile.ubi index 74a1899240..4b2f524849 100644 --- a/Dockerfile.ubi +++ b/Dockerfile.ubi @@ -1,4 +1,5 @@ -FROM quay.io/konveyor/builder:ubi9-latest AS builder +FROM --platform=$BUILDPLATFORM quay.io/konveyor/builder:ubi9-latest AS builder +ARG BUILDPLATFORM ARG TARGETOS ARG TARGETARCH @@ -11,7 +12,8 @@ WORKDIR /go/src/github.com/vmware-tanzu/velero RUN CGO_ENABLED=0 GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} go build -a -mod=mod -ldflags '-extldflags "-static" -X github.com/vmware-tanzu/velero/pkg/buildinfo.Version=konveyor-dev' -o /go/src/velero github.com/vmware-tanzu/velero/cmd/velero RUN CGO_ENABLED=0 GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} go build -a -mod=mod -ldflags '-extldflags "-static"' -o /go/src/velero-helper github.com/vmware-tanzu/velero/cmd/velero-helper -FROM quay.io/konveyor/builder:ubi9-latest AS restic-builder +FROM --platform=$BUILDPLATFORM quay.io/konveyor/builder:ubi9-latest AS restic-builder +ARG BUILDPLATFORM ARG TARGETOS ARG TARGETARCH