@catladder/pipeline 1.146.1 → 1.147.0

package/dist/build/node/testJob.js

@@ -58,41 +58,41 @@ var createNodeTestJobs = function (context) {
   if (context.trigger === "taggedRelease") {
     return [];
   }
-  var buildConfig = context.componentConfig.build;
+  var buildConfig = context.build.config;
   var defaultImage = (0, runner_1.getRunnerImage)("jobs-default");
   var base = {
     variables: __assign(__assign({
-      APP_PATH: context.componentConfig.dir
+      APP_PATH: context.build.dir
     }, context.environment.jobOnlyVars.build.envVars), (_a = buildConfig.extraVars) !== null && _a !== void 0 ? _a : {}),
     runnerVariables: constants_1.NODE_RUNNER_BUILD_VARIABLES,
     stage: "test",
     needs: [],
     envMode: "none"
   };
-  var yarnInstall = (0, yarn_1.getYarnInstall)(context);
+  var yarnInstall = (0, yarn_1.getYarnInstall)(context.build);
   var auditJob = buildConfig.audit !== false ? __assign(__assign(__assign({
     name: "🛡 audit"
   }, base), {
     image: (_c = (_b = buildConfig.audit) === null || _b === void 0 ? void 0 : _b.jobImage) !== null && _c !== void 0 ? _c : defaultImage,
     cache: undefined,
-    script: __spreadArray(["cd ".concat(context.componentConfig.dir)], __read((_e = (0, utils_1.ensureArray)((_d = buildConfig.audit) === null || _d === void 0 ? void 0 : _d.command)) !== null && _e !== void 0 ? _e : [((_f = context.packageManagerInfo) === null || _f === void 0 ? void 0 : _f.isClassic) ? "yarn audit" : "yarn npm audit --environment production" // yarn 2
+    script: __spreadArray(["cd ".concat(context.build.dir)], __read((_e = (0, utils_1.ensureArray)((_d = buildConfig.audit) === null || _d === void 0 ? void 0 : _d.command)) !== null && _e !== void 0 ? _e : [((_f = context.build.packageManagerInfo) === null || _f === void 0 ? void 0 : _f.isClassic) ? "yarn audit" : "yarn npm audit --environment production" // yarn 2
     ]), false),
     allow_failure: true
-  }), (0, createArtifactsConfig_1.createArtifactsConfig)(context.componentConfig.dir, (_g = buildConfig.audit) === null || _g === void 0 ? void 0 : _g.artifactsReports, (_h = buildConfig.audit) === null || _h === void 0 ? void 0 : _h.artifacts)) : null;
+  }), (0, createArtifactsConfig_1.createArtifactsConfig)(context.build.dir, (_g = buildConfig.audit) === null || _g === void 0 ? void 0 : _g.artifactsReports, (_h = buildConfig.audit) === null || _h === void 0 ? void 0 : _h.artifacts)) : null;
   var lintJob = buildConfig.lint !== false ? __assign(__assign(__assign({
     name: "👮 lint"
   }, base), {
     image: (_k = (_j = buildConfig.lint) === null || _j === void 0 ? void 0 : _j.jobImage) !== null && _k !== void 0 ? _k : defaultImage,
-    cache: (0, cache_1.getNodeCache)(context),
-    script: __spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, yarn_1.ensureNodeVersion)(context)), false), ["cd ".concat(context.componentConfig.dir)], false), __read(yarnInstall), false), __read((_m = (0, utils_1.ensureArray)((_l = buildConfig.lint) === null || _l === void 0 ? void 0 : _l.command)) !== null && _m !== void 0 ? _m : ["yarn lint"]), false)
-  }), (0, createArtifactsConfig_1.createArtifactsConfig)(context.componentConfig.dir, (_o = buildConfig.lint) === null || _o === void 0 ? void 0 : _o.artifactsReports, (_p = buildConfig.lint) === null || _p === void 0 ? void 0 : _p.artifacts)) : null;
+    cache: (0, cache_1.getNodeCache)(context.build),
+    script: __spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, yarn_1.ensureNodeVersion)(context.build)), false), ["cd ".concat(context.build.dir)], false), __read(yarnInstall), false), __read((_m = (0, utils_1.ensureArray)((_l = buildConfig.lint) === null || _l === void 0 ? void 0 : _l.command)) !== null && _m !== void 0 ? _m : ["yarn lint"]), false)
+  }), (0, createArtifactsConfig_1.createArtifactsConfig)(context.build.dir, (_o = buildConfig.lint) === null || _o === void 0 ? void 0 : _o.artifactsReports, (_p = buildConfig.lint) === null || _p === void 0 ? void 0 : _p.artifacts)) : null;
   var testJob = buildConfig.test !== false ? __assign(__assign(__assign({
     name: "🧪 test"
   }, base), {
     image: (_r = (_q = buildConfig.test) === null || _q === void 0 ? void 0 : _q.jobImage) !== null && _r !== void 0 ? _r : (0, runner_1.getRunnerImage)("jobs-testing-chrome"),
-    cache: (0, cache_1.getNodeCache)(context),
-    script: __spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, yarn_1.ensureNodeVersion)(context)), false), ["cd ".concat(context.componentConfig.dir)], false), __read(yarnInstall), false), __read((_t = (0, utils_1.ensureArray)((_s = buildConfig.test) === null || _s === void 0 ? void 0 : _s.command)) !== null && _t !== void 0 ? _t : ["yarn test"]), false)
-  }), (0, createArtifactsConfig_1.createArtifactsConfig)(context.componentConfig.dir, (_u = buildConfig.test) === null || _u === void 0 ? void 0 : _u.artifactsReports, (_v = buildConfig.test) === null || _v === void 0 ? void 0 : _v.artifacts)) : null;
+    cache: (0, cache_1.getNodeCache)(context.build),
+    script: __spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, yarn_1.ensureNodeVersion)(context.build)), false), ["cd ".concat(context.build.dir)], false), __read(yarnInstall), false), __read((_t = (0, utils_1.ensureArray)((_s = buildConfig.test) === null || _s === void 0 ? void 0 : _s.command)) !== null && _t !== void 0 ? _t : ["yarn test"]), false)
+  }), (0, createArtifactsConfig_1.createArtifactsConfig)(context.build.dir, (_u = buildConfig.test) === null || _u === void 0 ? void 0 : _u.artifactsReports, (_v = buildConfig.test) === null || _v === void 0 ? void 0 : _v.artifacts)) : null;
   return [auditJob, lintJob, testJob].filter(utils_1.notNil);
 };
 exports.createNodeTestJobs = createNodeTestJobs;

package/dist/build/node/yarn.d.ts

@@ -1,7 +1,7 @@
 import { BashExpression } from "../../bash/BashExpression";
-import type { Context } from "../../types";
-export declare const ensureNodeVersion: (context: Context) => string[];
-export declare const getYarnInstall: (context: Context, options?: {
+import type { BuildContext } from "../../types";
+export declare const ensureNodeVersion: (context: BuildContext) => string[];
+export declare const getYarnInstall: (context: BuildContext, options?: {
   noCustomPostInstall: boolean;
 }) => string[];
-export declare const getDockerAppCopyAndBuildScript: (context: Context) => BashExpression;
+export declare const getDockerAppCopyAndBuildScript: (context: BuildContext) => BashExpression;

package/dist/build/node/yarn.js

@@ -54,7 +54,7 @@ var ensureNodeVersion = function (context) {
 exports.ensureNodeVersion = ensureNodeVersion;
 var getYarnInstall = function (context, options) {
   var _a;
-  var postInstall = "postInstall" in context.componentConfig.build ? context.componentConfig.build.postInstall : null;
+  var postInstall = "postInstall" in context.config ? context.config.postInstall : null;
   return __spreadArray(__spreadArray(__spreadArray([], __read((0, exports.ensureNodeVersion)(context)), false), __read((0, gitlab_1.collapseableSection)("yarninstall", "Yarn install")([getYarnInstallCommand(context)])), false), __read(postInstall && !(options === null || options === void 0 ? void 0 : options.noCustomPostInstall) ? (0, gitlab_1.collapseableSection)("postinstall", "Custom post install")((_a = (0, utils_1.ensureArray)(postInstall)) !== null && _a !== void 0 ? _a : []) : []), false);
 };
 exports.getYarnInstall = getYarnInstall;

package/dist/build/rails/build.d.ts

@@ -1,3 +1,3 @@
-import type { Context } from "../..";
+import type { ComponentContext } from "../..";
 import type { CatladderJob } from "../../types/jobs";
-export declare const createRailsBuildJobs: (context: Context) => CatladderJob[];
+export declare const createRailsBuildJobs: (context: ComponentContext) => CatladderJob[];

package/dist/build/rails/build.js

@@ -50,7 +50,7 @@ var docker_1 = require("../docker");
 var types_1 = require("../types");
 var createRailsBuildJobs = function (context) {
   var _a, _b, _c;
-  var buildConfig = context.componentConfig.build;
+  var buildConfig = context.build.config;
   if (!(0, types_1.isOfBuildType)(buildConfig, "rails")) {
     // should not happen
     throw new Error("build type is not rails");
@@ -74,9 +74,9 @@ var createRailsBuildJobs = function (context) {
   return (0, base_1.createBuildJobs)(context, {
     appBuild: undefined,
     dockerBuild: {
-      variables: __assign(__assign({}, context.environment.jobOnlyVars.build.envVars), context.componentConfig.build.extraVars),
+      variables: __assign(__assign({}, context.environment.jobOnlyVars.build.envVars), context.build.config.extraVars),
       // custom script
-      script: __spreadArray(__spreadArray([], __read((0, docker_1.gitlabDockerLogin)(context)), false), ["cd ".concat(context.componentConfig.dir), "docker pull $DOCKER_CACHE_IMAGE || true", "wget --output-document=- https://github.com/buildpacks/pack/releases/download/v".concat(cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.packVersion, "/pack-v").concat(cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.packVersion, "-linux.tgz | tar -zx --directory /usr/local/bin pack"), "chmod +x /usr/local/bin/pack",
+      script: __spreadArray(__spreadArray([], __read((0, docker_1.gitlabDockerLogin)(context)), false), ["cd ".concat(context.build.dir), "docker pull $DOCKER_CACHE_IMAGE || true", "wget --output-document=- https://github.com/buildpacks/pack/releases/download/v".concat(cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.packVersion, "/pack-v").concat(cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.packVersion, "-linux.tgz | tar -zx --directory /usr/local/bin pack"), "chmod +x /usr/local/bin/pack",
       //  replace private git ssh gem sources with https to make bundler with credentials via env var work
       "sed --in-place 's|git@\\([^:]*\\):|https://\\1/|g' Gemfile Gemfile.lock", "pack build \"$DOCKER_IMAGE:$DOCKER_IMAGE_TAG\" --builder '".concat(cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.image, "' --publish --cache-image \"$DOCKER_CACHE_IMAGE\" ").concat(packEnvArgs, " ").concat((_c = (_b = cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.packExtraArgs) === null || _b === void 0 ? void 0 : _b.join(" ")) !== null && _c !== void 0 ? _c : "")], false)
     }

package/dist/build/rails/index.d.ts

@@ -1,3 +1,3 @@
-import type { Context } from "../../types";
+import type { ComponentContext } from "../../types";
 import type { CatladderJob } from "../../types/jobs";
-export declare const createRailsJobs: (context: Context) => CatladderJob[];
+export declare const createRailsJobs: (context: ComponentContext) => CatladderJob[];

package/dist/build/rails/test.d.ts

@@ -1,3 +1,3 @@
-import type { Context } from "../..";
+import type { ComponentContext } from "../..";
 import type { CatladderJob } from "../../types/jobs";
-export declare const createRailsTestJobs: (context: Context) => CatladderJob[];
+export declare const createRailsTestJobs: (context: ComponentContext) => CatladderJob[];

package/dist/build/rails/test.js

@@ -53,7 +53,7 @@ var createRailsTestJobs = function (context) {
   if (context.trigger === "taggedRelease") {
     return [];
   }
-  var buildConfig = context.componentConfig.build;
+  var buildConfig = context.build.config;
   var base = {
     variables: __assign(__assign({}, context.environment.jobOnlyVars.build.envVars), (_a = buildConfig.extraVars) !== null && _a !== void 0 ? _a : {}),
     stage: "test",
@@ -76,7 +76,7 @@ var createRailsTestJobs = function (context) {
   }, base), {
     cache: undefined,
     image: (_d = (_c = (_b = buildConfig.audit) === null || _b === void 0 ? void 0 : _b.jobImage) !== null && _c !== void 0 ? _c : buildConfig.jobImage) !== null && _d !== void 0 ? _d : defaultImage,
-    script: __spreadArray(["cd ".concat(context.componentConfig.dir)], __read((_f = (0, utils_1.ensureArray)((_e = buildConfig.audit) === null || _e === void 0 ? void 0 : _e.command)) !== null && _f !== void 0 ? _f : ["gem install bundler-audit", "bundle audit check"]), false),
+    script: __spreadArray(["cd ".concat(context.build.dir)], __read((_f = (0, utils_1.ensureArray)((_e = buildConfig.audit) === null || _e === void 0 ? void 0 : _e.command)) !== null && _f !== void 0 ? _f : ["gem install bundler-audit", "bundle audit check"]), false),
     allow_failure: true
   }) : null;
   var lintJob = buildConfig.lint !== false ? __assign(__assign({
@@ -84,14 +84,14 @@ var createRailsTestJobs = function (context) {
   }, base), {
     cache: bundlerCache,
     image: (_j = (_h = (_g = buildConfig.lint) === null || _g === void 0 ? void 0 : _g.jobImage) !== null && _h !== void 0 ? _h : buildConfig.jobImage) !== null && _j !== void 0 ? _j : defaultImage,
-    script: __spreadArray(__spreadArray(["cd ".concat(context.componentConfig.dir)], __read(bundlerInstall), false), __read((_l = (0, utils_1.ensureArray)((_k = buildConfig.lint) === null || _k === void 0 ? void 0 : _k.command)) !== null && _l !== void 0 ? _l : ["bundle exec rubocop"]), false)
+    script: __spreadArray(__spreadArray(["cd ".concat(context.build.dir)], __read(bundlerInstall), false), __read((_l = (0, utils_1.ensureArray)((_k = buildConfig.lint) === null || _k === void 0 ? void 0 : _k.command)) !== null && _l !== void 0 ? _l : ["bundle exec rubocop"]), false)
   }) : null;
   var testJob = buildConfig.test !== false ? __assign(__assign({
     name: "🧪 test"
   }, base), {
     cache: bundlerCache,
     image: (_p = (_o = (_m = buildConfig.test) === null || _m === void 0 ? void 0 : _m.jobImage) !== null && _o !== void 0 ? _o : buildConfig.jobImage) !== null && _p !== void 0 ? _p : defaultImage,
-    script: __spreadArray(__spreadArray(["cd ".concat(context.componentConfig.dir)], __read(bundlerInstall), false), __read((_r = (0, utils_1.ensureArray)((_q = buildConfig.test) === null || _q === void 0 ? void 0 : _q.command)) !== null && _r !== void 0 ? _r : ["bundle exec rspec"]), false)
+    script: __spreadArray(__spreadArray(["cd ".concat(context.build.dir)], __read(bundlerInstall), false), __read((_r = (0, utils_1.ensureArray)((_q = buildConfig.test) === null || _q === void 0 ? void 0 : _q.command)) !== null && _r !== void 0 ? _r : ["bundle exec rspec"]), false)
   }) : null;
   return [auditJob, lintJob, testJob].filter(utils_1.notNil);
 };

package/dist/build/sbom.d.ts

@@ -1,5 +1,5 @@
-import type { Context } from "../types/context";
+import type { ComponentContext } from "../types/context";
 import type { CatladderJob } from "../types/jobs";
 export declare const SBOM_BUILD_JOB_NAME = "\uD83E\uDDFE sbom";
 export declare const SBOM_FILE = "__sbom.json";
-export declare const createSbomBuildJob: (context: Context) => CatladderJob;
+export declare const createSbomBuildJob: (context: ComponentContext) => CatladderJob;

package/dist/build/sbom.js

@@ -9,9 +9,9 @@ exports.SBOM_BUILD_JOB_NAME = "🧾 sbom";
 exports.SBOM_FILE = "__sbom.json";
 var createSbomBuildJob = function (context) {
   var _a, _b, _c, _d, _e;
-  var buildConfig = context.componentConfig.build;
+  var buildConfig = context.build.config;
   var defaultImage = "aquasec/trivy:0.38.3";
-  var defaultScript = ["trivy fs --quiet --format cyclonedx --output \"".concat(exports.SBOM_FILE, "\" ").concat(((_a = context.packageManagerInfo) === null || _a === void 0 ? void 0 : _a.componentIsInWorkspace) ? "." : context.componentConfig.dir)];
+  var defaultScript = ["trivy fs --quiet --format cyclonedx --output \"".concat(exports.SBOM_FILE, "\" ").concat(((_a = context.build.packageManagerInfo) === null || _a === void 0 ? void 0 : _a.componentIsInWorkspace) ? "." : context.build.dir)];
   var image = buildConfig.type === "custom" && buildConfig.sbom !== false ? (_c = (_b = buildConfig.sbom) === null || _b === void 0 ? void 0 : _b.jobImage) !== null && _c !== void 0 ? _c : defaultImage : defaultImage;
   var script = buildConfig.type === "custom" && buildConfig.sbom !== false ? (_e = (0, utils_1.ensureArray)((_d = buildConfig.sbom) === null || _d === void 0 ? void 0 : _d.command)) !== null && _e !== void 0 ? _e : defaultScript : defaultScript;
   return {

package/dist/build/types.d.ts

@@ -51,27 +51,6 @@ export type BuildConfigBase = {
    * define the build command
    */
   buildCommand?: string | string[] | null;
-  /**
-   * customize docker build
-   */
-  docker?: {
-    /**
-     * Custom Dockerfile lines integrated in the generated Dockerfile before the standard build steps.
-     *
-     * - [runner-images/docker-build/scripts/ensureNodeDockerfile](https://git.panter.ch/catladder/catladder/-/tree/main/runner-images/docker-build/scripts/ensureNodeDockerfile)
-     * - [runner-images/docker-build/scripts/ensureNginxDockerfile](https://git.panter.ch/catladder/catladder/-/tree/main/runner-images/docker-build/scripts/ensureNginxDockerfile)
-     * - [runner-images/docker-build/scripts/ensureMeteorDockerfile](https://git.panter.ch/catladder/catladder/-/tree/main/runner-images/docker-build/scripts/ensureMeteorDockerfile)
-     */
-    additionsBegin?: string[];
-    /**
-     * Custom Dockerfile lines integrated in the generated Dockerfile after the standard build steps.
-     *
-     * - [runner-images/docker-build/scripts/ensureNodeDockerfile](https://git.panter.ch/catladder/catladder/-/tree/main/runner-images/docker-build/scripts/ensureNodeDockerfile)
-     * - [runner-images/docker-build/scripts/ensureNginxDockerfile](https://git.panter.ch/catladder/catladder/-/tree/main/runner-images/docker-build/scripts/ensureNginxDockerfile)
-     * - [runner-images/docker-build/scripts/ensureMeteorDockerfile](https://git.panter.ch/catladder/catladder/-/tree/main/runner-images/docker-build/scripts/ensureMeteorDockerfile)
-     */
-    additionsEnd?: string[];
-  };
   /**
    * customize lint, set false to disable
    */
@@ -116,10 +95,12 @@ export type BuildConfigNodeBase = BuildConfigBase & {
 };
 export type BuildConfigNode = {
   type: "node";
+  docker?: Omit<BuildConfigDockerBuiltInNode, "type"> | BuildConfigDocker;
 } & BuildConfigNodeBase;
 export type BuildConfigNodeStatic = BuildConfigNodeBase & {
   type: "node-static";
   startCommand?: never;
+  docker?: Omit<BuildConfigDockerBuiltInNgninx, "type"> | BuildConfigDocker;
 };
 export type BuildConfigMeteor = BuildConfigNodeBase & {
   type: "meteor";
@@ -128,18 +109,44 @@ export type BuildConfigMeteor = BuildConfigNodeBase & {
    * This is only required if you have custom scripts in your image
    */
   installScripts?: boolean;
+  docker?: Omit<BuildConfigDockerBuiltInMeteor, "type"> | BuildConfigDocker;
+};
+type BuildConfigDockerWithAdditions = {
+  /**
+   * Custom Dockerfile lines integrated in the generated Dockerfile before the standard build steps.
+   *
+   */
+  additionsBegin?: string[];
+  /**
+   * Custom Dockerfile lines integrated in the generated Dockerfile after the standard build steps.
+   *
+   */
+  additionsEnd?: string[];
 };
-export type BuildConfigCustomDocker = BuildConfigBase["docker"] & ({
+type BuildConfigDockerBuiltInNode = {
+  type: "node";
+} & BuildConfigDockerWithAdditions;
+type BuildConfigDockerBuiltInMeteor = {
+  type: "meteor";
+} & BuildConfigDockerWithAdditions;
+type BuildConfigDockerBuiltInNgninx = {
   /**
    * use the built-in nginx image for simple static apps
    */
   type: "nginx";
-} | {
+} & BuildConfigDockerWithAdditions;
+type BuildConfigDockerBuiltIn = BuildConfigDockerBuiltInNgninx | BuildConfigDockerBuiltInNode | BuildConfigDockerBuiltInMeteor;
+type BuildConfigDockerCustom = {
   /**
    * custom docker build, expect that a Dockerfile in your directory
    */
   type: "custom";
-});
+};
+export type BuildConfigDocker = BuildConfigDockerBuiltIn | BuildConfigDockerCustom;
+/**
+ * @deprecated this type is no longer used. Use {@link BuildConfigDocker} instead.
+ */
+export type BuildConfigCustomDocker = BuildConfigDockerCustom | BuildConfigDockerBuiltInNgninx;
 export type BuildConfigCustom = Omit<BuildConfigBase, "lint" | "test" | "audit"> & {
   type: "custom";
   jobImage: GitlabJobImage;
@@ -147,7 +154,7 @@ export type BuildConfigCustom = Omit<BuildConfigBase, "lint" | "test" | "audit">
    * {@link Services}s used in lint, test, audit, and build jobs.
    */
   jobServices?: Services;
-  docker: BuildConfigCustomDocker;
+  docker: BuildConfigDocker;
   /**
    * custom lint, disabled when not set
    */
@@ -227,4 +234,5 @@ export declare const isOfBuildType: <T extends ("node" | "node-static" | "storyb
   type: T[number];
 }> | Extract<BuildConfigRails, {
   type: T[number];
-}>;
+}>;
+export {};