Merge remote-tracking branch 'upstream/main' into discv5_ipv6

Signed-off-by: Usman Saleem <usman@usmans.info>

Author: usmansaleem

build.gradle

@@ -1003,90 +1003,89 @@ task dockerUpload(type: Exec) {
   args "-c", cmd
 }
 
-task dockerUploadRelease {
-  def archs = ["arm64", "amd64"]
+task dockerUploadReleaseArm64(type: Exec) {
+  def architecture = "arm64"
   def image = "${dockerImageName}:${dockerBuildVersion}"
 
-  doLast {
-    for (def architecture in archs) {
-
-      exec {
-        def cmd = "docker pull '${image}-${architecture}' && docker tag '${image}-${architecture}' '${dockerImageName}:latest-${architecture}'"
-        println "Executing '${cmd}'"
-        executable shell
-        args "-c", cmd
-      }
-      exec {
-        def cmd = "docker push '${dockerImageName}:latest-${architecture}'"
-        println "Executing '${cmd}'"
-        executable shell
-        args "-c", cmd
-      }
+  doFirst {
+    def cmd = "docker pull '${image}-${architecture}' && docker tag '${image}-${architecture}' '${dockerImageName}:latest-${architecture}' && docker push '${dockerImageName}:latest-${architecture}'"
+    println "Executing '${cmd}'"
+    commandLine shell, "-c", cmd
+  }
+}
 
+task dockerUploadReleaseAmd64(type: Exec) {
+  def architecture = "amd64"
+  def image = "${dockerImageName}:${dockerBuildVersion}"
 
-      exec {
-        def archImage = "${image}-${architecture}"
-        def cmd = "docker pull '${archImage}' && docker tag ${archImage} '${dockerImageName}:latest-${architecture}'"
-        println "Executing '${cmd}'"
-        executable shell
-        args "-c", cmd
-      }
-      exec {
-        def cmd = "docker push '${dockerImageName}:latest-${architecture}'"
-        println "Executing '${cmd}'"
-        executable shell
-        args "-c", cmd
-      }
-    }
+  doFirst {
+    def cmd = "docker pull '${image}-${architecture}' && docker tag '${image}-${architecture}' '${dockerImageName}:latest-${architecture}' && docker push '${dockerImageName}:latest-${architecture}'"
+    println "Executing '${cmd}'"
+    commandLine shell, "-c", cmd
   }
 }
 
-task manifestDocker {
+task dockerUploadRelease {
+  dependsOn dockerUploadReleaseArm64, dockerUploadReleaseAmd64
+}
+
+task manifestDockerCreate(type: Exec) {
   def image = "${dockerImageName}:${dockerBuildVersion}"
   def archs = [
     "arm64",
     "amd64"] //TODO: this assumes dockerUpload task has already been run on 2 different archs!
-  doLast {
-    exec {
-      def targets = ""
-      archs.forEach { arch -> targets += "'${image}-${arch}' " }
-      def cmd = "docker manifest create '${image}' ${targets}"
-      println "Executing '${cmd}'"
-      executable shell
-      args "-c", cmd
-    }
-    exec {
-      def cmd = "docker manifest push '${image}'"
-      println "Executing '${cmd}'"
-      executable shell
-      args "-c", cmd
-    }
+  doFirst {
+    def targets = ""
+    archs.forEach { arch -> targets += "'${image}-${arch}' " }
+    def cmd = "docker manifest create '${image}' ${targets}"
+    println "Executing '${cmd}'"
+    commandLine shell, "-c", cmd
   }
 }
 
-task manifestDockerRelease {
+task manifestDockerPush(type: Exec) {
+  dependsOn manifestDockerCreate
+  def image = "${dockerImageName}:${dockerBuildVersion}"
+
+  doFirst {
+    def cmd = "docker manifest push '${image}'"
+    println "Executing '${cmd}'"
+    commandLine shell, "-c", cmd
+  }
+}
+
+task manifestDocker {
+  dependsOn manifestDockerPush
+}
+
+task manifestDockerReleaseCreate(type: Exec) {
   def archs = ["arm64", "amd64"]
-  def baseTag = "${dockerImageName}:latest";
+  def baseTag = "${dockerImageName}:latest"
 
-  doLast {
+  doFirst {
+    def targets = ""
+    archs.forEach { arch -> targets += "'${baseTag}-${arch}' " }
+    def cmd = "docker manifest create '${baseTag}' ${targets} --amend"
+    println "Executing '${cmd}'"
+    commandLine shell, "-c", cmd
+  }
+}
 
-    exec {
-      def targets = ""
-      archs.forEach { arch -> targets += "'${baseTag}-${arch}' " }
-      def cmd = "docker manifest create '${baseTag}' ${targets} --amend"
-      println "Executing '${cmd}'"
-      executable shell
-      args "-c", cmd
-    }
-    exec {
-      def cmd = "docker manifest push '${baseTag}'"
-      println "Executing '${cmd}'"
-      executable shell
-      args "-c", cmd
-    }
+task manifestDockerReleasePush(type: Exec) {
+  dependsOn manifestDockerReleaseCreate
+  def baseTag = "${dockerImageName}:latest"
+
+  doFirst {
+    def cmd = "docker manifest push '${baseTag}'"
+    println "Executing '${cmd}'"
+    commandLine shell, "-c", cmd
   }
 }
 
+task manifestDockerRelease {
+  dependsOn manifestDockerReleasePush
+}
+
 def sep = Pattern.quote(File.separator)
 
 jacocoTestReport {