From dfa0873919817fd1581c7af65f9a0de8b0099b43 Mon Sep 17 00:00:00 2001
From: aler9 <46489434+aler9@users.noreply.github.com>
Date: Mon, 20 Jul 2020 15:53:01 +0200
Subject: [PATCH] fix docker hub image generation

---
 Makefile | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 51a9d5e5..8cbad216 100644
--- a/Makefile
+++ b/Makefile
@@ -156,6 +156,7 @@ dockerhub:
 	$(eval VERSION := $(shell git describe --tags))
 
 	docker buildx rm builder 2>/dev/null || true
+	rm -rf $$HOME/.docker/manifests/*
 	docker buildx create --name=builder --use
 
 	echo "$$DOCKERFILE_IMAGE" | docker buildx build . -f - --build-arg VERSION=$(VERSION) \
@@ -170,24 +171,25 @@ dockerhub:
 	echo "$$DOCKERFILE_IMAGE" | docker buildx build . -f - --build-arg VERSION=$(VERSION) \
 	--push -t aler9/rtsp-simple-server:$(VERSION)-arm64v8 --build-arg OPTS="GOOS=linux GOARCH=arm64" --platform=linux/arm64/v8
 
-	docker manifest create --amend aler9/rtsp-simple-server:$(VERSION) \
+	docker manifest create aler9/rtsp-simple-server:$(VERSION) \
 	$(foreach ARCH,amd64 armv6 armv7 arm64v8,aler9/rtsp-simple-server:$(VERSION)-$(ARCH))
 	docker manifest push aler9/rtsp-simple-server:$(VERSION)
 
-	docker manifest create --amend aler9/rtsp-simple-server:latest-amd64 aler9/rtsp-simple-server:$(VERSION)-amd64
+	docker manifest create aler9/rtsp-simple-server:latest-amd64 aler9/rtsp-simple-server:$(VERSION)-amd64
 	docker manifest push aler9/rtsp-simple-server:latest-amd64
 
-	docker manifest create --amend aler9/rtsp-simple-server:latest-armv6 aler9/rtsp-simple-server:$(VERSION)-armv6
+	docker manifest create aler9/rtsp-simple-server:latest-armv6 aler9/rtsp-simple-server:$(VERSION)-armv6
 	docker manifest push aler9/rtsp-simple-server:latest-armv6
 
-	docker manifest create --amend aler9/rtsp-simple-server:latest-armv7 aler9/rtsp-simple-server:$(VERSION)-armv7
+	docker manifest create aler9/rtsp-simple-server:latest-armv7 aler9/rtsp-simple-server:$(VERSION)-armv7
 	docker manifest push aler9/rtsp-simple-server:latest-armv7
 
-	docker manifest create --amend aler9/rtsp-simple-server:latest-arm64v8 aler9/rtsp-simple-server:$(VERSION)-arm64v8
+	docker manifest create aler9/rtsp-simple-server:latest-arm64v8 aler9/rtsp-simple-server:$(VERSION)-arm64v8
 	docker manifest push aler9/rtsp-simple-server:latest-arm64v8
 
-	docker manifest create --amend aler9/rtsp-simple-server:latest \
-	$(foreach ARCH,amd64 armv6 armv7 arm64v8,aler9/rtsp-simple-server:latest-$(ARCH))
+	docker manifest create aler9/rtsp-simple-server:latest \
+	$(foreach ARCH,amd64 armv6 armv7 arm64v8,aler9/rtsp-simple-server:$(VERSION)-$(ARCH))
 	docker manifest push aler9/rtsp-simple-server:latest
 
 	docker buildx rm builder
+	rm -rf $$HOME/.docker/manifests/*