@vercel/container 23.0.0 → 23.0.1-snapshot-8a613d8ad85d

package/dist/index.js

@@ -47,8 +47,8 @@ var import_node_path = require("path");
 var SCHEDULES_COMMAND_ENV = "VERCEL_SCHEDULE_COMMAND";
 var DISPATCHER = "schedules-command-dispatcher";
 async function buildSchedulesCommandImage(engine, params, dispatcher = (0, import_node_path.join)(__dirname, DISPATCHER)) {
-  await engine.build(params);
-  if ((await engine.onBuildTriggers?.(params.imageRef))?.length) {
+  const baseImage = await engine.build(params);
+  if ((await engine.onBuildTriggers?.(baseImage))?.length) {
     throw new Error(
       `"${params.dockerfilePath}" declares ONBUILD instructions, which only run when another image is built from it. Remove them from the schedule's Dockerfile.`
     );
@@ -60,7 +60,7 @@ async function buildSchedulesCommandImage(engine, params, dispatcher = (0, impor
     await (0, import_promises.writeFile)(
       dockerfilePath,
       [
-        `FROM ${params.imageRef}`,
+        `FROM ${baseImage}`,
         `COPY --chmod=0555 ${DISPATCHER} /__vercel_runtime/${DISPATCHER}`,
         `ENTRYPOINT ["/__vercel_runtime/${DISPATCHER}"]`
       ].join("\n")
@@ -69,7 +69,8 @@ async function buildSchedulesCommandImage(engine, params, dispatcher = (0, impor
       ...params,
       contextDir,
       dockerfilePath,
-      buildArgs: void 0
+      buildArgs: void 0,
+      baseImageIsLocal: true
     });
   } finally {
     await (0, import_promises.rm)(contextDir, { recursive: true, force: true });
@@ -766,6 +767,12 @@ function localImageRef(params) {
   }
   return `${imageRef.slice(0, imageRef.lastIndexOf(":"))}:vercel-buildah-store`;
 }
+function pullFlags(params) {
+  if (params.baseImageIsLocal) {
+    return ["--pull=never"];
+  }
+  return params.useBuildahStoreCache ? ["--pull=always"] : [];
+}
 async function deploymentSourceDateEpoch() {
   if ((0, import_build_utils3.resolveBuildConcurrency)() <= 1) {
     return void 0;
@@ -876,7 +883,7 @@ function createBuildahEngine(client) {
         // stage behind, which stops the store cache from being saved.
         "--force-rm",
         ...sourceDateEpoch ? ["--source-date-epoch", sourceDateEpoch] : [],
-        ...params.useBuildahStoreCache ? ["--pull=always"] : [],
+        ...pullFlags(params),
         // Use the host network namespace for RUN steps. The build runs inside a
         // restricted Hive cell that cannot program iptables, so buildah's default
         // rootless networking (netavark) fails with
@@ -896,6 +903,7 @@ function createBuildahEngine(client) {
         () => imageIdsFromBuildOutput(`${stdout}
 ${stderr}`)
       );
+      return localImageRef(params);
     },
     async login(params) {
       try {
@@ -1245,6 +1253,7 @@ ${version2.trim()}`);
       params.dockerfilePath,
       params.contextDir
     ]);
+    return params.imageRef;
   },
   async onBuildTriggers(imageRef) {
     const { stdout } = await runDocker([
@@ -4037,7 +4046,13 @@ async function buildAndPushImage(params) {
           buildSpan,
           "container.image_build",
           { "image.ref": imageRef, "image.platform": TARGET_PLATFORM },
-          () => params.schedulesCommand ? buildSchedulesCommandImage(engine, buildParams) : engine.build(buildParams)
+          async () => {
+            if (params.schedulesCommand) {
+              await buildSchedulesCommandImage(engine, buildParams);
+            } else {
+              await engine.build(buildParams);
+            }
+          }
         );
         done(`built in ${elapsed(buildStart)}`);
         const pushStart = Date.now();
@@ -4143,10 +4158,12 @@ async function resolveImageHandler(options, source, buildahClient, span, schedul
   );
   const tag = resolveImageTag();
   const contextDir = schedulesCommand ? import_node_path22.default.join(options.workPath, schedulesCommand.root) : import_node_path22.default.dirname(dockerfilePath);
+  const contextIsRoot = Boolean(schedulesCommand) || import_node_path22.default.dirname(import_node_path22.default.normalize(daemon ? daemon.entrypoint : dockerfileRel)) === ".";
   const buildArgs = buildArgsFromEnv(meta?.buildEnv);
   span?.setAttributes({
     "container.mode": "build_and_push",
     "container.repository": repository,
+    "container.context_is_root": toTag(contextIsRoot),
     "image.tag": tag
   });
   return buildAndPushImage({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/container",
-  "version": "23.0.0",
+  "version": "23.0.1-snapshot-8a613d8ad85d",
   "license": "Apache-2.0",
   "main": "./dist/index.js",
   "homepage": "https://vercel.com/docs",