@catladder/pipeline 1.83.0 → 1.83.2

package/dist/build/index.js

@@ -65,7 +65,13 @@ exports.BUILD_TYPES = {
   rails: {
     jobs: rails_1.createRailsJobs,
     defaults: function () {
-      return {};
+      return {
+        startCommand: "/cnb/process/web",
+        cnbBuilder: {
+          image: "heroku/buildpacks:20",
+          packVersion: "0.28.0"
+        }
+      };
     }
   }
 };

package/dist/build/rails/build.js

@@ -1,30 +1,55 @@
 "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];
+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 t;
-  };
-  return __assign.apply(this, arguments);
+  }
+  return ar;
 };
 exports.__esModule = true;
 exports.createRailsBuildJobs = void 0;
+var types_1 = require("../types");
 var docker_1 = require("../docker");
 var createRailsBuildJobs = function (context) {
+  var _a, _b, _c, _d, _e, _f;
+  var buildConfig = context.componentConfig.build;
+  if (!(0, types_1.isOfBuildType)(buildConfig, "rails")) {
+    // should not happen
+    throw new Error("build type is not rails");
+  }
+  var cnbConf = buildConfig.cnbBuilder;
+  // backwards compatabilty with CNB_ENV_VARS
+  // TODO: remove when all projects are migrated
+  var packEnvArgs = (_c = (_b = (_a = buildConfig.extraVars) === null || _a === void 0 ? void 0 : _a.CNB_ENV_VARS) === null || _b === void 0 ? void 0 : _b.split(" ").map(function (v) {
+    return "--env '".concat(v, "'");
+  })) !== null && _c !== void 0 ? _c : Object.entries((_d = cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.buildVars) !== null && _d !== void 0 ? _d : {}).map(function (_a) {
+    var _b = __read(_a, 2),
+      k = _b[0],
+      v = _b[1];
+    return "--env '".concat(k).concat(v ? "=".concat(v) : "", "'");
+  });
   return [(0, docker_1.createDockerBuildJobBase)(context, {
-    variables: __assign({
-      CNB_BUILDER: "heroku/buildpacks:18",
-      CNB_ENV_VARS: "BUNDLE_GIT__PANTER__CH",
-      CNB_EXTRA_ARGS: "",
-      CNB_PACK_VERSION: "0.20.0"
-    }, context.componentConfig.build.extraVars),
+    variables: 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$CNB_PACK_VERSION/pack-v$CNB_PACK_VERSION-linux.tgz | tar -zx --directory /usr/local/bin pack", "chmod +x /usr/local/bin/pack",
+    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", "for v in $CNB_ENV_VARS; do env_args=\"$env_args --env $v\"; done", "pack build $DOCKER_IMAGE:$DOCKER_IMAGE_TAG --builder $CNB_BUILDER --publish --cache-image $DOCKER_CACHE_IMAGE $env_args $CNB_EXTRA_ARGS"]
+    "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.join(" "), " ").concat((_f = (_e = cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.packExtraArgs) === null || _e === void 0 ? void 0 : _e.join(" ")) !== null && _f !== void 0 ? _f : "")]
   })];
 };
 exports.createRailsBuildJobs = createRailsBuildJobs;

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

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

package/dist/build/types.d.ts

@@ -94,6 +94,33 @@ export declare type BuildConfigCustom = BuildConfigBase & {
 };
 export declare type BuildConfigRails = BuildConfigBase & {
   type: "rails";
+  cnbBuilder?: {
+    /**
+     * The Cloud Native Buildpacks builder image to use.
+     * See e.g. https://github.com/heroku/builder or others.
+     * Default: heroku/buildpacks:20
+     */
+    image?: string;
+    /**
+     * The version of the Cloud Native Buildpacks pack command to use.
+     * See https://buildpacks.io/docs/tools/pack/
+     * Default: 0.28.0
+     */
+    packVersion?: string;
+    /**
+     * Additional command arguments passed to the pack command.
+     * See https://buildpacks.io/docs/tools/pack/
+     */
+    packExtraArgs?: string[];
+    /**
+     * Variables needed for Bundler and Rails asset precompilation.
+     *
+     * Specify a key with the value `undefined` to inherit it from the EnvVars.
+     *
+     * See https://github.com/rails/rails/issues/32947
+     */
+    buildVars?: Record<string, string | undefined>;
+  };
 };
 export declare type BuildConfigStorybook = BuildConfigNodeBase & {
   type: "storybook";