refactor(cli,webapp): simplify instance base image handling

Author: nicktrn

apps/webapp/app/v3/deployBaseImages.server.ts

@@ -2,12 +2,10 @@ import { BuildRuntime, DeployBaseImageRef } from "@trigger.dev/core/v3";
 
 type BaseImageMap = Partial<Record<BuildRuntime, string>>;
 
-export type ParsedDeployBaseImages = { images: BaseImageMap; errors: string[] };
-
 export function parseDeployBaseImages(
   value: string | undefined,
   envVarName: string
-): ParsedDeployBaseImages {
+): { images: BaseImageMap; errors: string[] } {
   const images: BaseImageMap = {};
   const errors: string[] = [];
 
@@ -75,12 +73,5 @@ export function resolveDeployBaseImages(
   const base = config.base[parsedRuntime.data];
   const buildBase = config.buildBase[parsedRuntime.data];
 
-  if (!base && !buildBase) {
-    return undefined;
-  }
-
-  return {
-    ...(base ? { base } : {}),
-    ...(buildBase ? { buildBase } : {}),
-  };
+  return base || buildBase ? { base, buildBase } : undefined;
 }

apps/webapp/test/deployBaseImages.test.ts

@@ -5,8 +5,6 @@ const digestA = `sha256:${"a".repeat(64)}`;
 const digestB = `sha256:${"b".repeat(64)}`;
 const digestC = `sha256:${"c".repeat(64)}`;
 
-const hex64 = "a".repeat(64);
-
 describe("parseDeployBaseImages", () => {
   it("returns an empty map for undefined and empty values", () => {
     const empty = { images: {}, errors: [] };
@@ -31,7 +29,7 @@ describe("parseDeployBaseImages", () => {
   });
 
   it("accepts a registry with a port and a tag before the digest", () => {
-    const image = `registry.example.com:5000/ns/img:tag@sha256:${hex64}`;
+    const image = `registry.example.com:5000/ns/img:tag@${digestA}`;
     expect(parseDeployBaseImages(`node-24=${image}`, "DEPLOY_BASE_IMAGES")).toEqual({
       images: { "node-24": image },
       errors: [],
@@ -44,9 +42,9 @@ describe("parseDeployBaseImages", () => {
     ["node alias", `node=acme/node:24@${digestA}`],
     ["empty image", "node-24="],
     ["missing digest", "node-24=acme/node:24"],
-    ["flag before image", `node-24=--platform=linux/arm64 acme/node@sha256:${hex64}`],
-    ["bare digest", `node-24=@sha256:${hex64}`],
-    ["newline in image", `node-24=acme/node\nx@sha256:${hex64}`],
+    ["flag before image", `node-24=--platform=linux/arm64 acme/node@${digestA}`],
+    ["bare digest", `node-24=@${digestA}`],
+    ["newline in image", `node-24=acme/node\nx@${digestA}`],
     ["duplicate runtime", `node-24=acme/a@${digestA},node-24=acme/b@${digestB}`],
   ])("reports an error naming the env var and segment: %s", (_name, value) => {
     const segments = value.split(",");
@@ -84,11 +82,8 @@ describe("resolveDeployBaseImages", () => {
   const base = { "node-26": `acme/node-fips:26@${digestA}` } as const;
   const buildBase = { "node-26": `acme/node:26-dev@${digestB}` } as const;
 
-  it("returns undefined for an unknown runtime", () => {
+  it("returns undefined for a missing or unknown runtime", () => {
     expect(resolveDeployBaseImages("node-23", { base, buildBase })).toBeUndefined();
-  });
-
-  it("returns undefined when the deployment has no runtime", () => {
     expect(resolveDeployBaseImages(null, { base, buildBase })).toBeUndefined();
     expect(resolveDeployBaseImages(undefined, { base, buildBase })).toBeUndefined();
   });

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

@@ -1225,8 +1225,6 @@ async function applyServerBaseImages({
     return;
   }
 
-  logger.debug("Using base images required by the server", baseImages);
-
   const required = [
     baseImages.base ? `base ${baseImages.base}` : undefined,
     baseImages.buildBase ? `build ${baseImages.buildBase}` : undefined,

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

@@ -292,8 +292,6 @@ describe("generateContainerfile", () => {
     expect(buildStage).toContain(
       "apt-get install -y --no-install-recommends --allow-downgrades jq"
     );
-    expect(buildStage).toContain("RUN echo first > /etc/first");
-    expect(buildStage).toContain("RUN echo second > /etc/second");
     expect(containerfile.indexOf("RUN echo first > /etc/first")).toBeLessThan(
       containerfile.indexOf("AS build")
     );
@@ -306,9 +304,6 @@ describe("generateContainerfile", () => {
       containerfile.indexOf(buildFrom) - "\n\n".length
     );
 
-    expect(buildStage.indexOf("RUN echo second > /etc/second")).toBeLessThan(
-      buildStage.indexOf("apt-get install")
-    );
     expect(containerfile).toContain(`${buildFrom}\n\n${baseEnv}${baseCustomization}\n\n`);
   });
 

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

@@ -799,22 +799,19 @@ const parseGenerateOptions = (options: GenerateContainerfileOptions) => {
     .filter(Boolean)
     .join("\n\n");
 
-  const prebuiltBuildStage = `FROM ${options.image?.buildBase ?? BUILD_IMAGE[options.runtime]} AS build
-
-ENV DEBIAN_FRONTEND=noninteractive${
-    userPackages.length > 0 ? `\n\n${aptInstall(userPackages, { repair: false })}` : ""
-  }`;
-
-  const buildStage = !baseInstructions // FROM base runs instructions once: unbounded downloads
-    ? prebuiltBuildStage
-    : options.image?.buildBase
-      ? `FROM ${options.image.buildBase} AS build\n\nENV DEBIAN_FRONTEND=noninteractive\n\n${customization}`
-      : `FROM base AS build
+  // Instructions run once (FROM base) since their downloads are unbounded;
+  // package-only projects keep the prebuilt toolchain and repeat the small install
+  const buildStage =
+    baseInstructions && !options.image?.buildBase
+      ? `FROM base AS build
 
 RUN apt-get update && \\
   apt-get install -y --no-install-recommends ${TOOLCHAIN_PACKAGES} && \\
   apt-get clean && \\
-  rm -rf /var/lib/apt/lists/*`;
+  rm -rf /var/lib/apt/lists/*`
+      : `FROM ${options.image?.buildBase ?? BUILD_IMAGE[options.runtime]} AS build
+
+ENV DEBIAN_FRONTEND=noninteractive${customization ? `\n\n${customization}` : ""}`;
 
   return {
     baseImage: options.image?.base ?? BASE_IMAGE[options.runtime],