feat: determine platform details from local docker installation for jibDockerBuild

jib-core/src/main/java/com/google/cloud/tools/jib/api/DockerClient.java

@@ -69,4 +69,13 @@ void save(ImageReference imageReference, Path outputPath, Consumer<Long> written
    * @throws InterruptedException if the {@code docker inspect} process was interrupted
    */
   ImageDetails inspect(ImageReference imageReference) throws IOException, InterruptedException;
+
+  /**
+   * Gets the os and architecture of the local docker installation.
+   *
+   * @return the os type and architecture of the image
+   * @throws IOException if an I/O exception occurs or {@code docker info} failed
+   * @throws InterruptedException if the {@code docker info} process was interrupted
+   */
+  DockerInfoDetails info() throws IOException, InterruptedException;
 }

jib-core/src/main/java/com/google/cloud/tools/jib/api/DockerInfoDetails.java

@@ -0,0 +1,40 @@
+/*
+ * Copyright 2024 Google LLC.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package com.google.cloud.tools.jib.api;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.cloud.tools.jib.json.JsonTemplate;
+
+/** Contains the os and architecture from {@code docker info}. */
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class DockerInfoDetails implements JsonTemplate {
+
+  @JsonProperty("OSType")
+  private String osType = "";
+
+  @JsonProperty("Architecture")
+  private String architecture = "";
+
+  public String getOsType() {
+    return osType;
+  }
+
+  public String getArchitecture() {
+    return architecture;
+  }
+}

jib-core/src/main/java/com/google/cloud/tools/jib/builder/steps/StepsRunner.java

@@ -18,6 +18,7 @@
 
 import com.google.cloud.tools.jib.api.DescriptorDigest;
 import com.google.cloud.tools.jib.api.DockerClient;
+import com.google.cloud.tools.jib.api.DockerInfoDetails;
 import com.google.cloud.tools.jib.blob.BlobDescriptor;
 import com.google.cloud.tools.jib.builder.ProgressEventDispatcher;
 import com.google.cloud.tools.jib.builder.steps.LocalBaseImageSteps.LocalImage;
@@ -38,6 +39,7 @@
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListeningExecutorService;
 import com.google.common.util.concurrent.MoreExecutors;
+import java.io.IOException;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -52,6 +54,7 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
 import java.util.function.Consumer;
+import java.util.logging.Logger;
 import java.util.stream.Collectors;
 import javax.annotation.Nullable;
 
@@ -64,6 +67,8 @@
  */
 public class StepsRunner {
 
+  Logger logger = Logger.getLogger(StepResults.class.getName());
+
   /** Holds the individual step results. */
   private static class StepResults {
 
@@ -427,6 +432,7 @@ private void buildImages(ProgressEventDispatcher.Factory progressDispatcherFacto
                   Image baseImage = entry.getKey();
                   List<Future<PreparedLayer>> baseLayers = entry.getValue();
 
+                  // Image is immutable once built.
                   Future<Image> builtImage =
                       buildImage(baseImage, baseLayers, progressDispatcher.newChildProducer());
                   baseImagesAndBuiltImages.put(baseImage, builtImage);
@@ -616,11 +622,7 @@ private void loadDocker(
     results.buildResult =
         executorService.submit(
             () -> {
-              Verify.verify(
-                  results.baseImagesAndBuiltImages.get().size() == 1,
-                  "multi-platform image building not supported when pushing to Docker engine");
-              Image builtImage =
-                  results.baseImagesAndBuiltImages.get().values().iterator().next().get();
+              Image builtImage = fetchBaseImageForLocalBuild(dockerClient);
               return new LoadDockerStep(
                       buildContext, progressDispatcherFactory, dockerClient, builtImage)
                   .call();
@@ -647,4 +649,28 @@ private void writeTarFile(
   private <E> List<Future<E>> scheduleCallables(ImmutableList<? extends Callable<E>> callables) {
     return callables.stream().map(executorService::submit).collect(Collectors.toList());
   }
+
+  private String computeArchitecture(String architecture) {
+    if (architecture.equals("x86_64")) {
+      return "amd64";
+    } else if (architecture.equals("aarch64")) {
+      return "arm64";
+    }
+    return architecture;
+  }
+
+  private Image fetchBaseImageForLocalBuild(DockerClient dockerClient)
+      throws IOException, InterruptedException, ExecutionException {
+    DockerInfoDetails dockerInfoDetails = dockerClient.info();
+    String osType = dockerInfoDetails.getOsType();
+    String dockerArchitecture = computeArchitecture(dockerInfoDetails.getArchitecture());
+    for (Map.Entry<Image, Future<Image>> imageEntry :
+        results.baseImagesAndBuiltImages.get().entrySet()) {
+      Image image = imageEntry.getValue().get();
+      if (image.getArchitecture().equals(dockerArchitecture) && image.getOs().equals(osType)) {
+        return image;
+      }
+    }
+    return results.baseImagesAndBuiltImages.get().values().iterator().next().get();
+  }
 }

jib-core/src/main/java/com/google/cloud/tools/jib/docker/CliDockerClient.java

@@ -20,6 +20,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.cloud.tools.jib.api.DescriptorDigest;
 import com.google.cloud.tools.jib.api.DockerClient;
+import com.google.cloud.tools.jib.api.DockerInfoDetails;
 import com.google.cloud.tools.jib.api.ImageDetails;
 import com.google.cloud.tools.jib.api.ImageReference;
 import com.google.cloud.tools.jib.http.NotifyingOutputStream;
@@ -184,6 +185,17 @@ public boolean supported(Map<String, String> parameters) {
     return true;
   }
 
+  @Override
+  public DockerInfoDetails info() throws IOException, InterruptedException {
+    // Runs 'docker info'.
+    Process infoProcess = docker("info", "-f", "{{json .}}");
+    if (infoProcess.waitFor() != 0) {
+      throw new IOException(
+          "'docker info' command failed with error: " + getStderrOutput(infoProcess));
+    }
+    return JsonTemplateMapper.readJson(infoProcess.getInputStream(), DockerInfoDetails.class);
+  }
+
   @Override
   public String load(ImageTarball imageTarball, Consumer<Long> writtenByteCountListener)
       throws InterruptedException, IOException {

jib-core/src/test/java/com/google/cloud/tools/jib/docker/AnotherDockerClient.java

@@ -20,6 +20,7 @@
 import com.google.cloud.tools.jib.api.ImageDetails;
 import com.google.cloud.tools.jib.api.ImageReference;
 import com.google.cloud.tools.jib.image.ImageTarball;
+import com.google.cloud.tools.jib.json.JsonTemplate;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.Map;
@@ -47,4 +48,9 @@ public ImageDetails inspect(ImageReference imageReference)
       throws IOException, InterruptedException {
     return null;
   }
+
+  @Override
+  public JsonTemplate info() throws IOException, InterruptedException {
+    return null;
+  }
 }