From 1aa9d9efb51f08f70272e38143c2555711d24804 Mon Sep 17 00:00:00 2001
From: Jean-Marc ANDRE <jeanmarc.jim.andre@gmail.com>
Date: Thu, 20 Apr 2023 08:34:04 +0200
Subject: [PATCH] Makefile/Dockerfile cleanup

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

diff --git a/Dockerfile b/Dockerfile
index de1ce64..314c5bc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # Build a small image
-FROM --platform=${BUILDPLATFORM} golang:alpine3 AS builder
+FROM --platform=${BUILDPLATFORM} golang:alpine3.17 AS builder
 ARG TARGETOS
 ARG TARGETARCH 
 ARG TARGETPLATFORM
diff --git a/Makefile b/Makefile
index 6fbfadb..f1364a9 100644
--- a/Makefile
+++ b/Makefile
@@ -20,15 +20,11 @@ vet:
 
 .PHONY: docker-build-multiarch
 docker-build-multiarch:
-	buildah bud --manifest $(MANIFEST) --platform=$(PLATFORMS) .
+	buildah bud --manifest $(MANIFEST) --platform=$(PLATFORMS) --layers .
 
 .PHONY: docker-push
 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