From d3c7268eda077a4a00d909fa72a1ac5f2a216c7b Mon Sep 17 00:00:00 2001
From: garyschulte <garyschulte@gmail.com>
Date: Wed, 11 May 2022 07:42:24 -0700
Subject: [PATCH] Fix for multi-arch docker develop and latest tags  (#3816)

* fix and test docker manifest step for develop and latest tags

Signed-off-by: garyschulte <garyschulte@gmail.com>
---
 build.gradle | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index 015d0e123a..a1e7d9101e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -780,19 +780,19 @@ task manifestDocker {
   def image = "${dockerImage}:${dockerBuildVersion}"
   def archs = ["arm64", "amd64"]
   def tags = ["${image}"]
+
   if (project.hasProperty('branch') && project.property('branch') == 'main') {
-    tags.add("${dockerImage}-develop")
+    tags.add("${dockerImage}:develop")
   }
 
   if (!(dockerBuildVersion ==~ /.*-SNAPSHOT/)) {
-    tags.add('${dockerImage}-latest')
-    tags.add('${dockerImage}-' + dockerBuildVersion.split(/\./)[0..1].join('.'))
+    tags.add('${dockerImage}:latest')
+    tags.add('${dockerImage}:' + dockerBuildVersion.split(/\./)[0..1].join('.'))
   }
 
   doLast {
     for (baseTag in tags) {
       for (def variant in dockerVariants) {
-        // Just do variant images for now, later add tags and such
         def variantImage = "${baseTag}-${variant}"
         def targets = ""
         archs.forEach { arch -> targets += "'${variantImage}-${arch}' " }