From 3717f4f3b1052e89e0dac097e1fb4572f6c748f5 Mon Sep 17 00:00:00 2001
From: Dominik Rosiek <drosiek@sumologic.com>
Date: Wed, 28 Feb 2024 15:20:03 +0100
Subject: [PATCH] chore: use docker manifest instead of docker buildx

Signed-off-by: Dominik Rosiek <drosiek@sumologic.com>
---
 ci/push_docker_multiplatform_manifest.sh | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/ci/push_docker_multiplatform_manifest.sh b/ci/push_docker_multiplatform_manifest.sh
index 11c964cd52..437c64805d 100755
--- a/ci/push_docker_multiplatform_manifest.sh
+++ b/ci/push_docker_multiplatform_manifest.sh
@@ -74,13 +74,20 @@ function push_manifest() {
 
     echo
     set -x
-    docker buildx imagetools create --tag \
+    # Use docker manifest as docker buildx didn't create "${REPO_URL}:${BUILD_TAG}" correctly. It was containing only linux/amd64 image
+    docker manifest create \
         "${REPO_URL}:${BUILD_TAG}" \
         "${TAGS_IN_MANIFEST[@]}"
 
-    docker buildx imagetools create --tag \
+    docker manifest push \
+        "${REPO_URL}:${BUILD_TAG}"
+
+    docker manifest create \
         "${REPO_URL}:latest${BUILD_TYPE_SUFFIX}" \
         "${TAGS_IN_MANIFEST[@]}"
+
+    docker manifest push \
+        "${REPO_URL}:latest${BUILD_TYPE_SUFFIX}"
 }
 
 push_manifest