@vercel/container 19.1.2 → 20.0.0

package/dist/index.js

@@ -1251,7 +1251,9 @@ var IMAGE_ID_FILE = "image-id";
 function buildpackCacheDir(options) {
   const root = (0, import_node_path4.resolve)(options.repoRootPath || options.workPath);
   const app = (0, import_node_path4.relative)(root, (0, import_node_path4.resolve)(options.workPath)).split(import_node_path4.sep).join("/") || ".";
-  const key = (0, import_node_crypto2.createHash)("sha256").update(JSON.stringify([app, options.service?.name ?? null])).digest("hex").slice(0, 32);
+  const daemon = options.config?.daemon;
+  const owner = daemon ? { daemon: daemon.name } : options.service?.name ?? null;
+  const key = (0, import_node_crypto2.createHash)("sha256").update(JSON.stringify([app, owner])).digest("hex").slice(0, 32);
   return (0, import_node_path4.join)(root, BUILDPACK_CACHE_DIR, key);
 }
 async function restoreBuildpackCache(dir, cacheKey, cacheDir) {
@@ -1423,18 +1425,18 @@ var distribution_default = {
   buildpacks: {
     ruby: {
       id: "vercel/ruby",
-      version: "0.3.1",
-      sha256: "359615b41797247e5158c7bbcd97763322fcca6836823acd6e981d4c89d432a7"
+      version: "0.3.2",
+      sha256: "c0e8439800b9354f24028168869315e714650275ecdd4a8a85bd4e7659890a64"
     },
     go: {
       id: "vercel/go",
-      version: "0.2.1",
-      sha256: "6013ede7620734cb20885d3a6aecd7f14e364e941862a3074340cf1bbe648cc0"
+      version: "0.3.0",
+      sha256: "748ac1fad8164467dfee92face04b2d5bf2942d8762624625f473fb41bfa2bdb"
     },
     rust: {
       id: "vercel/rust",
-      version: "0.2.2",
-      sha256: "e6c1d59f759599bacdcbf5f077b6a5bba6e557481827fe23045925b9c2d39032"
+      version: "0.3.0",
+      sha256: "624fd0cddecd31197eef634342d3ea0e77ce0d5d8e10bbb582aa143edc88ca3e"
     }
   }
 };
@@ -1638,10 +1640,17 @@ async function stageWorkspace({ files, workPath }, destinationDir) {
 function writePlatformEnvDir(buildEnv, config, parentDir = (0, import_node_os4.tmpdir)()) {
   const environment = { ...buildEnv };
   delete environment.VERCEL_NODE_HOME;
+  delete environment.VERCEL_ENTRYPOINT;
   delete environment.VERCEL_COMMAND;
   if (config.nodeHome) {
     environment.VERCEL_NODE_HOME = config.nodeHome;
   }
+  if (config.entrypoint) {
+    environment.VERCEL_ENTRYPOINT = config.entrypoint;
+  }
+  if (config.command) {
+    environment.VERCEL_COMMAND = JSON.stringify(config.command);
+  }
   const dir = (0, import_node_fs5.mkdtempSync)((0, import_node_path5.join)(parentDir, "vercel-cnb-env-"));
   (0, import_node_fs5.chmodSync)(dir, 493);
   for (const [key, value] of Object.entries(environment)) {
@@ -1668,6 +1677,7 @@ function readReportDigest(report) {
   }
   return digest;
 }
+var BUILDPACK_FAILED_EXIT_CODE = 51;
 function describeCreatorExitCode(code) {
   if (code === void 0)
     return void 0;
@@ -1682,7 +1692,7 @@ function describeCreatorExitCode(code) {
     return "the analyze phase failed";
   if (code >= 40 && code <= 49)
     return "the restore phase failed";
-  if (code === 51) {
+  if (code === BUILDPACK_FAILED_EXIT_CODE) {
     return "a buildpack failed while building the app (e.g. installing dependencies) \u2014 its error is in the build output above";
   }
   if (code >= 50 && code <= 59)
@@ -1692,6 +1702,27 @@ function describeCreatorExitCode(code) {
   }
   return void 0;
 }
+function lifecycleFailure(error, context) {
+  const exitCode = error.exitCode;
+  const hint = describeCreatorExitCode(exitCode);
+  context.span?.setAttributes({
+    ...exitCode !== void 0 ? { "buildpack.lifecycle.exit_code": String(exitCode) } : {},
+    ...hint ? { "buildpack.lifecycle.failure_phase": hint } : {}
+  });
+  return Object.assign(
+    new Error(
+      [
+        `${context.buildpack.runtime} buildpack build failed via ${context.via} (${context.buildImage}).`,
+        ...hint ? [`The lifecycle exited with code ${exitCode}: ${hint}.`] : [],
+        "",
+        `Underlying error: ${error.message}`,
+        "",
+        `Buildpack project is ${context.workPath}`
+      ].join("\n")
+    ),
+    { exitCode }
+  );
+}
 function writeOrderDir(buildpack, parentDir = (0, import_node_os4.tmpdir)()) {
   const order = {
     order: [
@@ -2027,7 +2058,9 @@ async function buildAndPushWithLifecycle(buildpack, params, span) {
         (0, import_node_fs6.chmodSync)(cnbDir, 493);
         orderDir = writeOrderDir(buildpack);
         platformEnvDir = writePlatformEnvDir(params.buildEnv, {
-          nodeHome: params.nodeToolchain?.home
+          nodeHome: params.nodeToolchain?.home,
+          entrypoint: params.entrypoint,
+          command: params.command
         });
         const registrySetup = params.prepareRegistry?.();
         const containerReady = prepareBuildContainer(
@@ -2138,22 +2171,13 @@ async function buildAndPushWithLifecycle(buildpack, params, span) {
       } catch (error) {
         if (error instanceof RegistrySetupFailure)
           throw error.reason;
-        const exitCode = error.exitCode;
-        const hint = describeCreatorExitCode(exitCode);
-        lifecycleSpan?.setAttributes({
-          ...exitCode !== void 0 ? { "buildpack.lifecycle.exit_code": String(exitCode) } : {},
-          ...hint ? { "buildpack.lifecycle.failure_phase": hint } : {}
+        throw lifecycleFailure(error, {
+          buildpack,
+          via: "lifecycle/creator",
+          buildImage: params.image.buildImage,
+          workPath: params.workPath,
+          span: lifecycleSpan
         });
-        throw new Error(
-          [
-            `${buildpack.runtime} buildpack build failed via lifecycle/creator (${params.image.buildImage}).`,
-            ...hint ? [`The lifecycle exited with code ${exitCode}: ${hint}.`] : [],
-            "",
-            `Underlying error: ${error.message}`,
-            "",
-            `Buildpack project is ${params.workPath}`
-          ].join("\n")
-        );
       } finally {
         containerRemoval ??= removeContainerInBackground(buildContainer);
         for (const dir of [
@@ -2232,7 +2256,11 @@ var buildAndPushWithLifecycleDocker = async (buildpack, params, span) => {
         const orderDir = writeOrderDir(buildpack, stageDir);
         const platformEnvDir = writePlatformEnvDir(
           params.buildEnv,
-          { nodeHome: params.nodeToolchain?.home },
+          {
+            nodeHome: params.nodeToolchain?.home,
+            entrypoint: params.entrypoint,
+            command: params.command
+          },
           stageDir
         );
         step("Fetching the CNB lifecycle and buildpacks...");
@@ -2371,22 +2399,13 @@ var buildAndPushWithLifecycleDocker = async (buildpack, params, span) => {
           runtimeVersion: params.image.version
         };
       } catch (error) {
-        const exitCode = error.exitCode;
-        const hint = describeCreatorExitCode(exitCode);
-        lifecycleSpan?.setAttributes({
-          ...exitCode !== void 0 ? { "buildpack.lifecycle.exit_code": String(exitCode) } : {},
-          ...hint ? { "buildpack.lifecycle.failure_phase": hint } : {}
+        throw lifecycleFailure(error, {
+          buildpack,
+          via: "docker",
+          buildImage: params.image.buildImage,
+          workPath: params.workPath,
+          span: lifecycleSpan
         });
-        throw new Error(
-          [
-            `${buildpack.runtime} buildpack build failed via docker (${params.image.buildImage}).`,
-            ...hint ? [`The lifecycle exited with code ${exitCode}: ${hint}.`] : [],
-            "",
-            `Underlying error: ${error.message}`,
-            "",
-            `Buildpack project is ${params.workPath}`
-          ].join("\n")
-        );
       } finally {
         for (const container of containers.reverse()) {
           try {
@@ -2466,7 +2485,6 @@ var GO_CANDIDATE_ENTRYPOINTS = [
   "cmd/api/main.go",
   "cmd/server/main.go"
 ];
-var GO_TARGET_ENV = "VERCEL_GO_TARGET";
 var VERSION_RE = /^(0|[1-9]\d*)\.(0|[1-9]\d*)(?:\.(0|[1-9]\d*))?$/;
 var GO_DIRECTIVE_RE = /^\s*go[ \t]+(\S+)[ \t]*(?:\/\/[^\r\n]*)?$/m;
 var TOOLCHAIN_DIRECTIVE_RE = /^\s*toolchain[ \t]+go(\S+)[ \t]*(?:\/\/[^\r\n]*)?$/m;
@@ -2496,32 +2514,6 @@ function selectGoVersion(workPath) {
   const declared = [toolchain, minimum].filter((version2) => version2 !== void 0).sort((a, b) => compareImageVersions(b, a));
   return declared[0]?.tag ?? DEFAULT_GO_VERSION;
 }
-function packageDirectory(entrypoint) {
-  const path4 = entrypoint.replace(/\\/g, "/");
-  if (import_node_path9.posix.isAbsolute(path4) || path4.split("/").includes("..")) {
-    throw new Error(
-      `Invalid Go entrypoint ${JSON.stringify(entrypoint)}: it must be a path inside the service root.`
-    );
-  }
-  const normalized = import_node_path9.posix.normalize(path4).replace(/\/+$/, "");
-  const directory = normalized.endsWith(".go") ? import_node_path9.posix.dirname(normalized) : normalized;
-  return directory === "." ? "." : `./${directory}`;
-}
-function selectGoTarget({
-  workPath,
-  config,
-  buildEnv
-}) {
-  const entrypoint = readString(config?.buildpackEntrypoint);
-  if (entrypoint)
-    return packageDirectory(entrypoint);
-  if (buildEnv && GO_TARGET_ENV in buildEnv)
-    return void 0;
-  const candidate = GO_CANDIDATE_ENTRYPOINTS.find(
-    (name) => (0, import_node_fs9.existsSync)((0, import_node_path9.join)(workPath, name))
-  );
-  return candidate ? packageDirectory(candidate) : void 0;
-}
 var go = {
   runtime: "go",
   projectMarkers: ["go.mod"],
@@ -2534,9 +2526,19 @@ var go = {
       runImage: GO_RUN_IMAGE
     };
   },
-  platformEnv(params) {
-    const target = selectGoTarget(params);
-    return target ? { [GO_TARGET_ENV]: target } : {};
+  defaultEntrypoint({ workPath, zeroConfig }) {
+    const candidate = GO_CANDIDATE_ENTRYPOINTS.find(
+      (name) => (0, import_node_fs9.existsSync)((0, import_node_path9.join)(workPath, name))
+    );
+    if (candidate)
+      return import_node_path9.posix.dirname(candidate);
+    if (zeroConfig) {
+      const last = GO_CANDIDATE_ENTRYPOINTS.length - 1;
+      throw new Error(
+        `Couldn't find the Go program to build. Add ${GO_CANDIDATE_ENTRYPOINTS.slice(0, last).join(", ")}, or ${GO_CANDIDATE_ENTRYPOINTS[last]}, or set the VERCEL_ENTRYPOINT environment variable to its package directory or a .go file in it.`
+      );
+    }
+    return void 0;
   }
 };
 
@@ -2650,6 +2652,9 @@ var rust = {
       buildImage: `${RUST_IMAGE_REPOSITORY}:${version2}-${RUST_BUILD_IMAGE_DISTRO}`,
       runImage: RUST_RUN_IMAGE
     };
+  },
+  defaultEntrypoint({ workPath, zeroConfig }) {
+    return zeroConfig && (0, import_node_fs11.existsSync)((0, import_node_path11.join)(workPath, "src/main.rs")) ? "src/main.rs" : void 0;
   }
 };
 function selectRustVersion(workPath) {
@@ -2705,6 +2710,14 @@ function hasProjectMarkers(buildpack, workPath) {
 }
 
 // src/buildpacks/build.ts
+function selectEntrypoint(params, sourceDir) {
+  const configured = readString(params.config.buildpackEntrypoint);
+  if (configured !== void 0)
+    return configured;
+  const zeroConfig = params.service === void 0;
+  const fromEnv = zeroConfig ? readString(params.buildEnv?.VERCEL_ENTRYPOINT) : void 0;
+  return fromEnv ?? params.buildpack.defaultEntrypoint?.({ workPath: sourceDir, zeroConfig });
+}
 async function buildAndPushBuildpack(params) {
   const sourceDir = (0, import_node_fs13.mkdtempSync)((0, import_node_path13.join)((0, import_node_os7.tmpdir)(), "vercel-cnb-source-"));
   try {
@@ -2720,6 +2733,12 @@ async function buildAndPushBuildpack(params) {
       workPath: sourceDir,
       buildEnv: params.buildEnv
     });
+    const entrypoint = selectEntrypoint(params, sourceDir);
+    if (entrypoint !== void 0) {
+      debug(
+        `Passing VERCEL_ENTRYPOINT=${entrypoint} to the ${params.buildpack.runtime} buildpack`
+      );
+    }
     const buildCommand = readString(params.config.buildCommand);
     if (buildCommand?.trim()) {
       warn(
@@ -2729,15 +2748,6 @@ async function buildAndPushBuildpack(params) {
     const prereleaseUrl = getPrereleaseUrl();
     const buildpack = prereleaseUrl ? await withPrereleaseBuildpack(params.buildpack, prereleaseUrl) : params.buildpack;
     const image = await buildpack.resolveImage(sourceDir);
-    const derivedEnv = buildpack.platformEnv?.({
-      workPath: sourceDir,
-      config: params.config,
-      buildEnv: params.buildEnv
-    }) ?? {};
-    for (const [key, value] of Object.entries(derivedEnv)) {
-      debug(`Passing ${key}=${value} to the ${buildpack.runtime} buildpack`);
-    }
-    const buildEnv = { ...params.buildEnv, ...derivedEnv };
     const nodeToolchain = engine.name === "buildah" ? await resolveNodeToolchain(sourceDir, params.config, params.meta) : await resolveLocalNodeToolchain(
       sourceDir,
       params.config,
@@ -2819,9 +2829,11 @@ async function buildAndPushBuildpack(params) {
             image,
             imageRef: target.imageRef,
             credentials,
-            buildEnv,
+            buildEnv: params.buildEnv,
             nodeToolchain,
-            cache
+            cache,
+            entrypoint,
+            command: params.config.daemon?.command
           };
           let result;
           if (engine.name === "buildah") {
@@ -2871,6 +2883,9 @@ function resolveImageSource(options, context) {
       "Buildpack builds are selected by Vercel from the project's framework or the service's runtime; `buildpack` is not a `builds` configuration option."
     );
   }
+  if (buildpack && (config.daemon || readString(config.buildpackEntrypoint))) {
+    return { kind: "buildpack", buildpack };
+  }
   const dockerfileConfigured = entrypointRef && isDockerfileRef(entrypointRef) ? entrypointRef : findDockerfile(workPath);
   const dockerfileRel = dockerfileConfigured ?? "Dockerfile";
   const dockerfilePath = import_node_path14.default.join(workPath, dockerfileRel);
@@ -3489,6 +3504,7 @@ async function buildAndPushImage(params) {
 }
 async function resolveImageHandler(options, source, span) {
   const { config, meta } = options;
+  const { daemon } = config;
   span?.setAttributes({
     "container.has_dockerfile": toTag(source.kind === "dockerfile"),
     "container.is_dev": toTag(Boolean(meta?.isDev))
@@ -3509,9 +3525,7 @@ async function resolveImageHandler(options, source, span) {
       });
       return tag3;
     }
-    const repository2 = sanitizeRepository(
-      options.service?.name ?? buildpack.runtime
-    );
+    const repository2 = daemon ? (0, import_build_utils6.getDaemonImageRepository)(daemon.name) : sanitizeRepository(options.service?.name ?? buildpack.runtime);
     const tag2 = resolveImageTag();
     span?.setAttributes({
       "container.mode": "buildpack-build-and-push",
@@ -3519,19 +3533,28 @@ async function resolveImageHandler(options, source, span) {
       "container.repository": repository2,
       "image.tag": tag2
     });
-    return buildAndPushBuildpack({
-      buildpack,
-      files: options.files,
-      workPath: options.workPath,
-      repoRootPath: options.repoRootPath,
-      service: options.service,
-      repository: repository2,
-      tag: tag2,
-      config,
-      meta,
-      buildEnv: buildArgsFromEnv(meta?.buildEnv),
-      parentSpan: span
-    });
+    try {
+      return await buildAndPushBuildpack({
+        buildpack,
+        files: options.files,
+        workPath: options.workPath,
+        repoRootPath: options.repoRootPath,
+        service: options.service,
+        repository: repository2,
+        tag: tag2,
+        config,
+        meta,
+        buildEnv: buildArgsFromEnv(meta?.buildEnv),
+        parentSpan: span
+      });
+    } catch (error) {
+      if (daemon && error.exitCode === BUILDPACK_FAILED_EXIT_CODE) {
+        throw new Error(
+          `Failed to build daemon "${daemon.name}" (root "${daemon.root}") with the ${buildpack.runtime} buildpack. Its error is above.`
+        );
+      }
+      throw error;
+    }
   }
   const { dockerfileRel, dockerfilePath } = source;
   if (meta?.isDev) {
@@ -3547,7 +3570,6 @@ async function resolveImageHandler(options, source, span) {
       `Dockerfile not found at "${dockerfilePath}" for container service.`
     );
   }
-  const { daemon } = options.config;
   const repository = daemon ? (0, import_build_utils6.getDaemonImageRepository)(daemon.name) : sanitizeRepository(
     options.service?.name ?? import_node_path17.default.basename(dockerfileRel).split(".")[0]
   );
@@ -3598,7 +3620,9 @@ async function build(options) {
           image,
           // Checked by vercel.json validation: a daemon sets one of them.
           instances: daemon.instances ?? daemon.replicas,
-          ...daemon.command && { command: daemon.command },
+          // A command replaces the image's entrypoint, which for a buildpack
+          // image is the launcher; the buildpack bakes the command in instead.
+          ...daemon.command && source.kind !== "buildpack" && { command: daemon.command },
           ...daemon.resources && { resources: daemon.resources },
           ...daemon.terminationGracePeriodSeconds !== void 0 && {
             terminationGracePeriodSeconds: daemon.terminationGracePeriodSeconds

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/container",
-  "version": "19.1.2",
+  "version": "20.0.0",
   "license": "Apache-2.0",
   "main": "./dist/index.js",
   "homepage": "https://vercel.com/docs",
@@ -17,12 +17,12 @@
     "tar": "7.5.11"
   },
   "peerDependencies": {
-    "@vercel/build-utils": "14.21.2"
+    "@vercel/build-utils": "14.22.0"
   },
   "devDependencies": {
     "@types/node": "20.11.0",
     "vitest": "4.1.10",
-    "@vercel/build-utils": "14.21.2"
+    "@vercel/build-utils": "14.22.0"
   },
   "publishConfig": {
     "access": "public"