Ensure that prepareCompose does not depend on all of the base registr…

…y tasks. (#2047)

Related to #1596

.github/workflows/build-ci.yml

@@ -149,7 +149,7 @@ jobs:
         uses: burrunan/gradle-cache-action@v1
         with:
           job-id: build-server
-          arguments: --scan outputVersion createCraneTagScript docker-server-slim:prepareDocker docker-server:prepareDocker
+          arguments: --scan outputVersion createCraneTagScript docker-server-slim:prepareDocker docker-server:prepareDockerAll
           gradle-version: wrapper
 
       - name: Get Deephaven Version

docker/server/build.gradle

@@ -43,13 +43,6 @@ def dockerLicenses = License.createFrom(project).syncDockerLicense().get()
 def context= project.layout.buildDirectory.dir('context')
 
 def prepareDocker = project.tasks.register('prepareDocker', Sync) {
-    // TODO(deephaven-core#1596): Remove extra dependencies for build-ci.yml
-    // Currently, GH build-ci.yml calls dockerCreateDockerfile, and relies on buildx; so we need to
-    // make sure that dockerCreateDockerfile has the proper dependencies.
-    // If we change how our build works in the future (so that gradle is responsible for pushing the
-    // image), we can remove this extra dependency.
-    dependsOn baseMap.keySet().collect { base -> Docker.registryTask(project, base) }
-
     // deephaven-jpy.whl
     def deephavenJpyWheel = project(':deephaven-jpy').tasks.getByName('buildWheel')
 
@@ -86,6 +79,15 @@ def prepareDocker = project.tasks.register('prepareDocker', Sync) {
     into context
 }
 
+// TODO(deephaven-core#1596): Remove extra dependencies for build-ci.yml
+// Currently, GH build-ci.yml calls prepareDockerAll, and relies on buildx; so we need to
+// make sure that dockerCreateDockerfile has the proper dependencies.
+// If we change how our build works in the future (so that gradle is responsible for pushing the
+// image), we can remove this extra dependency.
+project.tasks.register('prepareDockerAll') {
+    dependsOn prepareDocker, baseMap.keySet().collect { base -> Docker.registryTask(project, base) }
+}
+
 def buildDockerClosure = { String base, String server ->
     Docker.registerDockerTwoPhaseImage(project, server, 'install') {
         dependsOn prepareDocker