Fix image building.

spice-squid/build.gradle

@@ -5,44 +5,36 @@ plugins {
 dependencies {
 }
 
+project.ext.gitBranch = grgit.branch.current.name.replace('/', '-')
+def registry = "${project.rootProject.properties['docker.registry']}"
+
 task buildImage(type: Exec) {
     inputs.files 'Containerfile'
     
     commandLine 'podman', 'build', '--pull',
-        '-t', "${project.name}:${project.version}",\
+        '-t', "${project.name}:${project.gitBranch}",\
         '-f', 'Containerfile', '.'
 }
 
-task tagLatestImage(type: Exec) {
-    dependsOn buildImage
-    
-    enabled = !project.version.contains("SNAPSHOT")
-        && !project.version.contains("alpha") \
-        && !project.version.contains("beta") \
-        || project.rootProject.properties['docker.testRegistry'] \
-            && project.rootProject.properties['docker.registry'] \
-            == project.rootProject.properties['docker.testRegistry']
-
-    commandLine 'podman', 'tag', "${project.name}:${project.version}",\
-        "${project.name}:latest"
-}
-
-task buildLatestImage {
-    dependsOn buildImage
-    dependsOn tagLatestImage
-}
-
 task pushImage(type: Exec) {
     dependsOn buildImage
 
     commandLine 'podman', 'push', '--tls-verify=false', \
-        "localhost/${project.name}:${project.version}", \
-        "${project.rootProject.properties['docker.registry']}" \
-            + "/${project.name}:${project.version}"
+        "${project.name}:${project.gitBranch}", \
+        "${registry}/${project.name}:${project.gitBranch}"
+}
+task tagWithVersion(type: Exec) {
+    dependsOn pushImage
+
+    enabled = !project.version.contains("SNAPSHOT")
+    
+    commandLine 'podman', 'push', \
+        "${project.name}:${project.gitBranch}",\
+        "${registry}/${project.name}:${project.version}"
 }
 
-task pushLatestImage(type: Exec) {
-    dependsOn buildLatestImage
+task tagAsLatest(type: Exec) {
+    dependsOn tagWithVersion
 
     enabled = !project.version.contains("SNAPSHOT")
         && !project.version.contains("alpha") \
@@ -51,18 +43,16 @@ task pushLatestImage(type: Exec) {
             && project.rootProject.properties['docker.registry'] \
             == project.rootProject.properties['docker.testRegistry']
 
-    commandLine 'podman', 'push', '--tls-verify=false', \
-        "localhost/${project.name}:${project.version}", \
-        "${project.rootProject.properties['docker.registry']}" \
-            + "/${project.name}:latest"
+    commandLine 'podman', 'push', \
+        "${project.name}:${project.gitBranch}",\
+        "${registry}/${project.name}:latest"
 }
 
-task pushImages {
-	// Don't push without testing first
+task publishImage {
     dependsOn pushImage
-    dependsOn pushLatestImage
+    dependsOn tagWithVersion
+    dependsOn tagAsLatest
 }
-
 test {
     enabled = project.hasProperty("k8s.testCluster")