Skip docker save if docker daemon base image is cached

jib-core/CHANGELOG.md

@@ -11,6 +11,7 @@ All notable changes to this project will be documented in this file.
 
 - Local base image layers are now processed in parallel, speeding up builds using large local base images. ([#1913](https://github.com/GoogleContainerTools/jib/issues/1913))
 - The base image manifest is no longer pulled from the registry if a digest is provided and the manifest is already cached. ([#1881](https://github.com/GoogleContainerTools/jib/issues/1881))
+- Docker daemon base images are now cached more effectively, speeding up builds `DockerDaemonImage` base images. ([#1912](https://github.com/GoogleContainerTools/jib/issues/1912))
 
 ### Fixed
 

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

@@ -30,6 +30,7 @@
 import com.google.cloud.tools.jib.cache.CachedLayer;
 import com.google.cloud.tools.jib.configuration.BuildConfiguration;
 import com.google.cloud.tools.jib.docker.DockerClient;
+import com.google.cloud.tools.jib.docker.DockerClient.DockerImageDetails;
 import com.google.cloud.tools.jib.docker.json.DockerManifestEntryTemplate;
 import com.google.cloud.tools.jib.event.progress.ThrottledAccumulatingConsumer;
 import com.google.cloud.tools.jib.filesystem.TempDirectoryProvider;
@@ -48,6 +49,7 @@
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.security.DigestException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
@@ -103,6 +105,13 @@ static Callable<LocalImage> retrieveDockerDaemonImageStep(
               new TimerEventDispatcher(
                   buildConfiguration.getEventHandlers(),
                   "Saving " + imageReference + " from Docker daemon")) {
+        DockerClient.DockerImageDetails dockerImageDetails = dockerClient.inspect(imageReference);
+        Optional<LocalImage> cachedImage =
+            getCachedDockerImage(buildConfiguration.getBaseImageLayersCache(), dockerImageDetails);
+        if (cachedImage.isPresent()) {
+          return cachedImage.get();
+        }
+
         Path tarPath = tempDirectoryProvider.newDirectory().resolve("out.tar");
         long size = dockerClient.inspect(imageReference).getSize();
         try (ProgressEventDispatcher dockerProgress =
@@ -133,6 +142,39 @@ static Callable<LocalImage> retrieveTarImageStep(
             buildConfiguration, executorService, tarPath, progressEventDispatcherFactory);
   }
 
+  private static Optional<LocalImage> getCachedDockerImage(
+      Cache cache, DockerImageDetails dockerImageDetails)
+      throws DigestException, IOException, CacheCorruptedException, LayerCountMismatchException,
+          BadContainerConfigurationFormatException {
+    V22ManifestTemplate v22Manifest = new V22ManifestTemplate();
+    List<PreparedLayer> cachedLayers = new ArrayList<>();
+
+    // Get config
+    Optional<ContainerConfigurationTemplate> cachedConfig =
+        cache.retrieveLocalConfig(dockerImageDetails.getImageId());
+    if (!cachedConfig.isPresent()) {
+      return Optional.empty();
+    }
+
+    // Get layers
+    for (DescriptorDigest diffId : dockerImageDetails.getDiffIds()) {
+      Optional<CachedLayer> cachedLayer = cache.retrieveTarLayer(diffId);
+      if (!cachedLayer.isPresent()) {
+        return Optional.empty();
+      }
+      CachedLayer layer = cachedLayer.get();
+      cachedLayers.add(new PreparedLayer.Builder(layer).build());
+      v22Manifest.addLayer(layer.getSize(), layer.getDigest());
+    }
+
+    // Create manifest
+    ContainerConfigurationTemplate config = cachedConfig.get();
+    BlobDescriptor configDescriptor = Blobs.from(config).writeTo(ByteStreams.nullOutputStream());
+    v22Manifest.setContainerConfiguration(configDescriptor.getSize(), configDescriptor.getDigest());
+    Image image = JsonToImageTranslator.toImage(v22Manifest, config);
+    return Optional.of(new LocalImage(image, cachedLayers));
+  }
+
   @VisibleForTesting
   static LocalImage cacheDockerImageTar(
       BuildConfiguration buildConfiguration,
@@ -156,10 +198,12 @@ static LocalImage cacheDockerImageTar(
                 .configure(MapperFeature.ACCEPT_CASE_INSENSITIVE_PROPERTIES, true)
                 .readValue(manifestStream, DockerManifestEntryTemplate[].class)[0];
         manifestStream.close();
+
+        Path configPath = destination.resolve(loadManifest.getConfig());
         ContainerConfigurationTemplate configurationTemplate =
-            JsonTemplateMapper.readJsonFromFile(
-                destination.resolve(loadManifest.getConfig()),
-                ContainerConfigurationTemplate.class);
+            JsonTemplateMapper.readJsonFromFile(configPath, ContainerConfigurationTemplate.class);
+        BlobDescriptor originalConfigDescriptor =
+            Blobs.from(configPath).writeTo(ByteStreams.nullOutputStream());
 
         List<String> layerFiles = loadManifest.getLayerFiles();
         if (configurationTemplate.getLayerCount() != layerFiles.size()) {
@@ -170,6 +214,9 @@ static LocalImage cacheDockerImageTar(
                   + configurationTemplate.getLayerCount()
                   + " layers");
         }
+        buildConfiguration
+            .getBaseImageLayersCache()
+            .writeLocalConfig(originalConfigDescriptor.getDigest(), configurationTemplate);
 
         // Check the first layer to see if the layers are compressed already. 'docker save' output
         // is uncompressed, but a jib-built tar has compressed layers.

jib-core/src/main/java/com/google/cloud/tools/jib/cache/Cache.java

@@ -143,7 +143,7 @@ public CachedLayer writeTarLayer(DescriptorDigest diffId, Blob compressedBlob)
    * @param containerConfiguration the container configuration
    * @throws IOException if an I/O exception occurs
    */
-  void writeLocalConfig(
+  public void writeLocalConfig(
       DescriptorDigest imageId, ContainerConfigurationTemplate containerConfiguration)
       throws IOException {
     cacheStorageWriter.writeLocalConfig(imageId, containerConfiguration);

jib-gradle-plugin/CHANGELOG.md

@@ -15,6 +15,7 @@ All notable changes to this project will be documented in this file.
 
 - Local base image layers are now processed in parallel, speeding up builds using large local base images. ([#1913](https://github.com/GoogleContainerTools/jib/issues/1913))
 - The base image manifest is no longer pulled from the registry if a digest is provided and the manifest is already cached. ([#1881](https://github.com/GoogleContainerTools/jib/issues/1881))
+- Docker daemon base images are now cached more effectively, speeding up builds `docker://` base images. ([#1912](https://github.com/GoogleContainerTools/jib/issues/1912))
 
 ### Fixed
 

jib-maven-plugin/CHANGELOG.md

@@ -15,6 +15,7 @@ All notable changes to this project will be documented in this file.
 
 - Local base image layers are now processed in parallel, speeding up builds using large local base images. ([#1913](https://github.com/GoogleContainerTools/jib/issues/1913))
 - The base image manifest is no longer pulled from the registry if a digest is provided and the manifest is already cached. ([#1881](https://github.com/GoogleContainerTools/jib/issues/1881))
+- Docker daemon base images are now cached more effectively, speeding up builds `docker://` base images. ([#1912](https://github.com/GoogleContainerTools/jib/issues/1912))
 
 ### Fixed