npm-pkgbuild 11.1.12 → 11.1.13

package/README.md

@@ -116,6 +116,7 @@ see [mf-hosting](https://www.npmjs.com/package/mf-hosting) or [mf-hosting-fronte
 *   [fields](#fields)
 *   [fields](#fields-1)
 *   [fields](#fields-2)
+*   [fields](#fields-3)
 *   [hookMapping](#hookmapping)
 *   [hookMapping](#hookmapping-1)
 *   [Field](#field)
@@ -272,6 +273,10 @@ well known package properties
 
 ## fields
 
+*   **See**: {<https://docs.docker.com/engine/reference/builder/}>
+
+## fields
+
 *   **See**: <https://rpm-packaging-guide.github.io>
 
 ## hookMapping

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-pkgbuild",
-  "version": "11.1.12",
+  "version": "11.1.13",
   "publishConfig": {
     "access": "public"
   },

package/src/output/docker.mjs

@@ -1,12 +1,15 @@
 import { join } from "node:path";
+import { readFile } from "node:fs/promises";
 import { execa } from "execa";
 import { EmptyContentEntry, ReadableStreamContentEntry } from "content-entry";
+import { transform } from "content-entry-transform";
+import { aggregateFifo } from "aggregate-async-iterator";
 import {
   keyValueTransformer,
   equalSeparatedKeyValuePairOptions
 } from "key-value-transformer";
 import { Packager } from "./packager.mjs";
-import { fieldProvider } from "../util.mjs";
+import { fieldProvider, copyEntries, utf8StreamOptions } from "../util.mjs";
 
 const DOCKERFILE = "Dockerfile";
 
@@ -44,7 +47,7 @@ ENTRYPOINT ["node", ""]
       match: entry => entry.name === DOCKERFILE,
       transform: async entry =>
         new ReadableStreamContentEntry(
-          "../" + entry.name,
+          entry.name,
           keyValueTransformer(await entry.readStream, fp, {
             ...equalSeparatedKeyValuePairOptions,
             trailingLines
@@ -53,8 +56,22 @@ ENTRYPOINT ["node", ""]
       createEntryWhenMissing: () => new EmptyContentEntry(DOCKERFILE)
     });
 
+    for await (const file of copyEntries(
+      transform(aggregateFifo(sources), transformer),
+      staging,
+      expander
+    )) {
+      if (options.verbose) {
+        console.log("D", file.destination);
+      }
+    }
+
+    if (options.verbose) {
+      console.log(await readFile(join(staging, DOCKERFILE), utf8StreamOptions));
+    }
+
     if (!options.dry) {
-      const docker = await execa("docker", ["build", "-e"], {
+      const docker = await execa("docker", ["build", staging], {
         cwd: staging
       });