@catladder/pipeline 1.111.5 → 1.112.1

package/dist/build/base/createAppBuildJob.d.ts

@@ -0,0 +1,8 @@
+import type { Context } from "../..";
+import type { CatladderJob } from "../../types/jobs";
+export declare type AppBuildJobDefinition = Partial<CatladderJob>;
+export declare const createAppBuildJob: (context: Context, {
+  script,
+  variables,
+  ...def
+}: AppBuildJobDefinition) => CatladderJob;

package/dist/build/base/{createBuildJob.js → createAppBuildJob.js}

@@ -50,7 +50,7 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
   return to.concat(ar || Array.prototype.slice.call(from));
 };
 exports.__esModule = true;
-exports.createBuildJob = void 0;
+exports.createAppBuildJob = void 0;
 var lodash_1 = require("lodash");
 var path_1 = require("path");
 var __1 = require("../..");
@@ -59,7 +59,7 @@ var yarn_1 = require("../node/yarn");
 var constants_1 = require("./constants");
 var writeBuildInfo_1 = require("./writeBuildInfo");
 var writeDotEnv_1 = require("./writeDotEnv");
-var createBuildJob = function (context, _a) {
+var createAppBuildJob = function (context, _a) {
   var _b, _c, _d, _e;
   var script = _a.script,
     variables = _a.variables,
@@ -83,4 +83,4 @@ var createBuildJob = function (context, _a) {
     }
   }, def);
 };
-exports.createBuildJob = createBuildJob;
+exports.createAppBuildJob = createAppBuildJob;

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

@@ -0,0 +1,8 @@
+import type { Context } from "../../types/context";
+import type { CatladderJob } from "../../types/jobs";
+import type { DockerBuildJobDefinition } from "../docker";
+import type { AppBuildJobDefinition } from "./createAppBuildJob";
+export declare const createBuildJobs: (context: Context, definitions: {
+  appBuild?: AppBuildJobDefinition;
+  dockerBuild: DockerBuildJobDefinition;
+}) => CatladderJob[];

package/dist/build/base/index.js

@@ -0,0 +1,57 @@
+"use strict";
+
+var __assign = this && this.__assign || function () {
+  __assign = Object.assign || function (t) {
+    for (var s, i = 1, n = arguments.length; i < n; i++) {
+      s = arguments[i];
+      for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+    }
+    return t;
+  };
+  return __assign.apply(this, arguments);
+};
+var __read = this && this.__read || function (o, n) {
+  var m = typeof Symbol === "function" && o[Symbol.iterator];
+  if (!m) return o;
+  var i = m.call(o),
+    r,
+    ar = [],
+    e;
+  try {
+    while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+  } catch (error) {
+    e = {
+      error: error
+    };
+  } finally {
+    try {
+      if (r && !r.done && (m = i["return"])) m.call(i);
+    } finally {
+      if (e) throw e.error;
+    }
+  }
+  return ar;
+};
+var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
+  if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+    if (ar || !(i in from)) {
+      if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+      ar[i] = from[i];
+    }
+  }
+  return to.concat(ar || Array.prototype.slice.call(from));
+};
+exports.__esModule = true;
+exports.createBuildJobs = void 0;
+var sbom_1 = require("../../deploy/sbom");
+var docker_1 = require("../docker");
+var sbom_2 = require("../sbom");
+var constants_1 = require("./constants");
+var createAppBuildJob_1 = require("./createAppBuildJob");
+var createBuildJobs = function (context, definitions) {
+  var _a;
+  return __spreadArray(__spreadArray(__spreadArray([], __read(definitions.appBuild ? [(0, createAppBuildJob_1.createAppBuildJob)(context, definitions.appBuild)] : []), false), __read((0, docker_1.requiresDockerBuild)(context) ? [(0, docker_1.createDockerBuildJobBase)(context, __assign(__assign({}, definitions.dockerBuild), {
+    needs: __spreadArray(__spreadArray([], __read((_a = definitions.dockerBuild.needs) !== null && _a !== void 0 ? _a : []), false), __read(definitions.appBuild ? [constants_1.APP_BUILD_JOB_NAME] : []), false)
+  }))] : []), false), __read((0, sbom_1.sbomDeactivated)(context) ? [] : [(0, sbom_2.createSbomBuildJob)(context)]), false);
+};
+exports.createBuildJobs = createBuildJobs;

package/dist/build/custom/buildJob.js

@@ -45,12 +45,9 @@ exports.__esModule = true;
 exports.createCustomBuildJobs = void 0;
 var path_1 = require("path");
 var utils_1 = require("../../utils");
-var constants_1 = require("../base/constants");
-var createBuildJob_1 = require("../base/createBuildJob");
 var docker_1 = require("../docker");
 var types_1 = require("../types");
-var sbom_1 = require("../sbom");
-var sbom_2 = require("../../deploy/sbom");
+var base_1 = require("../base");
 var RUNNER_BUILD_VARIABLES = {
   KUBERNETES_CPU_REQUEST: "0.5",
   KUBERNETES_CPU_LIMIT: "2",
@@ -63,24 +60,24 @@ var createCustomBuildJobs = function (context) {
   if (!(0, types_1.isOfBuildType)(buildConfig, "custom")) {
     throw new Error("deploy config is not custom");
   }
-  var appBuildJob = buildConfig.buildCommand !== null ? (0, createBuildJob_1.createBuildJob)(context, {
-    image: buildConfig.jobImage,
-    variables: __assign({}, RUNNER_BUILD_VARIABLES),
-    cache: buildConfig.jobCache,
-    services: buildConfig.jobServices,
-    script: __spreadArray([], __read((_a = (0, utils_1.ensureArray)(buildConfig.buildCommand)) !== null && _a !== void 0 ? _a : []), false),
-    artifacts: {
-      paths: __spreadArray([(0, path_1.join)(context.componentConfig.dir, "__build_info.json"), (0, path_1.join)(context.componentConfig.dir, "dist")], __read((_c = (_b = buildConfig.artifactsPaths) === null || _b === void 0 ? void 0 : _b.map(function (path) {
-        return (0, path_1.join)(context.componentConfig.dir, path);
-      })) !== null && _c !== void 0 ? _c : []), false),
-      expire_in: "1 day"
+  return (0, base_1.createBuildJobs)(context, {
+    appBuild: buildConfig.buildCommand !== null ? {
+      image: buildConfig.jobImage,
+      variables: __assign({}, RUNNER_BUILD_VARIABLES),
+      cache: buildConfig.jobCache,
+      services: buildConfig.jobServices,
+      script: __spreadArray([], __read((_a = (0, utils_1.ensureArray)(buildConfig.buildCommand)) !== null && _a !== void 0 ? _a : []), false),
+      artifacts: {
+        paths: __spreadArray([(0, path_1.join)(context.componentConfig.dir, "__build_info.json"), (0, path_1.join)(context.componentConfig.dir, "dist")], __read((_c = (_b = buildConfig.artifactsPaths) === null || _b === void 0 ? void 0 : _b.map(function (path) {
+          return (0, path_1.join)(context.componentConfig.dir, path);
+        })) !== null && _c !== void 0 ? _c : []), false),
+        expire_in: "1 day"
+      }
+    } : undefined,
+    dockerBuild: {
+      script: (0, docker_1.getDockerBuildDefaultScript)(((_d = buildConfig.docker) === null || _d === void 0 ? void 0 : _d.type) === "nginx" ? "ensureNginxDockerfile" : ""),
+      variables: {}
     }
-  }) : null;
-  return __spreadArray(__spreadArray(__spreadArray([], __read(appBuildJob ? [appBuildJob] : []), false), __read((0, docker_1.requiresDockerBuild)(context) ? [(0, docker_1.createDockerBuildJobDefault)(context, {
-    script: [((_d = buildConfig.docker) === null || _d === void 0 ? void 0 : _d.type) === "nginx" ? "ensureNginxDockerfile" : "" // e.g. custom,
-    ].filter(Boolean),
-    variables: {},
-    needs: appBuildJob ? [constants_1.APP_BUILD_JOB_NAME] : []
-  })] : []), false), __read((0, sbom_2.sbomDeactivated)(context) ? [] : [(0, sbom_1.createSbomBuildJob)(context)]), false);
+  });
 };
 exports.createCustomBuildJobs = createCustomBuildJobs;

package/dist/build/docker.d.ts

@@ -50,12 +50,10 @@ export declare const getDockerJobBaseProps: (context: Context) => {
     DOCKER_BUILDKIT: string;
   };
 };
+export declare type DockerBuildJobDefinition = Partial<CatladderJob>;
 export declare const createDockerBuildJobBase: (context: Context, {
   script,
   ...def
 }: Partial<CatladderJob>) => CatladderJob;
 export declare const gitlabDockerLogin = "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY";
-export declare const createDockerBuildJobDefault: (context: Context, {
-  script,
-  ...def
-}: Partial<CatladderJob>) => CatladderJob;
+export declare const getDockerBuildDefaultScript: (ensureDockerFileScript?: string | undefined) => (string | undefined)[];

package/dist/build/docker.js

@@ -18,39 +18,8 @@ var __rest = this && this.__rest || function (s, e) {
   }
   return t;
 };
-var __read = this && this.__read || function (o, n) {
-  var m = typeof Symbol === "function" && o[Symbol.iterator];
-  if (!m) return o;
-  var i = m.call(o),
-    r,
-    ar = [],
-    e;
-  try {
-    while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-  } catch (error) {
-    e = {
-      error: error
-    };
-  } finally {
-    try {
-      if (r && !r.done && (m = i["return"])) m.call(i);
-    } finally {
-      if (e) throw e.error;
-    }
-  }
-  return ar;
-};
-var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
-  if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-    if (ar || !(i in from)) {
-      if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-      ar[i] = from[i];
-    }
-  }
-  return to.concat(ar || Array.prototype.slice.call(from));
-};
 exports.__esModule = true;
-exports.createDockerBuildJobDefault = exports.gitlabDockerLogin = exports.createDockerBuildJobBase = exports.getDockerJobBaseProps = exports.DOCKER_BUILD_JOB_NAME = exports.getDockerBuildVariables = exports.requiresDockerBuild = exports.getDockerImageVariables = void 0;
+exports.getDockerBuildDefaultScript = exports.gitlabDockerLogin = exports.createDockerBuildJobBase = exports.getDockerJobBaseProps = exports.DOCKER_BUILD_JOB_NAME = exports.getDockerBuildVariables = exports.requiresDockerBuild = exports.getDockerImageVariables = void 0;
 var lodash_1 = require("lodash");
 var deploy_1 = require("../deploy");
 var runner_1 = require("../runner");
@@ -124,11 +93,7 @@ var createDockerBuildJobBase = function (context, _a) {
 };
 exports.createDockerBuildJobBase = createDockerBuildJobBase;
 exports.gitlabDockerLogin = "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY";
-var createDockerBuildJobDefault = function (context, _a) {
-  var script = _a.script,
-    def = __rest(_a, ["script"]);
-  return (0, exports.createDockerBuildJobBase)(context, __assign({
-    script: __spreadArray(__spreadArray([], __read(script || []), false), [exports.gitlabDockerLogin, "docker version", "docker build --network host --cache-from $DOCKER_CACHE_IMAGE --tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG -f $APP_DIR/Dockerfile . --build-arg BUILDKIT_INLINE_CACHE=1", "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG", "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE", "docker push $DOCKER_CACHE_IMAGE"], false)
-  }, def));
+var getDockerBuildDefaultScript = function (ensureDockerFileScript) {
+  return [ensureDockerFileScript, exports.gitlabDockerLogin, "docker version", "docker build --network host --cache-from $DOCKER_CACHE_IMAGE --tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG -f $APP_DIR/Dockerfile . --build-arg BUILDKIT_INLINE_CACHE=1", "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG", "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE", "docker push $DOCKER_CACHE_IMAGE"].filter(Boolean);
 };
-exports.createDockerBuildJobDefault = createDockerBuildJobDefault;
+exports.getDockerBuildDefaultScript = getDockerBuildDefaultScript;

package/dist/build/node/buildJob.js

@@ -43,18 +43,15 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
 };
 exports.__esModule = true;
 exports.createNodeBuildJobs = void 0;
+var path_1 = require("path");
+var runner_1 = require("../../runner");
 var utils_1 = require("../../utils");
-var constants_1 = require("../base/constants");
-var createBuildJob_1 = require("../base/createBuildJob");
+var base_1 = require("../base");
 var docker_1 = require("../docker");
-var path_1 = require("path");
 var types_1 = require("../types");
 var cache_1 = require("./cache");
-var constants_2 = require("./constants");
+var constants_1 = require("./constants");
 var yarn_1 = require("./yarn");
-var runner_1 = require("../../runner");
-var sbom_1 = require("../sbom");
-var sbom_2 = require("../../deploy/sbom");
 var createNodeBuildJobs = function (context) {
   var _a, _b, _c, _d, _e, _f, _g;
   var buildConfig = context.componentConfig.build;
@@ -63,30 +60,31 @@ var createNodeBuildJobs = function (context) {
   }
   var defaultImage = (0, runner_1.getRunnerImage)("jobs-default");
   var yarnInstall = (0, yarn_1.getYarnInstall)(context);
-  var appBuildJob = buildConfig.buildCommand !== null ? (0, createBuildJob_1.createBuildJob)(context, {
-    image: (_a = buildConfig.jobImage) !== null && _a !== void 0 ? _a : defaultImage,
-    variables: __assign({}, constants_2.NODE_RUNNER_BUILD_VARIABLES),
-    cache: __spreadArray(__spreadArray(__spreadArray([], __read((_b = (0, utils_1.ensureArray)(buildConfig.jobCache)) !== null && _b !== void 0 ? _b : []), false), __read((0, cache_1.getNodeCache)(context)), false), __read((0, cache_1.getNextCache)(context)), false),
-    script: __spreadArray(__spreadArray([], __read(yarnInstall), false), __read((_c = (0, utils_1.ensureArray)(buildConfig.buildCommand)) !== null && _c !== void 0 ? _c : []), false),
-    artifacts: {
-      paths: __spreadArray([(0, path_1.join)(context.componentConfig.dir, "__build_info.json"), (0, path_1.join)(context.componentConfig.dir, "dist"), (0, path_1.join)(context.componentConfig.dir, ".next")], __read((_e = (_d = buildConfig.artifactsPaths) === null || _d === void 0 ? void 0 : _d.map(function (path) {
-        return (0, path_1.join)(context.componentConfig.dir, path);
-      })) !== null && _e !== void 0 ? _e : []), false),
-      expire_in: "1 day"
-    },
-    jobTags: buildConfig.jobTags
-  }) : null;
-  return __spreadArray(__spreadArray(__spreadArray([], __read(appBuildJob ? [appBuildJob] : []), false), __read((0, docker_1.requiresDockerBuild)(context) ? [(0, docker_1.createDockerBuildJobDefault)(context, {
-    script: [buildConfig.type === "node-static" || buildConfig.type === "storybook" ? "ensureNginxDockerfile" : "ensureNodeDockerfile"],
-    cache: __spreadArray([], __read((0, cache_1.getYarnCache)(context, "pull")), false),
-    variables: {
-      // only required for non static
-      DOCKER_COPY_AND_INSTALL_APP: (0, yarn_1.getDockerAppCopyAndBuildScript)(context),
-      DOCKER_COPY_WORKSPACE_FILES: (_g = (_f = context.packageManagerInfo) === null || _f === void 0 ? void 0 : _f.pathsToCopyInDocker.map(function (dir) {
-        return "COPY --chown=node:node ".concat(dir, " /app/").concat(dir);
-      })) === null || _g === void 0 ? void 0 : _g.join("\n")
-    },
-    needs: appBuildJob ? [constants_1.APP_BUILD_JOB_NAME] : []
-  })] : []), false), __read((0, sbom_2.sbomDeactivated)(context) ? [] : [(0, sbom_1.createSbomBuildJob)(context)]), false);
+  return (0, base_1.createBuildJobs)(context, {
+    appBuild: buildConfig.buildCommand !== null ? {
+      image: (_a = buildConfig.jobImage) !== null && _a !== void 0 ? _a : defaultImage,
+      variables: __assign({}, constants_1.NODE_RUNNER_BUILD_VARIABLES),
+      cache: __spreadArray(__spreadArray(__spreadArray([], __read((_b = (0, utils_1.ensureArray)(buildConfig.jobCache)) !== null && _b !== void 0 ? _b : []), false), __read((0, cache_1.getNodeCache)(context)), false), __read((0, cache_1.getNextCache)(context)), false),
+      script: __spreadArray(__spreadArray([], __read(yarnInstall), false), __read((_c = (0, utils_1.ensureArray)(buildConfig.buildCommand)) !== null && _c !== void 0 ? _c : []), false),
+      artifacts: {
+        paths: __spreadArray([(0, path_1.join)(context.componentConfig.dir, "__build_info.json"), (0, path_1.join)(context.componentConfig.dir, "dist"), (0, path_1.join)(context.componentConfig.dir, ".next")], __read((_e = (_d = buildConfig.artifactsPaths) === null || _d === void 0 ? void 0 : _d.map(function (path) {
+          return (0, path_1.join)(context.componentConfig.dir, path);
+        })) !== null && _e !== void 0 ? _e : []), false),
+        expire_in: "1 day"
+      },
+      jobTags: buildConfig.jobTags
+    } : undefined,
+    dockerBuild: {
+      script: (0, docker_1.getDockerBuildDefaultScript)(buildConfig.type === "node-static" || buildConfig.type === "storybook" ? "ensureNginxDockerfile" : "ensureNodeDockerfile"),
+      cache: __spreadArray([], __read((0, cache_1.getYarnCache)(context, "pull")), false),
+      variables: {
+        // only required for non static
+        DOCKER_COPY_AND_INSTALL_APP: (0, yarn_1.getDockerAppCopyAndBuildScript)(context),
+        DOCKER_COPY_WORKSPACE_FILES: (_g = (_f = context.packageManagerInfo) === null || _f === void 0 ? void 0 : _f.pathsToCopyInDocker.map(function (dir) {
+          return "COPY --chown=node:node ".concat(dir, " /app/").concat(dir);
+        })) === null || _g === void 0 ? void 0 : _g.join("\n")
+      }
+    }
+  });
 };
 exports.createNodeBuildJobs = createNodeBuildJobs;

package/dist/build/node/meteor.js

@@ -35,14 +35,11 @@ exports.__esModule = true;
 exports.createMeteorBuildJobs = void 0;
 var path_1 = require("path");
 var runner_1 = require("../../runner");
-var constants_1 = require("../base/constants");
-var createBuildJob_1 = require("../base/createBuildJob");
+var base_1 = require("../base");
 var docker_1 = require("../docker");
 var types_1 = require("../types");
 var cache_1 = require("./cache");
 var yarn_1 = require("./yarn");
-var sbom_1 = require("../../deploy/sbom");
-var sbom_2 = require("../sbom");
 var getMeteorCache = function (context) {
   return [{
     key: context.componentName + "meteor-build-cache",
@@ -56,23 +53,24 @@ var createMeteorBuildJobs = function (context) {
     throw new Error("deploy config is not meteor");
   }
   var yarnInstall = (0, yarn_1.getYarnInstall)(context);
-  var appBuildJob = buildConfig.buildCommand !== null ? (0, createBuildJob_1.createBuildJob)(context, {
-    cache: __spreadArray(__spreadArray([], __read((0, cache_1.getNodeCache)(context)), false), __read(getMeteorCache(context)), false),
-    image: (0, runner_1.getRunnerImage)("jobs-meteor"),
-    variables: {
-      METEOR_DISABLE_OPTIMISTIC_CACHING: "1"
-    },
-    script: __spreadArray(__spreadArray([], __read(yarnInstall), false), ['echo "add healthcheck package"', "meteor add panter:healthroute --allow-superuser", "meteor add qualia:prod-shell --allow-superuser", 'TOOL_NODE_FLAGS="--max_old_space_size=3584 --min_semi_space_size=8 --max_semi_space_size=256 --optimize_for_size" meteor build ./dist --architecture os.linux.x86_64 --allow-superuser --server-only --directory', "cp ./__build_info.json ./dist/bundle/programs/server"], false),
-    artifacts: {
-      paths: [context.componentConfig.dir + "/__build_info.json", context.componentConfig.dir + "/dist"]
+  return (0, base_1.createBuildJobs)(context, {
+    appBuild: buildConfig.buildCommand !== null ? {
+      cache: __spreadArray(__spreadArray([], __read((0, cache_1.getNodeCache)(context)), false), __read(getMeteorCache(context)), false),
+      image: (0, runner_1.getRunnerImage)("jobs-meteor"),
+      variables: {
+        METEOR_DISABLE_OPTIMISTIC_CACHING: "1"
+      },
+      script: __spreadArray(__spreadArray([], __read(yarnInstall), false), ['echo "add healthcheck package"', "meteor add panter:healthroute --allow-superuser", "meteor add qualia:prod-shell --allow-superuser", 'TOOL_NODE_FLAGS="--max_old_space_size=3584 --min_semi_space_size=8 --max_semi_space_size=256 --optimize_for_size" meteor build ./dist --architecture os.linux.x86_64 --allow-superuser --server-only --directory', "cp ./__build_info.json ./dist/bundle/programs/server"], false),
+      artifacts: {
+        paths: [context.componentConfig.dir + "/__build_info.json", context.componentConfig.dir + "/dist"]
+      }
+    } : undefined,
+    dockerBuild: {
+      script: (0, docker_1.getDockerBuildDefaultScript)("ensureMeteorDockerfile"),
+      variables: {
+        METEOR_INSTALL_SCRIPTS: buildConfig.installScripts ? "true" : ""
+      }
     }
-  }) : null;
-  return __spreadArray(__spreadArray(__spreadArray([], __read(appBuildJob ? [appBuildJob] : []), false), [(0, docker_1.createDockerBuildJobDefault)(context, {
-    script: ["ensureMeteorDockerfile"],
-    variables: {
-      METEOR_INSTALL_SCRIPTS: buildConfig.installScripts ? "true" : ""
-    },
-    needs: appBuildJob ? [constants_1.APP_BUILD_JOB_NAME] : []
-  })], false), __read((0, sbom_1.sbomDeactivated)(context) ? [] : [(0, sbom_2.createSbomBuildJob)(context)]), false);
+  });
 };
 exports.createMeteorBuildJobs = createMeteorBuildJobs;

package/dist/build/rails/build.js

@@ -32,21 +32,11 @@ var __read = this && this.__read || function (o, n) {
   }
   return ar;
 };
-var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
-  if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-    if (ar || !(i in from)) {
-      if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-      ar[i] = from[i];
-    }
-  }
-  return to.concat(ar || Array.prototype.slice.call(from));
-};
 exports.__esModule = true;
 exports.createRailsBuildJobs = void 0;
-var types_1 = require("../types");
+var base_1 = require("../base");
 var docker_1 = require("../docker");
-var sbom_1 = require("../../deploy/sbom");
-var sbom_2 = require("../sbom");
+var types_1 = require("../types");
 var createRailsBuildJobs = function (context) {
   var _a, _b, _c;
   var buildConfig = context.componentConfig.build;
@@ -61,12 +51,15 @@ var createRailsBuildJobs = function (context) {
       v = _b[1];
     return "--env '".concat(k).concat(v ? "=".concat(v) : "", "'");
   }).join(" ");
-  return __spreadArray([(0, docker_1.createDockerBuildJobBase)(context, {
-    variables: __assign(__assign({}, context.environment.jobOnlyVars.build.envVars), context.componentConfig.build.extraVars),
-    // custom script
-    script: [docker_1.gitlabDockerLogin, "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 : "")]
-  })], __read((0, sbom_1.sbomDeactivated)(context) ? [] : [(0, sbom_2.createSbomBuildJob)(context)]), false);
+  return (0, base_1.createBuildJobs)(context, {
+    appBuild: undefined,
+    dockerBuild: {
+      variables: __assign(__assign({}, context.environment.jobOnlyVars.build.envVars), context.componentConfig.build.extraVars),
+      // custom script
+      script: [docker_1.gitlabDockerLogin, "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 : "")]
+    }
+  });
 };
 exports.createRailsBuildJobs = createRailsBuildJobs;

package/dist/build/types.d.ts

@@ -1,4 +1,5 @@
-import type { Artifacts, EnvVars, GitlabJobImage, GitlabJobService } from "../types";
+import type { Artifacts, EnvVars, GitlabJobImage } from "../types";
+import type { Services } from "../types/gitlab-ci-yml";
 import type { CatladderJob } from "../types/jobs";
 export declare type BuildConfigArtifactsReports = {
   /**
@@ -137,9 +138,9 @@ export declare type BuildConfigCustom = Omit<BuildConfigBase, "lint" | "test" |
   type: "custom";
   jobImage: GitlabJobImage;
   /**
-   * {@link GitlabJobService}s used in lint, test, audit, and build jobs.
+   * {@link Services}s used in lint, test, audit, and build jobs.
    */
-  jobServices?: GitlabJobService[];
+  jobServices?: Services;
   docker: BuildConfigCustomDocker;
   /**
    * custom lint, disabled when not set