Replace custom docker build logic with dependency on distroless target

Author: sjvanrossum

runners/google-cloud-dataflow-java/build.gradle

@@ -318,24 +318,14 @@ tasks.register('buildAndPushDistrolessContainerImage', Task.class) {
     }
     def repository = "us.gcr.io/apache-beam-testing/${System.getenv('USER')}"
     def imageURL = "${repository}/beam_${javaVer}_sdk_distroless:${dockerTag}"
-    exec {
-      executable 'docker'
-      workingDir rootDir
-      args = [
-              'buildx',
-              'build',
-              '-t',
-              imageURL,
-              '-f',
-              'sdks/java/container/Dockerfile-distroless',
-              "--build-arg=BEAM_BASE=gcr.io/apache-beam-testing/beam-sdk/beam_${javaVer}_sdk",
-              "--build-arg=DISTROLESS_BASE=gcr.io/distroless/${javaVer}-debian12",
-              '.'
-      ]
-    }
-    exec {
-      executable 'docker'
-      args = ['push', imageURL]
+    dependsOn ":sdks:java:container:distroless:${javaVer}:docker"
+    doLast {
+      exec {
+        commandLine "docker", "tag", "${defaultDockerImageName}", "${dockerJavaImageName}"
+      }
+      exec {
+        commandLine "gcloud", "docker", "--", "push", "${dockerJavaImageName}"
+      }
     }
   }
 }