From d72f05bb0baec723b68612792b0fbcf1e84b2f57 Mon Sep 17 00:00:00 2001
From: Louis <lspgn@users.noreply.github.com>
Date: Tue, 14 Mar 2023 19:42:14 -0700
Subject: [PATCH] docker: fix build and push of manifest (#145)

---
 .github/workflows/docker-release.yml |  4 ++--
 .github/workflows/docker.yml         |  4 ++--
 Makefile                             | 14 ++++++++++++++
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/docker-release.yml b/.github/workflows/docker-release.yml
index efb0f42..a8a89ec 100644
--- a/.github/workflows/docker-release.yml
+++ b/.github/workflows/docker-release.yml
@@ -36,6 +36,6 @@ jobs:
     - name: Build
       run: |
         export VERSION=$(git describe --tags --abbrev=0 HEAD)
-        DOCKER_SUFFIX=-amd64 make docker push-docker
+        DOCKER_SUFFIX=-amd64 DOCKER_CMD='buildx build --push --platform linux/amd64' make docker
         DOCKER_SUFFIX=-arm64 DOCKER_CMD='buildx build --push --platform linux/arm64/v8' make docker
-        make docker-manifest-release
+        make docker-manifest-release-buildx
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 106bac0..e10bd73 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -34,6 +34,6 @@ jobs:
 
     - name: Build
       run: |
-        DOCKER_SUFFIX=-amd64 make docker push-docker
+        DOCKER_SUFFIX=-amd64 DOCKER_CMD='buildx build --push --platform linux/amd64' make docker
         DOCKER_SUFFIX=-arm64 DOCKER_CMD='buildx build --push --platform linux/arm64/v8' make docker
-        make docker-manifest
+        make docker-manifest-buildx
diff --git a/Makefile b/Makefile
index 535a422..4c26edc 100644
--- a/Makefile
+++ b/Makefile
@@ -80,6 +80,13 @@ docker-manifest:
 	    --amend $(DOCKER_REPO)$(NAME):$(ABBREV)-arm64
 	$(DOCKER_BIN) manifest push $(DOCKER_REPO)$(NAME):latest
 
+.PHONY: docker-manifest-buildx
+docker-manifest-buildx:
+	$(DOCKER_BIN) buildx imagetools create \
+	    -t $(DOCKER_REPO)$(NAME):$(ABBREV) \
+	    $(DOCKER_REPO)$(NAME):$(ABBREV)-amd64 \
+	    $(DOCKER_REPO)$(NAME):$(ABBREV)-arm64
+
 .PHONY: docker-manifest-release
 docker-manifest-release:
 	$(DOCKER_BIN) manifest create $(DOCKER_REPO)$(NAME):$(VERSION) \
@@ -87,6 +94,13 @@ docker-manifest-release:
 	    --amend $(DOCKER_REPO)$(NAME):$(ABBREV)-arm64
 	$(DOCKER_BIN) manifest push $(DOCKER_REPO)$(NAME):$(VERSION)
 
+.PHONY: docker-manifest-release-buildx
+docker-manifest-buildx:
+	$(DOCKER_BIN) buildx imagetools create \
+	    -t $(DOCKER_REPO)$(NAME):$(VERSION) \
+	    $(DOCKER_REPO)$(NAME):$(ABBREV)-amd64 \
+	    $(DOCKER_REPO)$(NAME):$(ABBREV)-arm64
+
 .PHONY: package-deb
 package-deb: prepare
 	fpm -s dir -t deb -n $(NAME) -v $(VERSION_PKG) \