From 162e82b531c60deb57c86ca566819660d09bb0cb Mon Sep 17 00:00:00 2001
From: Jean-Marc Andre <jandre@desmojim.fr>
Date: Tue, 18 Apr 2023 17:21:23 +0200
Subject: [PATCH] makefile

---
 Dockerfile | 3 ++-
 Makefile   | 6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 868bc0e..010abfa 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,9 @@
 # Build a small image
-FROM golang:alpine3.17 AS builder
+FROM --platform=$BUILDPLATFORM golang:alpine3.17 AS builder
 
 WORKDIR /go/src
 COPY . .
+ARG TARGETOS TARGETARCH
 RUN GO111MODULE=on CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -o bin/formolcli main.go
 
 FROM alpine:3.17
diff --git a/Makefile b/Makefile
index 700240b..2a5b0a3 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ GOARCH ?= amd64
 GOOS ?= linux
 VERSION ?= latest
 IMG ?= docker.io/desmo999r/formolcli:$(VERSION)
-MANIFEST = formol-multiarch
+MANIFEST = formolcli-multiarch
 BINDIR = ./bin
 
 .PHONY: formolcli
@@ -33,5 +33,9 @@ docker-build-arm64: docker-build
 docker-push: 
 	buildah manifest push --all --rm $(MANIFEST) "docker://$(IMG)"
 
+.PHONY: docker-build-multiarch
+docker-build-multiarch: 
+	buildah bud --manifest $(MANIFEST) --platform linux/amd64,linux/arm64/v8 .
+
 .PHONY: all
 all: formolcli docker-build