@catladder/cli 0.0.0-next-d71e41ba → 0.0.0-next-dccc0a36

package/dist/packages/pipeline/src/context/createComponentContext.js

@@ -14,6 +14,7 @@ const createComponentContext = async (ctx) => {
         throw new Error("componentName may only contain lower case letters, numbers and -");
     }
     const packageManagerInfoPromise = (0, packageManager_1.getPackageManagerInfoForComponent)(ctx.config, ctx.componentName);
+    const { type: packageManagerType } = await packageManagerInfoPromise;
     const envContext = (0, getEnvironmentContext_1.getEnvironmentContext)(ctx);
     const componentConfigWithoutDefaults = envContext.envConfigRaw;
     const resolvedBuildType = componentConfigWithoutDefaults.build === false
@@ -27,12 +28,12 @@ const createComponentContext = async (ctx) => {
     const defaults = componentConfigWithoutDefaults.deploy
         ? {
             build: resolvedBuildType &&
-                build_1.BUILD_TYPES[resolvedBuildType].defaults(envContext),
+                build_1.BUILD_TYPES[resolvedBuildType].defaults(envContext, packageManagerType),
             deploy: deploy_1.DEPLOY_TYPES[componentConfigWithoutDefaults.deploy.type].defaults(envContext),
         }
         : {
             build: resolvedBuildType &&
-                build_1.BUILD_TYPES[resolvedBuildType].defaults(envContext),
+                build_1.BUILD_TYPES[resolvedBuildType].defaults(envContext, packageManagerType),
             deploy: {},
         };
     const componentConfig = (0, utils_1.mergeWithMergingArrays)(defaults, componentConfigWithoutDefaults);

package/dist/packages/pipeline/src/context/createComponentContext.js.map

@@ -1 +1 @@
-{"version":3,"file":"createComponentContext.js","sourceRoot":"","sources":["../../../../../../../packages/pipeline/src/context/createComponentContext.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"createComponentContext.js","sourceRoot":"","sources":["../../../../../../../packages/pipeline/src/context/createComponentContext.ts"],"names":[],"mappings":"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"}

package/dist/packages/pipeline/src/context/createWorkspaceContext.js

@@ -11,7 +11,8 @@ async function createWorkspaceContext({ env, components, workspaceName, config,
     if (!workspaceConfigRaw) {
         throw new Error(`Workspace ${workspaceName} not found in config`);
     }
-    const defaults = __1.WORKSPACE_BUILD_TYPES[workspaceConfigRaw.type].defaults();
+    const packageManagerInfo = (0, packageManager_1.getPackageManagerInfoBase)(config);
+    const defaults = __1.WORKSPACE_BUILD_TYPES[workspaceConfigRaw.type].defaults((await packageManagerInfo).type);
     const workspaceConfig = (0, utils_1.mergeWithMergingArrays)(defaults, workspaceConfigRaw);
     return {
         name: workspaceName,
@@ -22,7 +23,7 @@ async function createWorkspaceContext({ env, components, workspaceName, config,
         env,
         components,
         fullConfig: config,
-        packageManagerInfo: (0, packageManager_1.getPackageManagerInfoBase)(),
+        packageManagerInfo,
         build: {
             type: "workspace",
             dir: (_b = workspaceConfig.dir) !== null && _b !== void 0 ? _b : ".",

package/dist/packages/pipeline/src/context/createWorkspaceContext.js.map

@@ -1 +1 @@
-{"version":3,"file":"createWorkspaceContext.js","sourceRoot":"","sources":["../../../../../../../packages/pipeline/src/context/createWorkspaceContext.ts"],"names":[],"mappings":";;;AAAA,0BAMY;AACZ,+DAAuE;AACvE,oCAAkD;AAClD,yCAAiC;AAE1B,KAAK,UAAU,sBAAsB,CAAC,EAC3C,GAAG,EACH,UAAU,EACV,aAAa,EACb,MAAM,EACN,YAAY,EACZ,OAAO,GAQR;;IACC,MAAM,kBAAkB,GAAG,MAAA,MAAM,CAAC,MAAM,0CAAG,aAAa,CAAC,CAAC;IAC1D,IAAI,CAAC,kBAAkB,EAAE,CAAC;QACxB,MAAM,IAAI,KAAK,CAAC,aAAa,aAAa,sBAAsB,CAAC,CAAC;IACpE,CAAC;IAED,MAAM,QAAQ,GAAG,yBAAqB,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC;IAE3E,MAAM,eAAe,GAAG,IAAA,8BAAsB,EAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC;IAC7E,OAAO;QACL,IAAI,EAAE,aAAa;QACnB,YAAY;QACZ,OAAO;QACP,IAAI,EAAE,WAAW;QAEjB,eAAe;QAEf,GAAG;QACH,UAAU;QACV,UAAU,EAAE,MAAM;QAClB,kBAAkB,EAAE,IAAA,0CAAyB,GAAE;QAC/C,KAAK,EAAE;YACL,IAAI,EAAE,WAAW;YACjB,GAAG,EAAE,MAAA,eAAe,CAAC,GAAG,mCAAI,GAAG;YAC/B,gBAAgB,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,CAC/B,IAAA,gBAAI,EACF,CACE,MAAM,OAAO,CAAC,GAAG,CACf,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CACtD,CACF,CAAC,IAAI,EAAE,CACT;YACH,SAAS,EAAE,eAAe,CAAC,IAAI;YAC/B,MAAM,EAAE,eAAe;SACxB;KACF,CAAC;AACJ,CAAC;AAlDD,wDAkDC"}
+{"version":3,"file":"createWorkspaceContext.js","sourceRoot":"","sources":["../../../../../../../packages/pipeline/src/context/createWorkspaceContext.ts"],"names":[],"mappings":";;;AAAA,0BAMY;AACZ,+DAAuE;AACvE,oCAAkD;AAClD,yCAAiC;AAE1B,KAAK,UAAU,sBAAsB,CAAC,EAC3C,GAAG,EACH,UAAU,EACV,aAAa,EACb,MAAM,EACN,YAAY,EACZ,OAAO,GAQR;;IACC,MAAM,kBAAkB,GAAG,MAAA,MAAM,CAAC,MAAM,0CAAG,aAAa,CAAC,CAAC;IAC1D,IAAI,CAAC,kBAAkB,EAAE,CAAC;QACxB,MAAM,IAAI,KAAK,CAAC,aAAa,aAAa,sBAAsB,CAAC,CAAC;IACpE,CAAC;IAED,MAAM,kBAAkB,GAAG,IAAA,0CAAyB,EAAC,MAAM,CAAC,CAAC;IAC7D,MAAM,QAAQ,GAAG,yBAAqB,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,QAAQ,CACtE,CAAC,MAAM,kBAAkB,CAAC,CAAC,IAAI,CAChC,CAAC;IAEF,MAAM,eAAe,GAAG,IAAA,8BAAsB,EAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC;IAC7E,OAAO;QACL,IAAI,EAAE,aAAa;QACnB,YAAY;QACZ,OAAO;QACP,IAAI,EAAE,WAAW;QAEjB,eAAe;QAEf,GAAG;QACH,UAAU;QACV,UAAU,EAAE,MAAM;QAClB,kBAAkB;QAClB,KAAK,EAAE;YACL,IAAI,EAAE,WAAW;YACjB,GAAG,EAAE,MAAA,eAAe,CAAC,GAAG,mCAAI,GAAG;YAC/B,gBAAgB,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,CAC/B,IAAA,gBAAI,EACF,CACE,MAAM,OAAO,CAAC,GAAG,CACf,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CACtD,CACF,CAAC,IAAI,EAAE,CACT;YACH,SAAS,EAAE,eAAe,CAAC,IAAI;YAC/B,MAAM,EAAE,eAAe;SACxB;KACF,CAAC;AACJ,CAAC;AArDD,wDAqDC"}

package/dist/packages/pipeline/src/customImages/hash.d.ts

@@ -13,3 +13,12 @@ export type CustomImageHashResult = {
     watchedPaths: string[];
 };
 export declare function computeCustomImageHash(config: ImageHashConfig): CustomImageHashResult;
+/**
+ * the hash of an image defined by an inline Dockerfile: its content
+ * stands in for the definition dir. The build context is deliberately
+ * NOT hashed (it may be the whole repository) — `hashExtraPaths` is how
+ * context files opt into the hash.
+ */
+export declare function computeInlineImageHash(config: Pick<ImageHashConfig, "hashExtraPaths" | "buildArgs"> & {
+    dockerfileContent: string;
+}): CustomImageHashResult;

package/dist/packages/pipeline/src/customImages/hash.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.computeCustomImageHash = void 0;
+exports.computeInlineImageHash = exports.computeCustomImageHash = void 0;
 const crypto_1 = require("crypto");
 const fs_1 = require("fs");
 const path_1 = require("path");
@@ -21,6 +21,29 @@ function listFilesRecursive(dir) {
     })
         .sort();
 }
+/**
+ * the parts every image definition hashes on top of its content:
+ * files outside the definition, and the build args
+ */
+function hashExtras(hash, config) {
+    const watchedPaths = [];
+    // Hash extra paths (for files outside the dir)
+    if (config.hashExtraPaths) {
+        // Extra paths are literal file paths (not globs) for simplicity
+        const extraFiles = [...config.hashExtraPaths].sort();
+        for (const file of extraFiles) {
+            hash.update(file);
+            hash.update((0, fs_1.readFileSync)(file));
+        }
+        watchedPaths.push(...config.hashExtraPaths);
+    }
+    // Hash build args (sorted keys for determinism)
+    if (config.buildArgs) {
+        const sorted = Object.entries(config.buildArgs).sort(([a], [b]) => a.localeCompare(b));
+        hash.update(JSON.stringify(sorted));
+    }
+    return watchedPaths;
+}
 function computeCustomImageHash(config) {
     var _a;
     const hash = (0, crypto_1.createHash)("sha256");
@@ -41,25 +64,27 @@ function computeCustomImageHash(config) {
         }
         watchedPaths.push(`${extraDir}/**/*`);
     }
-    // Hash extra paths (for files outside the dir)
-    if (config.hashExtraPaths) {
-        // Extra paths are literal file paths (not globs) for simplicity
-        const extraFiles = [...config.hashExtraPaths].sort();
-        for (const file of extraFiles) {
-            hash.update(file);
-            hash.update((0, fs_1.readFileSync)(file));
-        }
-        watchedPaths.push(...config.hashExtraPaths);
-    }
-    // Hash build args (sorted keys for determinism)
-    if (config.buildArgs) {
-        const sorted = Object.entries(config.buildArgs).sort(([a], [b]) => a.localeCompare(b));
-        hash.update(JSON.stringify(sorted));
-    }
+    watchedPaths.push(...hashExtras(hash, config));
     return {
         hash: hash.digest("hex").slice(0, 12),
         watchedPaths,
     };
 }
 exports.computeCustomImageHash = computeCustomImageHash;
+/**
+ * the hash of an image defined by an inline Dockerfile: its content
+ * stands in for the definition dir. The build context is deliberately
+ * NOT hashed (it may be the whole repository) — `hashExtraPaths` is how
+ * context files opt into the hash.
+ */
+function computeInlineImageHash(config) {
+    const hash = (0, crypto_1.createHash)("sha256");
+    hash.update(config.dockerfileContent);
+    const watchedPaths = hashExtras(hash, config);
+    return {
+        hash: hash.digest("hex").slice(0, 12),
+        watchedPaths,
+    };
+}
+exports.computeInlineImageHash = computeInlineImageHash;
 //# sourceMappingURL=hash.js.map

package/dist/packages/pipeline/src/customImages/hash.js.map

@@ -1 +1 @@
-{"version":3,"file":"hash.js","sourceRoot":"","sources":["../../../../../../../packages/pipeline/src/customImages/hash.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"hash.js","sourceRoot":"","sources":["../../../../../../../packages/pipeline/src/customImages/hash.ts"],"names":[],"mappings":"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"}

package/dist/packages/pipeline/src/customImages/jobImagesPlan.d.ts

@@ -1,6 +1,7 @@
 import type { CatladderImageRef } from "../runner";
 import type { GitlabJobImage, PipelineType } from "../types";
 import type { CatladderJob, CatladderJobNeed } from "../types/jobs";
+import type { ProjectImageConfig, ProjectImageRef } from "./projectImages";
 export declare const GENERATED_IMAGES_FOLDER = ".catladder-generated/images";
 export type ResolvedJobImage = {
     /** the concrete image url */
@@ -14,6 +15,11 @@ export type GeneratedImageFile = {
     path: string;
     content: string;
 };
+/**
+ * where inline project Dockerfiles are materialized — a subfolder, so a
+ * project image can carry the same name as a shipped one
+ */
+export declare const PROJECT_IMAGES_FOLDER = ".catladder-generated/images/project";
 /**
  * plans the catladder job images of one backend run: resolves image
  * references, collects the image build jobs, and the image definitions
@@ -25,8 +31,10 @@ export type GeneratedImageFile = {
  */
 export declare class JobImagesPlan {
     private readonly pipelineType;
+    private readonly projectImages;
     private used;
-    constructor(pipelineType: PipelineType);
+    private usedProject;
+    constructor(pipelineType: PipelineType, projectImages?: Record<string, ProjectImageConfig>);
     /**
      * resolves a job image (marker or concrete) to a concrete image url
      * plus the build job dependency
@@ -37,21 +45,31 @@ export declare class JobImagesPlan {
         fromRepoRegistry?: boolean;
     };
     resolveRef(ref: CatladderImageRef): ResolvedJobImage;
+    resolveProjectRef(ref: ProjectImageRef): ResolvedJobImage;
     /**
      * the registry image prefix. On github, container images can't use
      * runtime env vars — the expression form is required.
      */
     private registryImageRef;
+    private useProject;
+    /**
+     * the source-dependent half of a project image: an inline Dockerfile
+     * is materialized into the generated files and hashed by its content,
+     * a directory is hashed and watched in place
+     */
+    private planProjectSource;
     private use;
     /**
      * the image build jobs for all used images
      */
     getEnsureJobs(): CatladderJob[];
-    private createEnsureJob;
+    private createImageBuildJob;
     /**
-     * the image definitions of all used images, materialized into the
-     * generated files (so pipelines build from committed, reviewable
-     * files and gitlab's rules:changes can watch them)
+     * the image definitions to materialize into the generated files (so
+     * pipelines build from committed, reviewable files and gitlab's
+     * rules:changes can watch them): the definitions catladder ships and
+     * the project's inline Dockerfiles. A project image directory is
+     * already committed and contributes nothing.
      */
     getGeneratedFiles(): GeneratedImageFile[];
 }

package/dist/packages/pipeline/src/customImages/jobImagesPlan.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.JobImagesPlan = exports.GENERATED_IMAGES_FOLDER = void 0;
+exports.JobImagesPlan = exports.PROJECT_IMAGES_FOLDER = exports.GENERATED_IMAGES_FOLDER = void 0;
 const fs_1 = require("fs");
 const path_1 = require("path");
 const ciVariables_1 = require("../bash/ciVariables");
@@ -8,6 +8,7 @@ const docker_1 = require("../build/docker");
 const runner_1 = require("../runner");
 const gitlab_1 = require("../utils/gitlab");
 const hash_1 = require("./hash");
+const projectImages_1 = require("./projectImages");
 const shippedImages_1 = require("./shippedImages");
 exports.GENERATED_IMAGES_FOLDER = ".catladder-generated/images";
 /**
@@ -15,7 +16,44 @@ exports.GENERATED_IMAGES_FOLDER = ".catladder-generated/images";
  * catladder image, so building images never depends on one (bootstrap)
  */
 const BUILDER_IMAGE = "docker.io/docker:29.5.1";
-const ensureJobName = (name) => `🐳 job image ${name}`;
+/**
+ * every planned image is consumed the same way: its url, plus an
+ * optional dependency on its build job
+ */
+const toResolvedJobImage = ({ imageRef, jobName, }) => ({
+    image: imageRef,
+    fromRepoRegistry: true,
+    need: {
+        job: jobName,
+        artifacts: false,
+        optional: true,
+        global: true,
+    },
+});
+/**
+ * materializes an image definition directory into the generated files
+ * (used for the definitions catladder ships)
+ */
+const materializeDir = (sourceDir, targetDir) => listFilesRecursive(sourceDir).map((file) => ({
+    path: (0, path_1.join)(targetDir, file),
+    content: (0, fs_1.readFileSync)((0, path_1.join)(sourceDir, file), "utf-8"),
+}));
+// built-in (catladder-shipped) images carry the catladder marker in
+// their job name; project-declared images get the short plain name
+const ensureJobName = (name) => `🐳 catladder image ${name}`;
+const projectEnsureJobName = (name) => `🐳 image ${name}`;
+/**
+ * the config file whose content feeds the project image hashes
+ * (`buildArgs`, `hashExtraPaths`): the gitlab change detection has to
+ * watch it, because a config-only change alters the image tag without
+ * touching the image dir
+ */
+const CONFIG_FILE = "catladder.ts";
+/**
+ * where inline project Dockerfiles are materialized — a subfolder, so a
+ * project image can carry the same name as a shipped one
+ */
+exports.PROJECT_IMAGES_FOLDER = `${exports.GENERATED_IMAGES_FOLDER}/project`;
 /**
  * plans the catladder job images of one backend run: resolves image
  * references, collects the image build jobs, and the image definitions
@@ -26,33 +64,30 @@ const ensureJobName = (name) => `🐳 job image ${name}`;
  * Reference-driven: only images actually used by a job are built.
  */
 class JobImagesPlan {
-    constructor(pipelineType) {
+    constructor(pipelineType, projectImages = {}) {
         this.pipelineType = pipelineType;
+        this.projectImages = projectImages;
         this.used = new Map();
+        this.usedProject = new Map();
     }
     /**
      * resolves a job image (marker or concrete) to a concrete image url
      * plus the build job dependency
      */
     resolve(image) {
-        if (!(0, runner_1.isCatladderImageRef)(image)) {
-            return { image };
+        if ((0, runner_1.isCatladderImageRef)(image)) {
+            return this.resolveRef(image);
+        }
+        if ((0, projectImages_1.isProjectImageRef)(image)) {
+            return this.resolveProjectRef(image);
         }
-        return this.resolveRef(image);
+        return { image };
     }
     resolveRef(ref) {
-        const name = ref.catladderImage;
-        const { hash } = this.use(name);
-        return {
-            image: `${this.registryImageRef()}/catladder/${name}:${hash}`,
-            fromRepoRegistry: true,
-            need: {
-                job: ensureJobName(name),
-                artifacts: false,
-                optional: true,
-                global: true,
-            },
-        };
+        return toResolvedJobImage(this.use(ref.catladderImage));
+    }
+    resolveProjectRef(ref) {
+        return toResolvedJobImage(this.useProject(ref.image));
     }
     /**
      * the registry image prefix. On github, container images can't use
@@ -63,6 +98,85 @@ class JobImagesPlan {
             ? "ghcr.io/${{ github.repository }}"
             : `${(0, ciVariables_1.getCiVariable)({ pipelineType: this.pipelineType }, "registryImage")}`;
     }
+    useProject(name) {
+        const existing = this.usedProject.get(name);
+        if (existing) {
+            return existing;
+        }
+        const imageConfig = this.projectImages[name];
+        if (!imageConfig) {
+            const declared = Object.keys(this.projectImages);
+            throw new Error(`unknown job image "${name}" — ${declared.length > 0
+                ? `images declared in config.images: ${declared.join(", ")}`
+                : "no images are declared in config.images"}`);
+        }
+        const source = this.planProjectSource(name, imageConfig);
+        const planned = {
+            ...source,
+            jobName: projectEnsureJobName(name),
+            buildArgs: imageConfig.buildArgs,
+            // `job-images/` keeps the project's job images apart from its
+            // deployable component images (registry root) and build caches
+            imageRef: `${this.registryImageRef()}/job-images/${name}:${source.hash}`,
+        };
+        this.usedProject.set(name, planned);
+        return planned;
+    }
+    /**
+     * the source-dependent half of a project image: an inline Dockerfile
+     * is materialized into the generated files and hashed by its content,
+     * a directory is hashed and watched in place
+     */
+    planProjectSource(name, imageConfig) {
+        var _a, _b;
+        if (imageConfig.dockerfile !== undefined) {
+            const content = toDockerfileContent(imageConfig.dockerfile);
+            const dockerfilePath = `${exports.PROJECT_IMAGES_FOLDER}/${name}/Dockerfile`;
+            const { hash, watchedPaths } = (0, hash_1.computeInlineImageHash)({
+                dockerfileContent: content,
+                hashExtraPaths: imageConfig.hashExtraPaths,
+                buildArgs: imageConfig.buildArgs,
+            });
+            return {
+                hash,
+                dockerfilePath,
+                // an inline definition carries no directory of its own — the
+                // repository root is the sensible default context
+                contextDir: (_a = imageConfig.context) !== null && _a !== void 0 ? _a : ".",
+                watchedPaths: [
+                    `${exports.PROJECT_IMAGES_FOLDER}/${name}/**/*`,
+                    ...watchedPaths,
+                    CONFIG_FILE,
+                ],
+                files: [{ path: dockerfilePath, content }],
+            };
+        }
+        const dir = imageConfig.dir;
+        // fail at generation time with the offending image named: an
+        // unreadable dir would otherwise surface as a bare fs ENOENT, and a
+        // missing Dockerfile only as a docker build failure in CI
+        if (!(0, fs_1.existsSync)(dir)) {
+            throw new Error(`job image "${name}": the directory "${dir}" does not exist (config.images.${name}.dir, relative to the repository root)`);
+        }
+        if (!(0, fs_1.existsSync)((0, path_1.join)(dir, "Dockerfile"))) {
+            throw new Error(`job image "${name}": no Dockerfile in "${dir}" (config.images.${name}.dir)`);
+        }
+        const { hash, watchedPaths } = (0, hash_1.computeCustomImageHash)({
+            dir,
+            hashExtraPaths: imageConfig.hashExtraPaths,
+            buildArgs: imageConfig.buildArgs,
+        });
+        return {
+            hash,
+            dockerfilePath: `${dir}/Dockerfile`,
+            contextDir: (_b = imageConfig.context) !== null && _b !== void 0 ? _b : dir,
+            // the dir is committed in the project — watched in place, nothing
+            // is materialized. The config file is watched too: buildArgs /
+            // hashExtraPaths changes alter the tag without touching the dir
+            watchedPaths: [...watchedPaths, CONFIG_FILE],
+            files: [],
+        };
+    }
     use(name) {
         var _a;
         const existing = this.used.get(name);
@@ -77,27 +191,43 @@ class JobImagesPlan {
             dir: (0, shippedImages_1.getShippedImageDir)(name),
             extraDirs: dependencies.map((dependency) => (0, shippedImages_1.getShippedImageDir)(dependency)),
         });
-        const entry = { hash };
-        this.used.set(name, entry);
-        return entry;
+        const targetDir = `${exports.GENERATED_IMAGES_FOLDER}/${name}`;
+        const planned = {
+            hash,
+            jobName: ensureJobName(name),
+            imageRef: `${this.registryImageRef()}/catladder/${name}:${hash}`,
+            dockerfilePath: `${targetDir}/Dockerfile`,
+            // the jobs family INCLUDEs sibling images, so it builds from the
+            // images root; the others from their own dir
+            contextDir: shippedImages_1.RUNNER_IMAGE_BUILD_CONTEXT[name] === "root"
+                ? exports.GENERATED_IMAGES_FOLDER
+                : targetDir,
+            watchedPaths: [name, ...dependencies].map((dir) => `${exports.GENERATED_IMAGES_FOLDER}/${dir}/**/*`),
+            // pipelines build from committed, reviewable files (and gitlab's
+            // rules:changes can watch them)
+            files: materializeDir((0, shippedImages_1.getShippedImageDir)(name), targetDir),
+        };
+        this.used.set(name, planned);
+        return planned;
     }
     /**
      * the image build jobs for all used images
      */
     getEnsureJobs() {
-        return [...this.used.entries()].map(([name, { hash }]) => this.createEnsureJob(name, hash));
+        return [...this.used.values(), ...this.usedProject.values()].map((planned) => this.createImageBuildJob(planned));
     }
-    createEnsureJob(name, hash) {
-        var _a;
+    createImageBuildJob({ jobName, imageRef, watchedPaths, dockerfilePath, contextDir, buildArgs, }) {
+        const buildArgFlags = Object.entries(buildArgs !== null && buildArgs !== void 0 ? buildArgs : {})
+            .map(([key, value]) => ` --build-arg '${key}=${value}'`)
+            .join("");
+        const buildCommand = `DOCKER_BUILDKIT=1 docker build -t ${imageRef}${buildArgFlags} -f ${dockerfilePath} ${contextDir}`;
         const ctx = { pipelineType: this.pipelineType };
         const registryUser = (0, ciVariables_1.getCiVariable)(ctx, "registryUser");
         const jobToken = (0, ciVariables_1.getCiVariable)(ctx, "jobToken");
         const registry = (0, ciVariables_1.getCiVariable)(ctx, "registry");
-        const imageRef = `${this.registryImageRef()}/catladder/${name}:${hash}`;
-        const watchedDirs = [name, ...((_a = shippedImages_1.RUNNER_IMAGE_DEPENDENCIES[name]) !== null && _a !== void 0 ? _a : [])];
         const { services, runnerVariables } = (0, docker_1.getDockerJobBaseProps)();
         return {
-            name: ensureJobName(name),
+            name: jobName,
             stage: "setup",
             image: BUILDER_IMAGE,
             services,
@@ -107,7 +237,9 @@ class JobImagesPlan {
             // no equivalent and always runs (the existence check is fast)
             rules: [
                 {
-                    changes: watchedDirs.map((dir) => `${exports.GENERATED_IMAGES_FOLDER}/${dir}/**/*`),
+                    // a fresh array per job: the yaml serializer anchors repeated
+                    // objects, and a shared reference would reshuffle anchors
+                    changes: [...watchedPaths],
                 },
             ],
             variables: {},
@@ -121,31 +253,33 @@ class JobImagesPlan {
                     `  exit 0`,
                     `fi`,
                 ]),
-                ...(0, gitlab_1.collapseableSection)("docker-build", "Building image")([
-                    `DOCKER_BUILDKIT=1 docker build -t ${imageRef} -f ${exports.GENERATED_IMAGES_FOLDER}/${name}/Dockerfile ${shippedImages_1.RUNNER_IMAGE_BUILD_CONTEXT[name] === "root"
-                        ? exports.GENERATED_IMAGES_FOLDER
-                        : `${exports.GENERATED_IMAGES_FOLDER}/${name}`}`,
-                ]),
+                ...(0, gitlab_1.collapseableSection)("docker-build", "Building image")([buildCommand]),
                 ...(0, gitlab_1.collapseableSection)("docker-push", "Pushing image")([`docker push ${imageRef}`]),
             ],
         };
     }
     /**
-     * the image definitions of all used images, materialized into the
-     * generated files (so pipelines build from committed, reviewable
-     * files and gitlab's rules:changes can watch them)
+     * the image definitions to materialize into the generated files (so
+     * pipelines build from committed, reviewable files and gitlab's
+     * rules:changes can watch them): the definitions catladder ships and
+     * the project's inline Dockerfiles. A project image directory is
+     * already committed and contributes nothing.
      */
     getGeneratedFiles() {
-        return [...this.used.keys()].flatMap((name) => {
-            const dir = (0, shippedImages_1.getShippedImageDir)(name);
-            return listFilesRecursive(dir).map((file) => ({
-                path: (0, path_1.join)(exports.GENERATED_IMAGES_FOLDER, name, file),
-                content: (0, fs_1.readFileSync)((0, path_1.join)(dir, file), "utf-8"),
-            }));
-        });
+        return [...this.used.values(), ...this.usedProject.values()].flatMap(({ files }) => files);
     }
 }
 exports.JobImagesPlan = JobImagesPlan;
+/**
+ * an inline Dockerfile is written as given — as one string, or as lines
+ * joined with newlines (always newline-terminated)
+ */
+const toDockerfileContent = (dockerfile) => {
+    const content = Array.isArray(dockerfile)
+        ? dockerfile.join("\n")
+        : dockerfile;
+    return content.endsWith("\n") ? content : `${content}\n`;
+};
 const IGNORED_FILES = new Set([".DS_Store", "Thumbs.db"]);
 const listFilesRecursive = (dir) => (0, fs_1.readdirSync)(dir, { recursive: true, encoding: "utf-8" })
     .filter((entry) => {

package/dist/packages/pipeline/src/customImages/jobImagesPlan.js.map

@@ -1 +1 @@
-{"version":3,"file":"jobImagesPlan.js","sourceRoot":"","sources":["../../../../../../../packages/pipeline/src/customImages/jobImagesPlan.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"jobImagesPlan.js","sourceRoot":"","sources":["../../../../../../../packages/pipeline/src/customImages/jobImagesPlan.ts"],"names":[],"mappings":"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"}