From 1f2baef062e1865de9e5da189a7d8d04b257c615 Mon Sep 17 00:00:00 2001
From: Jean-Marc ANDRE <jeanmarc.jim.andre@gmail.com>
Date: Fri, 14 Apr 2023 20:54:26 +0200
Subject: [PATCH] reworked the multiplatform Makefile

---
 Dockerfile.arm64 |  2 +-
 Makefile         | 18 ++++++++++++++----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/Dockerfile.arm64 b/Dockerfile.arm64
index 083758d..5e39629 100644
--- a/Dockerfile.arm64
+++ b/Dockerfile.arm64
@@ -1,6 +1,6 @@
 # Build a small image
 FROM --platform=linux/arm64 alpine:3
-RUN apk add --no-cache su-exec restic postgresql-client
+RUN apk add --no-cache su-exec restic
 COPY ./bin/formolcli /usr/local/bin
 
 # Command to run
diff --git a/Makefile b/Makefile
index aeece64..700240b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,18 @@
 GOARCH ?= amd64
 GOOS ?= linux
-IMG ?= docker.io/desmo999r/formolcli:latest
+VERSION ?= latest
+IMG ?= docker.io/desmo999r/formolcli:$(VERSION)
+MANIFEST = formol-multiarch
 BINDIR = ./bin
 
 .PHONY: formolcli
 formolcli: fmt vet
 	GO111MODULE=on CGO_ENABLED=0 GOOS=$(GOOS) GOARCH=$(GOARCH) go build -o $(BINDIR)/formolcli main.go
 
+#.PHONY: formolcli-arm64
+#formolcli-arm64: GOARCH = arm64
+#formolcli-arm64: formolcli
+
 .PHONY: fmt
 fmt:
 	go fmt ./...
@@ -17,11 +23,15 @@ vet:
 
 .PHONY: docker-build
 docker-build: formolcli
-	buildah bud --tag $(IMG) Dockerfile.$(GOARCH)
+	buildah bud --tag $(IMG) --manifest $(MANIFEST) --arch $(GOARCH) Dockerfile.$(GOARCH)
+
+.PHONY: docker-build-arm64
+docker-build-arm64: GOARCH = arm64
+docker-build-arm64: docker-build
 
 .PHONY: docker-push
-docker-push: docker-build
-	buildah push $(IMG)
+docker-push: 
+	buildah manifest push --all --rm $(MANIFEST) "docker://$(IMG)"
 
 .PHONY: all
 all: formolcli docker-build