fix(container): don't check for local docker if using cloud builder (#7813)

This would cause build failures when using Cloud Builder and no
local Docker daemon.

Co-authored-by: Jon Edvald <edvald@gmail.com>

Author: edvald-garden

core/src/plugins/container/build.ts

@@ -75,8 +75,6 @@ export const getContainerBuildStatus: BuildActionHandler<"getStatus", ContainerB
 }
 
 export const buildContainer: BuildActionHandler<"build", ContainerBuildAction> = async ({ ctx, action, log }) => {
-  containerHelpers.checkDockerServerVersion(await containerHelpers.getDockerVersion(), log)
-
   const outputs = action.getOutputs()
   const identifier = outputs.localImageId
 
@@ -92,6 +90,13 @@ export const buildContainer: BuildActionHandler<"build", ContainerBuildAction> =
     })
   }
 
+  const cloudBuilderAvailability = await cloudBuilder.getAvailability(ctx, action)
+
+  if (!cloudBuilderAvailability.available) {
+    // Only check Docker server version if Container Builder is not available
+    containerHelpers.checkDockerServerVersion(await containerHelpers.getDockerVersion(), log)
+  }
+
   const logEventContext = {
     origin: "docker build",
     level: "verbose" as const,
@@ -173,12 +178,11 @@ export const buildContainer: BuildActionHandler<"build", ContainerBuildAction> =
   const timeout = action.getConfig("timeout")
 
   let res: { buildResult: SpawnOutput; timeSaved: number }
-  const availability = await cloudBuilder.getAvailability(ctx, action)
-  const runtime = cloudBuilder.getActionRuntime(ctx, availability)
-  if (availability.available) {
+  const runtime = cloudBuilder.getActionRuntime(ctx, cloudBuilderAvailability)
+  if (cloudBuilderAvailability.available) {
     res = await buildContainerInCloudBuilder({
       action,
-      availability,
+      availability: cloudBuilderAvailability,
       outputStream,
       timeout,
       log,

core/src/plugins/container/helpers.ts

@@ -355,7 +355,7 @@ const helpers = {
   }),
 
   /**
-   * Asserts that the specified docker client version meets the minimum requirements.
+   * Asserts that the specified docker server version meets the minimum requirements.
    */
   checkDockerServerVersion(version: DockerVersion, log: ActionLog) {
     if (!version.server) {