make runs after local builds compatible with load and push

Author: nicktrn

apps/supervisor/src/env.ts

@@ -44,6 +44,7 @@ const Env = z.object({
   // Docker settings
   DOCKER_API_VERSION: z.string().default("v1.41"),
   DOCKER_PLATFORM: z.string().optional(), // e.g. linux/amd64, linux/arm64
+  DOCKER_STRIP_IMAGE_DIGEST: BoolEnv.default(true),
   DOCKER_REGISTRY_USERNAME: z.string().optional(),
   DOCKER_REGISTRY_PASSWORD: z.string().optional(),
   DOCKER_REGISTRY_URL: z.string().optional(), // e.g. https://index.docker.io/v1

apps/supervisor/src/workloadManager/docker.ts

@@ -117,11 +117,17 @@ export class DockerWorkloadManager implements WorkloadManager {
       hostConfig.Memory = opts.machine.memory * 1024 * 1024 * 1024;
     }
 
+    let imageRef = opts.image;
+
+    if (env.DOCKER_STRIP_IMAGE_DIGEST) {
+      imageRef = opts.image.split("@")[0]!;
+    }
+
     const containerCreateOpts: Docker.ContainerCreateOptions = {
       name: runnerId,
       Hostname: runnerId,
       HostConfig: hostConfig,
-      Image: opts.image,
+      Image: imageRef,
       AttachStdout: false,
       AttachStderr: false,
       AttachStdin: false,
@@ -133,25 +139,37 @@ export class DockerWorkloadManager implements WorkloadManager {
 
     const logger = this.logger.child({ opts, containerCreateOpts });
 
-    // Ensure the image is present
-    const [createImageError, imageResponseReader] = await tryCatch(
-      this.docker.createImage(this.auth, {
-        fromImage: opts.image,
-        ...(this.platform ? { platform: this.platform } : {}),
-      })
-    );
-    if (createImageError) {
-      logger.error("Failed to pull image", { error: createImageError });
-      return;
-    }
+    const [inspectError] = await tryCatch(this.docker.getImage(imageRef).inspect());
 
-    const [imageReadError, imageResponse] = await tryCatch(readAllChunks(imageResponseReader));
-    if (imageReadError) {
-      logger.error("failed to read image response", { error: imageReadError });
-      return;
-    }
+    // If the image is not present, try to pull it
+    if (inspectError) {
+      logger.error("Failed to inspect image, trying to pull", {
+        error: inspectError,
+        image: opts.image,
+      });
 
-    logger.debug("pulled image", { image: opts.image, imageResponse });
+      // Ensure the image is present
+      const [createImageError, imageResponseReader] = await tryCatch(
+        this.docker.createImage(this.auth, {
+          fromImage: imageRef,
+          ...(this.platform ? { platform: this.platform } : {}),
+        })
+      );
+      if (createImageError) {
+        logger.error("Failed to pull image", { error: createImageError });
+        return;
+      }
+
+      const [imageReadError, imageResponse] = await tryCatch(readAllChunks(imageResponseReader));
+      if (imageReadError) {
+        logger.error("failed to read image response", { error: imageReadError });
+        return;
+      }
+
+      logger.debug("pulled image", { image: opts.image, imageResponse });
+    } else {
+      // Image is present, so we can use it to create the container
+    }
 
     // Create container
     const [createContainerError, container] = await tryCatch(

packages/cli-v3/src/deploy/buildImage.ts

@@ -499,6 +499,8 @@ async function localBuildImage(options: SelfHostedBuildImageOptions): Promise<Bu
     });
   } else {
     logger.debug("Parsed metadata.json", { metadata: meta.data, path: metadataPath });
+
+    // Always use the manifest (list) digest
     digest = meta.data["containerimage.digest"];
   }
 
@@ -894,6 +896,7 @@ const BuildKitMetadata = z.object({
     })
     .optional(),
   "containerimage.digest": z.string().optional(),
+  "containerimage.config.digest": z.string().optional(),
   "image.name": z.string().optional(),
 });