@vercel/container 18.0.0 → 19.1.0

package/dist/index.js

@@ -62,7 +62,7 @@ async function generateProjectManifest({
 var diagnostics = (0, import_build_utils.createDiagnostics)("container");
 
 // src/index.ts
-var import_node_fs17 = require("fs");
+var import_node_fs16 = require("fs");
 var import_node_path17 = __toESM(require("path"));
 
 // src/util.ts
@@ -124,8 +124,7 @@ function readString(value) {
   return typeof value === "string" && value.length > 0 ? value : void 0;
 }
 function isDockerfileRef(ref) {
-  const base = (0, import_node_path.basename)(ref).toLowerCase();
-  return base === "dockerfile" || base === "containerfile" || base === "dockerfile.vercel" || base === "containerfile.vercel";
+  return /(docker|container)file/i.test((0, import_node_path.basename)(ref));
 }
 var DOCKERFILE_CANDIDATES = [
   "Dockerfile.vercel",
@@ -1249,27 +1248,24 @@ var BUILDPACK_CACHE_DIR = ".vercel/cache/buildpacks";
 var CNB_COMMITTED_DIR = "committed";
 var CNB_CACHE_METADATA_FILE = "io.buildpacks.lifecycle.cache.metadata";
 var IMAGE_ID_FILE = "image-id";
-function buildpackCacheEnabled() {
-  return readString(process.env.VERCEL_ENABLE_BUILDPACK_CACHE) === "1";
-}
 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);
   return (0, import_node_path4.join)(root, BUILDPACK_CACHE_DIR, key);
 }
-async function restoreBuildpackCache(dir, imageId, cacheDir) {
+async function restoreBuildpackCache(dir, cacheKey, cacheDir) {
   const committed = (0, import_node_path4.join)(cacheDir, CNB_COMMITTED_DIR);
-  const [copy, image] = await Promise.allSettled([
+  const [copy, key] = await Promise.allSettled([
     copyCommitted(dir, cacheDir),
-    imageId
+    cacheKey
   ]);
   try {
     if (copy.status === "rejected")
       throw copy.reason;
-    if (image.status === "rejected")
-      throw image.reason;
-    if (readRegularFile((0, import_node_path4.join)(dir, IMAGE_ID_FILE)) !== image.value) {
+    if (key.status === "rejected")
+      throw key.reason;
+    if (readRegularFile((0, import_node_path4.join)(dir, IMAGE_ID_FILE)) !== key.value) {
       (0, import_node_fs4.rmSync)(committed, { recursive: true, force: true });
       return { status: "miss", reason: "base_image_changed" };
     }
@@ -1283,7 +1279,7 @@ async function restoreBuildpackCache(dir, imageId, cacheDir) {
     };
   }
 }
-async function saveBuildpackCache(dir, imageId, cacheDir) {
+async function saveBuildpackCache(dir, cacheKey, cacheDir) {
   const committed = (0, import_node_path4.join)(cacheDir, CNB_COMMITTED_DIR);
   let metadata;
   try {
@@ -1297,12 +1293,12 @@ async function saveBuildpackCache(dir, imageId, cacheDir) {
     };
   }
   try {
-    if (isSaved(dir, imageId, metadata))
+    if (isSaved(dir, cacheKey, metadata))
       return { status: "unchanged" };
     const bytes = sizeOf(committed);
     (0, import_node_fs4.rmSync)(dir, { recursive: true, force: true });
     await copyCommitted(cacheDir, dir);
-    (0, import_node_fs4.writeFileSync)((0, import_node_path4.join)(dir, IMAGE_ID_FILE), imageId);
+    (0, import_node_fs4.writeFileSync)((0, import_node_path4.join)(dir, IMAGE_ID_FILE), cacheKey);
     return { status: "saved", bytes };
   } catch (error) {
     try {
@@ -1312,11 +1308,11 @@ async function saveBuildpackCache(dir, imageId, cacheDir) {
     return { status: "skipped", reason: firstLine(error) };
   }
 }
-function isSaved(dir, imageId, metadata) {
+function isSaved(dir, cacheKey, metadata) {
   try {
     const committed = (0, import_node_path4.join)(dir, CNB_COMMITTED_DIR);
     assertDirectory(committed);
-    return readRegularFile((0, import_node_path4.join)(dir, IMAGE_ID_FILE)) === imageId && readRegularFile((0, import_node_path4.join)(committed, CNB_CACHE_METADATA_FILE)) === metadata;
+    return readRegularFile((0, import_node_path4.join)(dir, IMAGE_ID_FILE)) === cacheKey && readRegularFile((0, import_node_path4.join)(committed, CNB_CACHE_METADATA_FILE)) === metadata;
   } catch {
     return false;
   }
@@ -1427,18 +1423,18 @@ var distribution_default = {
   buildpacks: {
     ruby: {
       id: "vercel/ruby",
-      version: "0.3.0",
-      sha256: "7ee871c18ac1616658793d3d25639d7a1f65ade618f84c6596ef9e3f515b7202"
+      version: "0.3.1",
+      sha256: "359615b41797247e5158c7bbcd97763322fcca6836823acd6e981d4c89d432a7"
     },
     go: {
       id: "vercel/go",
-      version: "0.1.0",
-      sha256: "b605ba5f75e3873f910f1c76c14eeca5dce62f906a5d0bcee8a2b335c81d2859"
+      version: "0.2.1",
+      sha256: "6013ede7620734cb20885d3a6aecd7f14e364e941862a3074340cf1bbe648cc0"
     },
     rust: {
       id: "vercel/rust",
-      version: "0.1.0",
-      sha256: "4817a493cda2e30f2a1adb7f121ecb77718046d114859b4146880fb2e24fb302"
+      version: "0.2.2",
+      sha256: "e6c1d59f759599bacdcbf5f077b6a5bba6e557481827fe23045925b9c2d39032"
     }
   }
 };
@@ -2770,7 +2766,7 @@ async function buildAndPushBuildpack(params) {
           "image.ref": target.imageRef,
           "registry.username": target.username
         });
-        const cache = params.cache && engine.name === "buildah" ? { dir: buildpackCacheDir(params) } : void 0;
+        const cache = engine.name === "buildah" ? { dir: buildpackCacheDir(params) } : void 0;
         if (cache)
           debug(`buildpack cache: ${cache.dir}`);
         buildSpan?.setAttributes({
@@ -3317,14 +3313,9 @@ async function startContainer(options, reuseKey) {
 
 // src/prepare-cache.ts
 var import_build_utils5 = require("@vercel/build-utils");
-var import_node_fs16 = require("fs");
 var import_node_path16 = require("path");
 async function prepareCache(options) {
   const root = (0, import_node_path16.resolve)(options.repoRootPath || options.workPath);
-  if (!buildpackCacheEnabled()) {
-    (0, import_node_fs16.rmSync)((0, import_node_path16.join)(root, BUILDPACK_CACHE_DIR), { recursive: true, force: true });
-    return {};
-  }
   const start = Date.now();
   const files = await (0, import_build_utils5.glob)(`${BUILDPACK_CACHE_DIR}/**`, root);
   const count = Object.keys(files).length;
@@ -3539,7 +3530,6 @@ async function resolveImageHandler(options, source, span) {
       config,
       meta,
       buildEnv: buildArgsFromEnv(meta?.buildEnv),
-      cache: buildpackCacheEnabled(),
       parentSpan: span
     });
   }
@@ -3552,7 +3542,7 @@ async function resolveImageHandler(options, source, span) {
     span?.setAttributes({ "container.mode": "dev", "image.tag": tag2 });
     return tag2;
   }
-  if (!(0, import_node_fs17.existsSync)(dockerfilePath)) {
+  if (!(0, import_node_fs16.existsSync)(dockerfilePath)) {
     throw new Error(
       `Dockerfile not found at "${dockerfilePath}" for container service.`
     );
@@ -3606,9 +3596,13 @@ async function build(options) {
         [daemon.name]: {
           runtime: "container",
           image,
-          replicas: daemon.replicas,
+          // Checked by vercel.json validation: a daemon sets one of them.
+          instances: daemon.instances ?? daemon.replicas,
           ...daemon.command && { command: daemon.command },
-          ...daemon.resources && { resources: daemon.resources }
+          ...daemon.resources && { resources: daemon.resources },
+          ...daemon.terminationGracePeriodSeconds !== void 0 && {
+            terminationGracePeriodSeconds: daemon.terminationGracePeriodSeconds
+          }
         }
       }
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/container",
-  "version": "18.0.0",
+  "version": "19.1.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.20.0"
+    "@vercel/build-utils": "14.21.0"
   },
   "devDependencies": {
     "@types/node": "20.11.0",
     "vitest": "4.1.10",
-    "@vercel/build-utils": "14.20.0"
+    "@vercel/build-utils": "14.21.0"
   },
   "publishConfig": {
     "access": "public"