From 53369058b9a6ac04d9b1d4d70d6047042faddfca Mon Sep 17 00:00:00 2001
From: Jean-Marc Andre <jandre@desmojim.fr>
Date: Wed, 8 Feb 2023 17:58:54 +0100
Subject: [PATCH] Faster build

---
 Dockerfile       |  2 --
 Dockerfile.amd64 |  8 ++++++++
 Makefile         | 11 ++++++-----
 3 files changed, 14 insertions(+), 7 deletions(-)
 create mode 100644 Dockerfile.amd64

diff --git a/Dockerfile b/Dockerfile
index 27b86a2..868bc0e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,6 @@
 # Build a small image
 FROM golang:alpine3.17 AS builder
 
-ARG TARGETARCH
-RUN echo "I'm building for $TARGETARCH"
 WORKDIR /go/src
 COPY . .
 RUN GO111MODULE=on CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -o bin/formolcli main.go
diff --git a/Dockerfile.amd64 b/Dockerfile.amd64
new file mode 100644
index 0000000..b603055
--- /dev/null
+++ b/Dockerfile.amd64
@@ -0,0 +1,8 @@
+# Build a small image
+FROM alpine:3.17
+RUN apk add --no-cache su-exec restic postgresql-client
+COPY ./bin/formolcli /usr/local/bin
+
+# Command to run
+ENTRYPOINT ["/usr/local/bin/formolcli"]
+CMD ["--help"]
diff --git a/Makefile b/Makefile
index 3a8beca..cd9fa58 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,10 @@
 GOARCH ?= amd64
 GOOS ?= linux
-IMG ?= desmo999r/formolcli:latest
+IMG ?= docker.io/desmo999r/formolcli:latest
 BINDIR = ./bin
 
-$(BINDIR)/formolcli: fmt vet
+.PHONY: formolcli
+formolcli: fmt vet
 	GO111MODULE=on CGO_ENABLED=0 GOOS=$(GOOS) GOARCH=$(GOARCH) go build -o $(BINDIR)/formolcli main.go
 
 .PHONY: fmt
@@ -15,12 +16,12 @@ vet:
 	go vet ./...
 
 .PHONY: docker-build
-docker-build: $(BINDIR)/formolcli
-	buildah build --disable-compression --format=docker --platform $(GOOS)/$(GOARCH) -t $(IMG) .
+docker-build: formolcli
+	buildah bud --disable-compression --format=docker --platform $(GOOS)/$(GOARCH) --manifest $(IMG) Dockerfile.$(GOARCH)
 
 .PHONY: docker-push
 docker-push: docker-build
 	buildah push $(IMG)
 
 .PHONY: all
-all: $(BINDIR)/formolcli docker-build
+all: formolcli docker-build